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
820da6ecab
Merge from HEAD to WCM-DEV2.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-02 18:19:00 +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
Britt Park
7d940d08e1
Big hunk of merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-28 17:31:18 +00:00
Britt Park
7f79a2a498
Merged up to HEAD.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-16 19:18:30 +00:00
Paul Holmes-Higgin
c37ff8805c
Merged enterprise features
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-03 18:34:13 +00:00
Kevin Roast
c9e5bd6c22
. Rhino JavaScript integration checkpoint:
...
- Added a new action to the repository for executing JavaScript files
- Added script action UI to rule framework, means we can execute a JavaScript file as part of a rule
- Lucene search and Saved Search functionality added to default data-model for scripts
- Added Scripts folder to Data Dictionary (created during bootstrap)
- Created patch to add the Scripts folder to existing schemas
- Added ScriptService to ServiceRegistry bean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-03 12:01:21 +00:00
Derek Hulley
776314da72
svn merge -r 2570:2595 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root
...
svn merge -r 2597:2649 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@2650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-12 14:58:21 +00:00
Derek Hulley
d4d33c1e34
Merge V1.2.0 BRANCH to HEAD
...
svn merge -r 2566:2569 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@2570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-22 16:21:14 +00:00
Kevin Roast
1858509d3a
. Patch to load email templates content into older schema (first patch to perform an import)
...
. Updated schema version to 10
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-10 15:51:17 +00:00
Kevin Roast
d8b2e56aa3
. Addition of Email Templates folder (in Data Dictionary) to Bootstrap spaces.xml
...
. New patch to apply Email Templates folder to older schemas
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-03 17:39:32 +00:00
Gavin Cornwell
e667abaac6
Changed forums icons to use browse bean's small icon resolver and required patch
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-02 22:33:32 +00:00
David Caruana
32990f3d62
Allow for export of all Repository content including version store. Required:
...
- supporting content in ANY properties (for Content Service and Exporter)
- moving Content related permission to sys:base as type can support a property of datatype CONTENT
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-28 17:11:17 +00:00
Gavin Cornwell
548ff709d8
Changed version number to 1.3.0dev
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-28 10:08:02 +00:00
David Caruana
cab7aa3b4e
AW-542 Guest user can not see any Categories
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2456 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-21 16:12:12 +00:00
Gavin Cornwell
6fac677245
Removed RC2 from version number and removed TODO comment
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 12:02:18 +00:00
Derek Hulley
70c1679a9a
Version moved to RC2
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-09 14:55:09 +00:00
Kevin Roast
b8bad79ca5
Added missing ACL section to spaces.xml for Saved Searches folder
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-01 12:57:29 +00:00
Derek Hulley
7955eb623a
Fixed AR-359: Property values never persisted as Serializable unless absolutely necessary. Bumped schema version up to 4.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-30 01:45:32 +00:00
Gavin Cornwell
c81c8f59e8
Fixed issue where discussions were lost after checkin & updated version number
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-27 15:43:49 +00:00
Derek Hulley
dc6bc0d726
Patch service I18N. Added permission data patch for AR-344. Bumped up schema version to 3.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2206 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 19:07:06 +00:00
Derek Hulley
e6f160ca9f
First real patch: Saved Searches folder fix.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-20 17:53:05 +00:00
Derek Hulley
02dc9ced9b
Patch checkpoint.
...
Service descriptor changes including introduction of schema number.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-20 14:45:16 +00:00
Paul Holmes-Higgin
44828949fa
updated to 1.2.0dev
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-04 12:38:04 +00:00
Kevin Roast
bcf6f7a578
updated version to 1.1.2
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2053 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-21 12:55:27 +00:00
Gavin Cornwell
6accb7a795
Added edit capabilities to forums
...
Disabled forums functionality
Changed version number back to 1.1.1
Added support for next/previous item navigation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-13 12:44:00 +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