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
8,085 Commits 338 Branches 2,260 Tags
f93db3cca31606871b9b2efe3a1a139c2dbf9888
Commit Graph

239 Commits

Author SHA1 Message Date
Gloria Broadbent
f93db3cca3 JAPANESE: Updated bundles based on EN rev115827 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116383 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 12:52:59 +00:00
Gloria Broadbent
c234fc188e ITALIAN: Updated bundles based on EN rev115827 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 12:52:20 +00:00
Gloria Broadbent
7adf8248dd FRENCH: Updated bundles based on EN rev115827 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116381 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 12:51:53 +00:00
Gloria Broadbent
146ea794d8 SPANISH: Updated bundles based on EN rev115827 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 12:51:30 +00:00
Gloria Broadbent
6accc7f565 GERMAN: Updated bundles based on EN rev115827 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116379 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 12:51:04 +00:00
Alan Davis
113f170a22 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115569 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113040 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         112938 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112693 nsmintanca: Merged NESS/4.2.N-2015-09-17 (4.2.6) to V4.2-BUG-FIX (4.2.6)
               112598: 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 condition to display a friendly error message in alfresco.js
                  - referenced  current object to access its properties in task-edit-header.js
                  - added noCache parameter to the URL to ensure that requests are always made to the server to update data at back action in data-loader.js


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:18:06 +00:00
Ahmed Owian
a1a53bc3de Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1) 
113487 ragauss: ACE-4268: Added Users' Activiti Tasks Remain Active After Invitation Accepted
     - Removed user task step from add-direct workflow
     - Added check for completed start task in InvitationServiceImpl to avoid error throwing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-07 20:10:40 +00:00
Gloria Broadbent
d076fff262 SIMPLIFIED CHINESE: Updated bundle based on EN rev111175 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 08:30:43 +00:00
Gloria Broadbent
15977fadb4 BRAZILIAN Portuguese: Updated bundle based on EN rev111175 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111816 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 08:30:01 +00:00
Gloria Broadbent
87c2fd887b RUSSIAN: Updated bundle based on EN rev111175 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111815 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 08:29:06 +00:00
Gloria Broadbent
69eb720a7a DUTCH: Updated bundle based on EN rev111175 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 08:28:32 +00:00
Gloria Broadbent
57362fa8d7 JAPANESE: Updated bundle based on EN rev111175 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 08:27:08 +00:00
Gloria Broadbent
a4f7a583b1 ITALIAN: Updated bundle based on EN rev111175 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 08:25:46 +00:00
Gloria Broadbent
d7bbdd2f7a FRENCH: Updated bundle based on EN rev111175 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 08:24:30 +00:00
Gloria Broadbent
21f239d057 SPANISH: Updated bundle based on EN rev111175 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 08:23:44 +00:00
Gloria Broadbent
fbcde047fe GERMAN: Updated bundle based on EN rev111175 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 08:22:54 +00:00
Tatyana Valkevych
970409fa59 Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 
110821: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110618: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110368: SIMPLIFIED CHINESE: Updated bundle based on EN-rev110125


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-26 13:41:55 +00:00
Tatyana Valkevych
d87cb2bcdc Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 
110820: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110617: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110366: BRAZILIAN PORTUGUESE: Updated bundle based on EN-rev110125


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-26 13:39:56 +00:00
Tatyana Valkevych
31f61c2b55 Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 
110818: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110616: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110365: DUTCH: Updated bundle based on EN-rev110125


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-26 13:38:47 +00:00
Tatyana Valkevych
f9080d5579 Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 
110816: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110615: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110364: NORWEGIAN (Bokmal): Updated bundle based on EN-rev110125


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-26 13:37:42 +00:00
Tatyana Valkevych
be29d6c811 Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 
110815: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110614: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110361: JAPANESE: Updated bundle based on EN-rev110125


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-26 13:36:21 +00:00
Tatyana Valkevych
29a12ce25c Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 
110814: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110613: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110360: ITALIAN: Updated bundle based on EN-rev110125


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-26 13:35:12 +00:00
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