Commits · b162017f5a370c11b4a2de07d3bf9d9678dc904b · Sebastian / slapos

11 Jul, 2011 6 commits
- Merge branch 'cloudooo' of https://git.erp5.org/repos/slapos into cloudooo · b162017f
  Priscila Manhaes authored Jul 11, 2011
  
  b162017f
- Updated url link · 7446b269
  Priscila Manhaes authored Jul 11, 2011
  
  7446b269
- Merge branch 'cloudooo' of https://git.erp5.org/repos/slapos into cloudooo · a864fb61
  Priscila Manhaes authored Jul 11, 2011
  
  a864fb61
- added recipe for cloudoootestnode · d9c9a5ee
  Priscila Manhaes authored Jul 11, 2011
  
  d9c9a5ee
- changed url name cause base-url is not an argument for z3c.recipe.openoffice · 9d0654a2
  Priscila Manhaes authored Jul 11, 2011
  
  9d0654a2
- Changed base url cause old one does not exist anymore · 898ea0b2
  Priscila Manhaes authored Jul 11, 2011
  
  898ea0b2
04 Jul, 2011 3 commits
- added xpdf to cloudooo dependencies · 7aeb943f
  Priscila Manhaes authored Jul 04, 2011
  
  7aeb943f
- added mimetype_registry to others handlers · 30020b53
  Priscila Manhaes authored Jul 04, 2011
  
  30020b53
- added python-magic to cloudooo dependencies · d4e1624d
  Priscila Manhaes authored Jul 04, 2011
  
  d4e1624d
21 Jun, 2011 6 commits
- TYPO · da21d13f
  Priscila Manhaes authored Jun 21, 2011
  
  da21d13f
- undo last commit · 6d903e19
  Priscila Manhaes authored Jun 21, 2011
  
  6d903e19
- refactor causa cloudooo still uses python 2.6 · 5e260fb6
  Priscila Manhaes authored Jun 21, 2011
  
  5e260fb6
- reinstance eggs · d135c5d7
  Priscila Manhaes authored Jun 21, 2011
  
  d135c5d7
- refactor to subscribe template · 72ea4308
  Priscila Manhaes authored Jun 21, 2011
  
  72ea4308
- added cloudoootestnode · 1237b0f5
  Priscila Manhaes authored Jun 21, 2011
  
  1237b0f5
13 Jun, 2011 25 commits
- Replace xpdf by poppler. · 7bc4b4f6
  Rafael Monnerat authored Jun 13, 2011
  
  7bc4b4f6
- Merged with erp5 branch. · 2c93a57e
  Rafael Monnerat authored Jun 13, 2011
  
  2c93a57e
- Replace xpdf by poppler. · 5f7e7cb0
  Rafael Monnerat authored Jun 13, 2011
  
  5f7e7cb0
- libpng's header location is not considered in (at least) splash sub-directory. · 6792c765
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  6792c765
- typo. · eda94f12
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  eda94f12
- typo. · 3d611dde
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  3d611dde
- Merge branch 'vifib' into erp5 · a24faca6
  Łukasz Nowak authored Jun 13, 2011
  
  a24faca6
- Merge branch 'master' into erp5 · e7c338c2
  Łukasz Nowak authored Jun 13, 2011
```
Conflicts:
	CHANGES.txt
	setup.py
	software/erp5/software.cfg
	software/erp5testnode/software.cfg
```
  e7c338c2
- Use corrected file. · 18e066a3
  Łukasz Nowak authored Jun 13, 2011
  
  18e066a3
- typo. · f1a2c235
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  f1a2c235
- simplify "-Wl,-rpath -Wl,location" -> "-Wl,-rpath=location". · b009ec6c
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  b009ec6c
- use our own components. · 22b0df87
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  22b0df87
- Merge branch 'erp5' into vifib · 2901f28a
  Rafael Monnerat authored Jun 13, 2011
  
  2901f28a
- Use poppler for pdftohtml. · a9a394db
  Rafael Monnerat authored Jun 13, 2011
  
  a9a394db
- Merge branch 'master' into vifib · 59fbe1f9
  Łukasz Nowak authored Jun 13, 2011
```
Conflicts:
	CHANGES.txt
	setup.py
	software/erp5/software.cfg
	software/erp5testnode/software.cfg
```
  59fbe1f9
- psutil are not hosted on pypi. · c28467be
  Łukasz Nowak authored Jun 13, 2011
  
  c28467be
- Extend with more sites non pypi mirrored packages. · 04b77677
  Łukasz Nowak authored Jun 13, 2011
  
  04b77677
- Extend a bit a list to cover all requirements. · 0eee5726
  Łukasz Nowak authored Jun 13, 2011
  
  0eee5726
- Limit download locations to working sites. · 6ecebb3e
  Łukasz Nowak authored Jun 13, 2011
  
  6ecebb3e
- Separate from system distributions. · 7a72e5da
  Łukasz Nowak authored Jun 13, 2011
  
  7a72e5da
- Merge branch 'erp5' into vifib · 91b71cc3
  Łukasz Nowak authored Jun 13, 2011
  
  91b71cc3
- Merge branch 'zabbix' · 34959dbd
  Łukasz Nowak authored Jun 13, 2011
  
  34959dbd
- Stabilise versions. · 5d93f91a
  Łukasz Nowak authored Jun 13, 2011
  
  5d93f91a
- Advertise development of 0.5. · e1f2faab
  Łukasz Nowak authored Jun 13, 2011
  
  e1f2faab
- Provide documentation skeleton. · 1878c4ca
  Łukasz Nowak authored Jun 13, 2011
  
  1878c4ca