13424: ETHREEOH-1242: Sample LDAP authentication config breaks site invites in Share
13427: Fixes for ETHREEOH-1157: Propagate exceptions using ReportedException
13428: Fix ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and fixes_to_schema
13429: Specific fix for ETHREEOH-1157: duplicate/triplicate users not properly prohibited
13436: Merged V2.2 to V3.1
13435: Merged V2.1 to V2.2
12307: Merged DEV/V2.1SP7 to 2.1
11927: ETWOONE-396
12112: ETWOONE-396
13437: Fixed ETHREEOH-1498: Mismatched closing XML tag in ehcache-custom.xml.sample.cluster
13439: Fix for ETHREEOH-1157: JSF Dialogs Absorbing Exceptions
13456: Fixed ETHREEOH-1472: Changes to systemBootstrap cause bootstrapping ACP's not to work
13469: Upgrade patch to update internal version2Store counter (follow-on fix for ETHREEOH-1540)
13491: Chaining example for DOC-84
13492: Fixed paths in zip file
13494: Fixed GenericBootstrapPatch when overriding bootstrap views
13495: Added @version javadoc
13496: Minor logging updates
13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
13500: Temporary fix for Sharepoint issue raised last week
13502: ETHREEOH-1575: It's impossible to create Change Request task
13511: Fix for ETHREEOH-1549: Impossible to create HTML web content
13529: Fix for ETHREEOH-1595
13531: Fix for ETHREEOH-1607: Error on chaining example xml - malformed comment
13537: Build fix ... exclude the system user from auto creation
13538: Build Fix - further contraints to aviod auto-creation of guest
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1:r12307
Merged /alfresco/BRANCHES/V2.2:r13435
Merged /alfresco/BRANCHES/V3.1:r
13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456,
13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13173: Merged V2.1-A to V3.1
10964: Fix for ADB-81: String 'Template' in Japanese is not good format
10971: Fix for ADB-85: Configure dashboard wizard: long items description get truncated
10972: Fix for ADB-95: All templates should be parameterized using a such that they pickup the server name and port number of the current installation
10973: Fix for ADB-117: Configure Dashboard Wizard. Layout word (Step 3) not localized for japanese and french
13174: Merged V2.1-A to V3.1
10975: Fix for ADB-118: Content attributes not localized [client templates]
13182: Merged V2.1-A to V3.1
11058: Fix for ADB-121: Next & Finish button remain disabled in 'Create Content in your home space' wizard even after entering name when locale is set to French
11059: Fix for ADB-128: Date format is different for 'Manage Content Rules' in Japanese Locale
13190: Merged V2.1-A to V3.1
11070: Fix for ADB-120 ACT 4773
13192: Merged V2.1-A to V3.1
11195: Fix for ADB-130: The 'Finish' button doesn't work after editing the content
13193: Merged V2.1-A to V3.1
8395: Remove user and group admin actions from Admin console [added config switch - off by default]
8584: Removed option for user to change password [added config switch - off by default]
10203: Fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
10374: Further fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
13194: Merged V2.1-A to V3.1
12095: Fix for ADB-131
13195: Merged V2.1-A to V3.1
12097: Fix for ADB-133, ADB-134
12102: Fix for ADB-139
13196: Merged V2.1-A to V3.1
12350: Fix for ADB-142
13197: Merged V2.1-A to V3.1
12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
12878: Merged record-only for V2.1-A to HEAD
12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
13198: Merged V2.1-A to V3.1
12977: Fix for ADB-158: Intermittent error while accessing the login page
13142: Another fix for ADB-158: Intermittent error while accessing the login page
13199: Merged V2.1-A to V3.1
11589: Fix for ADB-95: All templates should be parameterized
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13023: ISO date fix for ETHREEOH-1215
13153: Merged V2.1-A to V3.1
9026: - Added "My Content" link to error page
- Manual merge of Safari fixes
- Fixed exploded build target after recent removals
13155: Restored line removed in merge
13156: Merged V2.1-A to V3.1
9027: *RECORD-ONLY* Further Safari rendering fix
9028: Removed use of generics from JSP so it compiles in JBoss
13161: Merged V2.1-A to V3.1
9051: *RECORD-ONLY* Fix for ACT 2806 (linked content was returning 404 error)
13162: Merged V2.1-A to V3.1
8680: *RECORD-ONLY* Added back "too_many_users" message as it got removed
13164: Merged V2.1-A to V3.1
8699: Added DOCTYPE line
8994: Added Copyright for Sun due to Rhino debugger use.
9388: *RECORD-ONLY* ACT-3263 - Localization of "username" and "password" in login.jsp
13166: Merged V2.1-A to V3.1
9748: *RECORD-ONLY* Fix for ACT 3455 (ADB-90) - Editor role can not check out documents
10199: Fix for ADB-86: Clicking 'Cancel' while adding a composite condition for a Rule on a space in CS ES has no effect
13167: Merged V2.1-A to V3.1
10673: Fix for ADB-110/ACT-4247: Review/Change Records Management URLs and make it compatible to Adobe's build
10674: Fix for ADB-109: setting log4j.rootLogger to WARN thows unexpected warn when accessing My Home
13168: Merged V2.1-A to V3.1
10883: *RECORD-ONLY* Fix for ADB-124: Change Search field length to 1
10905: Fix for ADB-114 ACT 4425. Also will fix ALFCOM-1895 when merged to HEAD.
10961: Fix for ADB-44: Create menu link should not be visible if the menu is empty
10962: Fix for ADB-61: Alfresco breadcrumbs + Navigator become inconsistent....
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert'
13000: Added log4j to Eclipse classpath (unexported)
13001: Merged V2.1-A to V3.1
9127: Performance improvement to folder copy
9151: *RECORD-ONLY* Fix index back up failing with missing files
13002: Merged V2.1-A to V3.1
9174: Further fixes for ACT-2588 (Lucene backup read-write locks)
9279: Fix ADB-84. PHP module is not restricted by the upper version
10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule
13006: Merged V2.1-A to V3.1
10893: Fixes for ADB-78 & ADB-98
- Fixed service getter/setter pattern as well
10903: Fix for ADB-115 ACT-4355
13010: Made AVMLockingBootstrap resilient to read-only mode
13011: Better message for InvalidStoreRefException
13013: Merged V2.1-A to V3.1
9189: Composite Conditions Support Part 1 of 2 (repo)
9190: Composite Conditions Support Part 1a of 2 ( missed file from repo)
13015: Port of Adobe CIFS/FTP configuration changes
13017: Convert avoids folders given by '--svn-status' option
13018: Merge V2.1A to V3.1
7746: (record-only) Added ability to specify a custom CIFS authenticator class
8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows
8700: (record-only) Update to prevent any native calls via configuration code
8705: (record-only) Filer out the '0.0.0.0' bind address
8864: (record-only) Added the getBean() method for custom authenticators to get access to beans
9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute
8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values
12144: (record-only) CIFS virtual circuit fixes
13020: Merged V2.1-A to V3.1 (Composite Actions)
9191: Composite Conditions Support Part 2 of 2 (client)
9243: Composite Conditions Support Part 1 of 2 (client)
9245: Composite Conditions Support Part 2 of 2 (repo)
13021: Merged V3.0 to V3.1
13008: Merged V2.2 to V3.0
12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin.
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12310: Merged V2.2 to V3.0
12306: Merged V2.1 to V2.2
12212: Final set of XSS and HTML encoding fixes for ETWOONE-90
12312: Merged V2.2 to V3.0
12311: Merged V2.1 to V2.2
11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen.
12316: Fix for merge issue
12317: Merged 2.1 to 3.0
12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043
12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90
12321: Missing file from previous checkin
12324: Merged 2.2 to 3.0
12320: Merged 2.1 to 2.2
11682: Fix for ETWOONE-87: Behavior of delete cascade
12326: Merge 2.1 to 3.0
11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6933: Various fixes for cross-site javascript and associated trickery to web-client UI screens
Plus fixes to several dialogs broken in use-the-link dialog conversion changes.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
- Updated web services, SDK and web client where appropraite
- Patch added to migrate existing rules
- Entire rule service can now be disabled programmatically
- Rule service is now disabled during the patching process
- StoreEnum and languageEnum types removed from web service interfaces
- Multiple rule types now supported in the repo (but not in the UI)
- Removed owning node ref from action and rule .. now calculated from methods on the rule service
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- each wizard now has its own list of types
- made the inline text editing page the default page in create content wizard
- dialog and wizard config is now global
- fixed problem with create content wizard action
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- 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
