Raluca Munteanu
8674e2bfc8
Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
...
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Jean-Pierre Huynh
5d17b7e9f3
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119066 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117349 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117256 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114527 adavis: Merged BCRYPT to 5.0.2-CLOUD
114255 gjames: createUser with a password that has already been hashed MNT-14892,RA-601
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:58 +00:00
Jean-Pierre Huynh
47373d2dc0
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119058 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117340 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117248 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114517 adavis: Merged BCRYPT to 5.0.2-CLOUD
114012 gcornwell: MNT-14892: Updates to upgrade password hash job and test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:59 +00:00
Jean-Pierre Huynh
1670fcce1e
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119057 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117339 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117247 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114516 adavis: Merged BCRYPT to 5.0.2-CLOUD
114004 gjames: Added a hashUserPassword method, and working on UpgradePasswordHashTest MNT-14892
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:53 +00:00
Derek Hulley
47b45d9ee1
PersonService and AuthenticationDao changes
...
- Clean up javadocs (remove uncommented parameters and fix method comments)
- ALF-8996: Administrator users can disable themselves
- Administrator users cannot be disabled (the repo ignores the request)
- Administrator users cannot expire, be locked; they remain active no matter what
- UI attempts to disable admin but the request just does nothing (UI could gray it out, I suppose)
- (ALF-8805) ALF-9056: RINF 40: Fix XPath query to use selectNodes
- Final (Team-introduced) Lucene query in PersonServiceImpl
- Cleanup and better tests
- Unit test template retrieval for user notification (not easy via UI)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28528 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-22 19:51:46 +00:00
Paul Holmes-Higgin
cefda8c965
Updated header to LGPL
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:48:39 +00:00
Paul Holmes-Higgin
43e93f3c14
Updated header to LGPL
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:09:17 +00:00
Paul Holmes-Higgin
4e2300f095
Updated copyright
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-19 17:17:36 +00:00
Derek Hulley
0c10d61a48
Merged V2.0 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
- FLOSS
- Some files will need a follow-up
-root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
-root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
-onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 06:44:46 +00:00
Paul Holmes-Higgin
31c250682b
Changed licence headers
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-08 18:59:58 +00:00
Derek Hulley
f4e00169ab
Merged V1.3 to HEAD (3180:3203, 3204:3217)
...
svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3180 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3203 .
svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3204 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3217 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-26 11:00:06 +00:00
Derek Hulley
506e408ca7
Merge V1.2.0 BRANCH to HEAD
...
svn merge -r 2519:2565 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-22 12:23:43 +00:00
Andrew Hind
c7b9c343bc
Minor tidy ups
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-18 10:26:31 +00:00
Derek Hulley
e1e6508fec
Moving to root below branch label
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-08 07:13:07 +00:00