1. 26 Sep, 2017 2 commits
  2. 27 Nov, 2015 1 commit
  3. 19 Nov, 2015 1 commit
  4. 15 Nov, 2015 1 commit
  5. 13 Nov, 2015 2 commits
  6. 03 Sep, 2015 1 commit
  7. 17 Jul, 2015 1 commit
  8. 20 Nov, 2014 1 commit
    • Merge branch 'operation-control' · 245dae34
      Conflicts:
      	CHANGES.txt
      	master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_viewCurrentUsage/my_busy_computer_partition_list.xml
      	master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_viewCurrentUsage/your_busy_computer_partition_list.xml
      	master/bt5/slapos_cloud/bt/revision
      	master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/Computer_checkSoftwareInstanceState.xml
      	master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/ERP5Site_isSupportRequestCreationClosed.xml
      	master/bt5/slapos_crm/bt/revision
      	master/bt5/slapos_ecoallocation/SkinTemplateItem/portal_skins/slapos_ecoallocation/Alarm_updateSoftwareReleaseCapacity.xml
      	master/bt5/slapos_ecoallocation/SkinTemplateItem/portal_skins/slapos_ecoallocation/SoftwareInstance_viewAsWeb/my_text_content.xml
      	master/bt5/slapos_ecoallocation/SkinTemplateItem/portal_skins/slapos_ecoallocation/SoftwareInstance_viewAsWeb/your_connection_listbox.xml
      	master/bt5/slapos_erp5/bt/revision
      	master/bt5/slapos_hypermedia/ExtensionTemplateItem/SlapOSHypermedia.py
      	master/bt5/slapos_hypermedia/TestTemplateItem/portal_components/test.erp5.testSlapOSHypermediaSkins.py
      	master/bt5/slapos_hypermedia/bt/revision
      	master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/SoftwareProduct_viewMassUpgradeDialog/your_comment.xml
      	master/bt5/slapos_pdm/bt/revision
      	master/bt5/slapos_pdm/bt/template_test_id_list
      	master/bt5/slapos_rest_api/bt/revision
      	master/bt5/slapos_slap_tool/bt/revision
      	master/bt5/slapos_web/SkinTemplateItem/portal_skins/slapos_rss/WebSection_getRSSDescriptionContent.xml
      	master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewHelpRender/your_ad.xml
      	master/bt5/slapos_web/bt/revision
      	setup.py
      	slapos/cli/collect.py
      	slapos/cli_legacy/bang.py
      	slapos/collect/__init__.py
      	slapos/collect/db.py
      	slapos/collect/entity.py
      	slapos/collect/reporter.py
      	slapos/collect/snapshot.py
      	slapos/grid/slapgrid.py
      	slapos/proxy/views.py
      	slapos/slap/slap.py
      	slapos/tests/slap.py
      	slapos/tests/slapgrid.py
      	slapos/tests/slapproxy/__init__.py
      	slapos/version.py
      Alain Takoudjou committed
  9. 10 Nov, 2014 12 commits
  10. 17 Sep, 2014 1 commit
  11. 10 Sep, 2014 1 commit
  12. 12 Aug, 2014 1 commit
  13. 26 May, 2014 1 commit
  14. 23 May, 2014 1 commit
  15. 22 May, 2014 1 commit
  16. 18 May, 2014 1 commit
  17. 15 May, 2014 2 commits
  18. 14 May, 2014 1 commit