inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,951 Commits 338 Branches 2,260 Tags
1aee971b4be29515c50b13810ae65a8c5d19f82b
Commit Graph

217 Commits

Author SHA1 Message Date
Tatyana Valkevych
1aee971b4b Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 
110812: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110612: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110358: FRENCH: Updated bundle based on EN-rev110125


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-26 13:33:32 +00:00
Tatyana Valkevych
0ee089d95e Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 
110811: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110611: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110356: SPANISH: Updated bundle based on EN-rev110125


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-26 13:30:37 +00:00
Tatyana Valkevych
d6f7e67bdf Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 
110810: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110610: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110354: GERMAN: Updated bundle based on EN-rev110125


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-26 13:15:49 +00:00
Ray Gauss
dd308bc12f Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1) 
105662: SHA-944: Change Order of Email Send to Be After Adding Site
     - Changed workflow order


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-25 14:02:06 +00:00
Ray Gauss
39a3ac65fd Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1) 
105365: SHA-957: Create New Email Template
     - Changed InviteHelper and InviteSender methods to accept emailTemplateXpath and emailSubjectKey rather than using hardcoded defaults
     - Changed existing email send delegates to declare their respective emailTemplateXpath and emailSubjectKey
     - Added SendNominatedInviteAddDirectDelegate with new emailTemplateXpath and emailSubjectKey
     - Added SendNominatedInviteAddDirectDelegate bean definition
     - Added localization messages for subject and space
     - Changed sendInvite in workflow to use SendNominatedInviteAddDirectDelegate
     - Updated InviteSenderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-25 14:01:33 +00:00
Ray Gauss
aee14f6158 Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1) 
105016: SHA-935: Repository Invite Flow Changes
     - Added new invitation-add-direct.bpmn20.xml workflow
     - Added bootstrapping of new workflow
     - Changed InvitationServiceImpl to allow setting of workflows used
     - Added configuration of workflows used in invitationService bean
     - Added repository properties for default workflows
     - Changed InvitationServiceImpl.getWorkflowDefinition to take an enum argument
     - Changed abstract testNominatedInvitationExistingUser to accommodate both current and new invite flows
     - Added test of new flow to Activiti test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-25 14:00:26 +00:00
Alan Davis
62f870a75b Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud) (PARTIAL MERGE) 
108623:       Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            108582: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               108580: Reverse merged V4.2.5 (4.2.5)
                  << Also removing from 4.2.5, 4.2.N, 5.0.N, 5.1. Has already been removed from 5.0.2 >>
                  97973: Merged NESS/4.2.N-2015-02-10 (4.2.5) to V4.2-BUG-FIX (4.2.5)
                     97883: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more
                        - added check on task status in workflow/TaskFormPersister.java;
                        - added localization for the error message in workflow/workflow-messages.properties;
                        - added js condition to display a friendly error message in alfresco.js
                     97924: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-07-22 08:54:27 +00:00
Mark Rogers
06480e0c09 Merge WOLF-1 to HEAD 
108132: UTF-30 Fix version of share, built in Share codebase
Fix version of share-po, built in Share codebase
108130: UTF-30 Fix version of artifacts built in Share codebase + package alfresco-platform and share-services AMP instead of share-enabled alfresco war
108128: UTF-30 Fix version of artifacts built in Share codebase + package alfresco-platform and share-services AMP instead of share-enabled alfresco war

107846: EOL-10: Remove JBPM bootstrap.

