1. 28 Aug, 2017 1 commit
    • Ivan Tyagov's avatar
      Merge remote-tracking branch 'klaus/master' into klaus_improvements · 1509b040
      Ivan Tyagov authored
      Conflicts:
      	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataArray.py
      	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataArray.xml
      	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataBucketStream.py
      	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataBucketStream.xml
      	bt5/erp5_wendelin/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
      	bt5/erp5_wendelin/bt/template_action_path_list
      	bt5/erp5_wendelin/bt/template_portal_type_id_list
      	bt5/erp5_wendelin/bt/template_portal_type_property_sheet_list
      1509b040
  2. 25 Aug, 2017 1 commit
  3. 11 Aug, 2017 1 commit
  4. 10 Aug, 2017 3 commits
  5. 03 Aug, 2017 1 commit
  6. 26 Jul, 2017 1 commit
  7. 24 Jul, 2017 2 commits
  8. 23 Jul, 2017 9 commits
  9. 05 Jul, 2017 5 commits
  10. 01 Jun, 2017 1 commit
  11. 19 May, 2017 2 commits
  12. 27 Apr, 2017 1 commit
  13. 11 Apr, 2017 1 commit
  14. 10 Apr, 2017 2 commits
  15. 06 Apr, 2017 1 commit
  16. 04 Apr, 2017 2 commits
  17. 30 Mar, 2017 6 commits