Alan Davis
83a8b9a09b
Merged 5.2.0 (5.2.0) to HEAD (5.2)
...
REPO-1710 Complete 5.2 branding items for Alfresco Community Edition
- Deferred merges: 133228-133238,133589-133594,133748,133750-133761,133853-133854
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-11 10:28:37 +00:00
Alan Davis
f5187ac0e8
Merged 5.2.N (5.2.1) to HEAD (5.2)
...
132975 gbroadbent: SIMPLIFIED CHINESE: Bundle updated as per EN-rev132594
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133011 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-22 10:58:50 +00:00
Jamal Kaabi-Mofrad
bad9257f2f
Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
...
125496 gbroadbent: ES-PT_BR-FR-DE-NB-JA-ZH_CN: Improved files to display a colon before variable instead of period at the end of a string. (Just comestic)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:56:36 +00:00
Jamal Kaabi-Mofrad
773f540cf5
Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
...
125417 gbroadbent: SIMP CHINESE: Updated bundle as per EN-rev125231
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:56:20 +00:00
Alan Davis
45cf7ee854
Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
...
102458: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
102346: SIMP CHINESE: Updated Simplified Chinese files based on EN-rev101823. Also this commit is a fix for ACE-3931.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:22:38 +00:00
Alan Davis
76d41b1637
Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
...
102454: revert 102447-102450,102442,102440,102437 as the config in MergeMonkey was ahead of the current state and as a result changes were discarded.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:21:49 +00:00
Alan Davis
7e0386f385
Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
...
102447: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
102346: SIMP CHINESE: Updated Simplified Chinese files based on EN-rev101823. Also this commit is a fix for ACE-3931.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:06:46 +00:00
