Commit Graph

8 Commits

Author SHA1 Message Date
Gloria Broadbent
d93b324ae4 JAPANESE: Bundle updated as per EN-rev132594
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-21 16:43:36 +00:00
Ancuta Morarasu
9a98f13348 Merged HEAD (5.2) to 5.2.N (5.2.1)
126632 jkaabimofrad: 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/BRANCHES/DEV/5.2.N/root@126983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:36:40 +00:00
Ancuta Morarasu
87339a3574 Merged HEAD (5.2) to 5.2.N (5.2.1)
126626 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125412 gbroadbent: JAPANESE: Updated bundle as per EN-rev125231


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:35:43 +00:00
Alan Davis
0b8a6b668a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
106401: JAPANESE: Repo UI files updated as per EN-rev105466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-20 12:21:39 +00:00
Alan Davis
4d13f90186 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102456: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102341: JAPANESE: Updated Japanese 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@102569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:22:15 +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
ae47b6b4b8 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102440: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102341: JAPANESE: Updated Japanese 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@102551 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:05:43 +00:00
Samuel Langlois
788d3c9c89 Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00