Britt Park
b2f9df29d1
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
...
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-08 05:17:40 +00:00
Britt Park
111296d4dc
Heinous merge from HEAD. Seems to basically work. Be on guard however.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-18 02:24:36 +00:00
Britt Park
8031cc6574
Big honkin' merge from head. Sheesh!
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-27 01:01:30 +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
David Caruana
60834eafb7
Fix AWC-560 Manage Space Users fails with "a system error happened during the operation: null"
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-23 15:15:27 +00:00
Derek Hulley
42a2cd165a
Beefed up javadocs around automatic person creation
...
Added specialized PersonException for when the user could not be automatically created
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2439 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-18 10:54:09 +00:00
David Caruana
fb63c64b0a
Fix AWC-367. Deleting a user from the system does not remove that user from any groups they may be in.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2391 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-15 16:35:40 +00:00
Roy Wetherall
8df7c1db7e
- Added batchable user queries to admin web service API
...
- Added big P person service
- web service clinet jar is now build by build process
- Added distribute-web-service-client target which will create web service lcient distribution zip file containing jar and dependant resources
- Added web service client property file so destination repository can be easily specified
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-27 17:03:57 +00:00
Andrew Hind
aa831ddd85
Tidy up of UserTransaction roll back on throwable as opposed to Exception
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-26 15:38:58 +00:00
Andrew Hind
68ae6ef330
Ldap progress and user/person search
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 14:17:41 +00:00
Andrew Hind
4408850b7a
Guest and LDAP progress
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-17 14:17:39 +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
