Commit Graph

7 Commits

Author SHA1 Message Date
Gavin Cornwell
ee55f90a07 Manual merge of V2.1 to HEAD: ETWOONE-92: If two users update the same contents at the same time, you get an unfriendly InvalidNodeRefException
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-23 09:50:47 +00:00
Gavin Cornwell
30ec09529b Merged V2.2 to HEAD
8173: Partial fix for AWC-1645

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8503 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-11 10:54:48 +00:00
Gavin Cornwell
14043b0071 Merged V2.2 to HEAD
8110: Fix for AWC-1664
  8112: Fix for AWC-1697

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-11 10:37:36 +00:00
Gavin Cornwell
a0d2e45611 Merged V2.2 to HEAD
7650: Merged V2.1 to V2.2
     7542: ML contribution fixes
     7545: Merged V2.0 to V2.1
        7544: Merged V1.4 to V2.0
           7338: Fix for potential time-based GUID issues
     7554: Fixed imports after library package change
     7582: WCM-967
     7584: Fixed dependecy list for SDK for jug-lgpl-2.0.0.jar
     7642: Fix for WCM-949

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8455 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-07 10:32:22 +00:00
Gavin Cornwell
ade4ce0347 Fix for AWC-1865
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-20 15:06:32 +00:00
Gavin Cornwell
9c2cebed23 Fix for AWC-1879
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8338 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-20 14:22:43 +00:00
Kevin Roast
eae981f72e Final set of UI dialog conversion changes from usethelink. A few associated minor fixes. Improvements and optimisations to automagic file upload JSF trickery
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-01-10 14:31:58 +00:00