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
13426: Support for fix to ETHREEOH-1157: Allow dialogs to propagate exceptions
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r13426
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13541 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13484: ETHREEOH-1547: Do not set requiresNew flag and propagate exceptions in BaseDialogBean
13383: ETHREEOH-1220: Update LDAP-authentication-context to include allowGetEnabled entry to support Share
13381: ETHREEOH-1181: NTLM authentication periodically fails over CIFS - "Read-Write transaction started within read-only transaction"
13376: ETHREEOH-279: Friendly error message when cm:filename regular expression constraint is violated
13364: ETHREEOH-814: Correct character encoding issues in LDAP synchronization
13353: ETHREEOH-1444: Ability to run Alfresco from unexploded .war file with embedded license
13328: ETHREEOH-1400: Prevent TLD warnings on Weblogic startup
13183: Follow up to 13177: Fixes for Weblogic compatibility
13177: Fixes for Weblogic compatibility
13109: Build/test fix (to avoid unintentional import via application-context.xml)
13100: Checkpoint for new DM index check (enterprise-only)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Create Web Content action (HTML and plain text) now creates content in the current AVM store
- TODO: create in the correct sub-folder
- Refactoring of the modified Create Content Wizard into a new wizard Create Web Content Wizard
- Integrated XML form templating into the current website AVM path (still needs some testing/fixing up…)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- "Websites" folder created under root of Company Home during bootstrap
- Bootstrap properties and getter helper added to import-export-context & web-client
- Beginnings of the Create Website wizard
- Action definition added for Create Website action
- Beginings of the model for avm webfolders and associated sub-structures
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