Removed the JBPM boostrap bean ("workflowScheduler") and the schema validation from bootstrap-context.xml
107842: EOL-4 : Remove JBPM schema bootstrap reference.
107839: EOL-8 : Remove JBPMWorkflowTestSuite and re-instate InviteServiceTest
107823: Temp remove InviteServiceTest
107820: EOL-9: Remove workflow definitions for JBPM workflows
107813: EOL-6: Remove jBPM from MBeans
SVN ignore settings
107810: EOL-8 : Attempt to update Invite service test to use activity.
107794:EOL-5: Remove jBPM from Admin Console
107790: EOL-8 : Remove JBPM Tests
EOL-8 : more JBPM tests removed.
EOL-8 : Remove JBPM tests from Workflow Test Suite
EOL-8 : Remove JBPMEngineTest
AIRWOLF - more enterprise pom work.
UTF-143 - add the update tool JAR to the enterprise distribution.
Airwolf - need to separate dependency.share.version
EOL-8 - Remove system.workflow.engine.jbpm.enabled

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-07-21 12:18:23 +00:00
Alan Davis
f5b7d8dc3e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
106416: SIMPLIFIED CHINESE: Repo UI files updated as per EN-rev105466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-20 12:22:37 +00:00
Alan Davis
9b67c4382b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
106415: RUSSIAN: Repo UI files updated as per EN-rev105466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-20 12:22:18 +00:00
Alan Davis
e7cc5ce6bc 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
b7bcee0419 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105862: DUTCH: Repo UI files updated as per EN-rev105466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-11 13:25:38 +00:00
Alan Davis
cf3b350d32 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105810: BRAZILIAN Portuguese: Repo UI files updated as per EN-rev104823 adding a hypen to term "e-mail"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-11 13:25:25 +00:00
Alan Davis
1d879e486f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105784: BRAZILIAN Portuguese: Repo UI files updated as per EN-rev104823


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-11 13:24:55 +00:00
Tatyana Valkevych
1454b1dca4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105517: NORWEGIAN Bokmal: Repo UI files updated as per EN-rev104823


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105584 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-05 10:55:55 +00:00
Alan Davis
3304f07da9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105465: ITALIAN: Repo UI files updated as per EN-rev104823


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105495 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-03 20:18:39 +00:00
Alan Davis
0c744776dd Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105464: GERMAN: Repo UI files updated as per EN-rev104823


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-03 20:18:05 +00:00
Alan Davis
ce94652616 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105227: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105205: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105153: SIMP CHINESE: 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 11:01:26 +00:00
Alan Davis
9f0fdd970a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105226: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105204: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105152: BRAZILIAN Portuguese: 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 11:01:16 +00:00
Alan Davis
c4f6ae4b08 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105225: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105203: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105151: RUSSIAN: 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105259 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 11:01:07 +00:00
Alan Davis
fd3640a599 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105224: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105202: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105150: DUTCH: 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 11:00:56 +00:00
Alan Davis
5ef719d96c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105223: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105201: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105149: NORWEGIAN (BOKMAL): 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105257 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 11:00:45 +00:00
Alan Davis
8840066d33 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105222: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105200: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105148: JAPANESE: 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 11:00:34 +00:00
Alan Davis
2c98d3775d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105221: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105199: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105146: ITALIAN: 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 11:00:25 +00:00
Alan Davis
fbc77158f6 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105220: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105198: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105145: FRENCH: 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 11:00:14 +00:00
Alan Davis
32cccd56aa Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105219: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105197: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105144: SPANISH: 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 11:00:02 +00:00
Alan Davis
beecd6bfdc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105218: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105196: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105143: GERMAN: 4.2.5 files updated based on EN rev105009


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 10:59:52 +00:00
Alan Davis
1315c15cb6 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105091: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105079: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104999: SIMPLIFIED CHINESE: files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:53:04 +00:00
Alan Davis
23cabed6e6 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105090: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105078: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104998: BRAZILIAN PORTUGUESE: files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:52:56 +00:00
Alan Davis
aad479bbe1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105089: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105077: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104997: RUSSIAN: Italian files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105100 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:52:48 +00:00
Alan Davis
3a3f49838b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105088: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105076: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104996: DUTCH: Dutch files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105099 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:52:39 +00:00
Alan Davis
268a593f36 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105087: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105075: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104995: NORWEGIAN (Bokmal): Norwegian Bokmal files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:52:31 +00:00
Alan Davis
e4a97a5036 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105086: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105074: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104994: JAPANESE: Japanese files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105097 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:52:23 +00:00
Alan Davis
9ae3f609ff Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105085: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105073: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104993: ITALIAN: Italian files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:52:15 +00:00
Alan Davis
62e98afe7c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105084: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105072: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104992: FRENCH: French files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:52:07 +00:00
Alan Davis
4938e744ef Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105083: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105071: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104990: SPANISH: Spanish files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105094 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:51:59 +00:00
Alan Davis
82f9dc1d6a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
105081: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      105070: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         104989: GERMAN: German files updated as per EN-rev104967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 13:51:52 +00:00
Tatyana Valkevych
6bae59e971 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
104743: SPANISH: Spanish Repo UI files updated as per EN-rev103753


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-26 15:17:25 +00:00
Tatyana Valkevych
d8f9131b5d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
104742: FRENCH: French Repo UI files updated as per EN-rev103753


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-26 15:01:23 +00:00
Alan Davis
6fe9ee1655 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
102459: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102348: ITALIAN: Updated Italian 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@102572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-24 11:23:19 +00:00
Alan Davis
86d7ca94cd 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
fca1606a04 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
102457: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102342: NORWEGIAN: Updated Norwegian (Bokmal) 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@102570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-24 11:22:26 +00:00
Alan Davis
45c58fd4c0 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
5bbe034b9f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
102455: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102337: GERMAN: Updated German 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@102568 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-24 11:22:02 +00:00
Alan Davis
0ec81d89a6 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
7b4afba82c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
102448: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102348: ITALIAN: Updated Italian 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@102558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-24 11:07:23 +00:00
Alan Davis
c1654f6f0a 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
Alan Davis
3b3340d84c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
102446: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102345: BRAZILIAN: Updated Brazilian Portuguese 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@102556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-24 11:06:35 +00:00
Alan Davis
5a5c1c03ba Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
102444: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102344: RUSSIAN: Updated Russian 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@102554 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-24 11:06:14 +00:00
Alan Davis
41dec8a674 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
102443: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102343: DUTCH: Updated Dutch 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@102553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-24 11:06:04 +00:00