1. 21 Mar, 2016 7 commits
  2. 19 Mar, 2016 1 commit
    • Georgios Dagkakis's avatar
      Revert "BusinessTemplate.py: PortalTypeWorkflowChainTemplateItem do not · 02a07723
      Georgios Dagkakis authored
      fix the keys adding 'portal_type_workflow_chain/'
      in _importFile, preinstall and export."
      
      This reverts commit 6f8221b6.
      
      This commit cleaned inconsistent prefix manipulation in
      PortalTypeWorkflowChainTemplateItem. It passes the test suite,
      however it was found to produce incompatibility with previously installed
      business templates. In 'Upgrade Business Templates from Repositories"
      there was a diff of PortalTypeWorkflowChainTemplateItems like:
      Portal Type Name -> New
      portal_type_workflow_chain/Portal Type Name -> Removed
      For some reason the upgrade process would remove the chain
      without adding the new element.
      
      We are working on a clean solution, but since this needs more testing
      I revert this commit for now so that master version does not cause
      problems to users.
      02a07723
  3. 18 Mar, 2016 8 commits
  4. 17 Mar, 2016 8 commits
  5. 16 Mar, 2016 2 commits
  6. 15 Mar, 2016 4 commits
  7. 14 Mar, 2016 6 commits
  8. 11 Mar, 2016 3 commits
  9. 10 Mar, 2016 1 commit
    • Julien Muchembled's avatar
      fixup! ConflictFreeLog: fix incremental conflict resolution · 00acd95f
      Julien Muchembled authored
      This is a follow-up of commit 8712c638
      which fixed the following case:
      
        A  B  C  D    # transactions
        r  r
           A  r  r
              R1 R2
                 A3
      
      where A stands for Append, R for Rotate, and uppercase for conflict resolution
      
        A3 contained duplicated elements from both R1 & R2 (those added by B)
      
      This commit fixes the same issue during rotation:
      
        A  B  C
        a  a
        A     r
           A  R
              R
      
        (elements added by A were duplicated)
      00acd95f