inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,161 Commits 325 Branches 2,188 Tags
d9514c38e6b17186f284ac8cccb2d2f4aecc4bcc
Commit Graph

4161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Davis
928b954f4e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127933


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 15:21:41 +00:00
Andrei Rebegea
65a833f5f6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127895


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 13:05:40 +00:00
Andrei Rebegea
e07a3e7f97 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127702


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 12:51:50 +00:00
Alan Davis
2381ed768e Merged 5.2.N (5.2.1) to HEAD (5.2) 
127275 jphuynh: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127274 jphuynh: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         127273 jphuynh: MNT-16290: Prevent an existing folder from being deleted when aborting the installation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 09:21:59 +00:00
Alan Davis
d1392358b2 Merged 5.2.N (5.2.1) to HEAD (5.2) 
127201 jphuynh: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127199 jphuynh: BDE-674: Fix conflict tags.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127871 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 09:21:25 +00:00
Alan Davis
596bbb5174 Merged 5.2.N (5.2.1) to HEAD (5.2) 
127200 jphuynh: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127190 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 09:21:19 +00:00
Alan Davis
f13bf0b481 Merged 5.2.N (5.2.1) to HEAD (5.2) 
127200 jphuynh: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127190 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 09:21:19 +00:00
Alan Davis
367e459817 Merged 5.2.N (5.2.1) to HEAD (5.2) 
126317 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126253 adragoi: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126110 jphuynh: MNT-16202: Fix apostrophes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127849 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 09:09:38 +00:00
Alan Davis
338bc37d96 Merged 5.2.N (5.2.1) to HEAD (5.2) 
126243 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126124 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126103 jphuynh: MNT-16202: Fixed stupid double quotes formatting as the default setting for the file cannot have an encoding specified.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 09:09:22 +00:00
Alan Davis
b90086a2c0 Merged 5.2.N (5.2.1) to HEAD (5.2) 
126062 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126021 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125993 jphuynh: MNT-15862: Removed too restrictive rule on error message displayed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 08:34:55 +00:00
Alan Davis
b0307f16b3 Merged 5.2.N (5.2.1) to HEAD (5.2) 
126006 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125932 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125903 gbroadbent: ALL LANG: Installer files in all languages fully updated as per rev125902


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127836 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 08:34:36 +00:00
Alan Davis
20bc2cd178 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125917 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125882 adragoi: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125826 jphuynh: MNT-16202: Remove unnecessary license agreement files (installation time)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 08:34:00 +00:00
Alan Davis
48a714ad38 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125915 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125880 adragoi: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125759 jphuynh: MNT-16202: UA Review. Removed "Please"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 08:33:53 +00:00
Alan Davis
9e4289cecb Merged 5.2.N (5.2.1) to HEAD (5.2) 
125914 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125879 adragoi: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125746 jphuynh: MNT-16202: Completed english localisation file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 08:33:47 +00:00
Alan Davis
0072cef589 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125913 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125878 adragoi: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125745 jphuynh: MNT-16202: Added license agreement panel in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 08:33:40 +00:00
Alan Davis
3db32e4b74 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125861 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125819 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125735 mbergljung: MNT-16200: updated share-config-custom.xml comments for aspect and type i18n config


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-04 11:01:16 +00:00
Alan Davis
4fef0c0ef4 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125788 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 17:08:06 +00:00
Alan Davis
22512d8c9e Merged 5.2.N (5.2.1) to HEAD (5.2) 
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:45:04 +00:00
Alan Davis
4818f7ccf5 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125781 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:40:56 +00:00
Alan Davis
42e5e41b3c Merged 5.2.N (5.2.1) to HEAD (5.2) 
125444 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125337 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125248 jphuynh: MNT-15842: Force the reset of Solr Sharding settings values when switching from Advanced to Easy mode in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:10:08 +00:00
Alan Davis
ac61b30062 Merged 5.2.N (5.2.1) to HEAD (5.2) 
124281 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124275 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124171 jphuynh: MNT-15874: Fix missing Remote Solr configuration properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:03:12 +00:00
Alexandra Leahu
244f0c6c1e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127507


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 15:04:37 +00:00
Alan Davis
4a3b8f27f8 Merged 5.2.N (5.2.1) to trunk (5.2) 
127197 jphuynh: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127192 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127635 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:14:27 +00:00
Alan Davis
f8c3e48467 Merged 5.2.N (5.2.1) to trunk (5.2) 
127016 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126679 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126277 skopf: MNT-16223 - Different AOS versions on Alfresco one and Alfresco one Platform using the same build	
          


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:13:46 +00:00
Alan Davis
19faa7b63a Merged 5.2.N (5.2.1) to trunk (5.2) 
126118 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126116 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126106 slanglois: MNT-16094 Apply alfresco-aos-module to alfresco.war in EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:13:17 +00:00
Alan Davis
27b8ab4f99 Merged 5.2.N (5.2.1) to trunk (5.2) 
126117 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126086 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126048 jphuynh: MNT-16233: Use AOS 1.1.1. (Incomplete version bump from ACE-5133 done in Platform)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:12:51 +00:00
Alan Davis
342bcf34cb Merged 5.2.N (5.2.1) to trunk (5.2) 
125810 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125617 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125598 slanglois: ACE-5253 Bring AOS (ROOT.war and _vti_bin.war) back into the EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:12:09 +00:00
Alan Davis
d0ba492e3f Merged 5.2.N (5.2.1) to trunk (5.2) 
125451 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125344 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125267 slanglois: MNT-16094 Remove ROOT.war from the Alfresco One EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:11:22 +00:00
Alan Davis
9157daf317 Merged 5.2.N (5.2.1) to trunk (5.2) 
125450 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125343 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125254 amukha: ACE-5130: [SUSE 12.0, Web Logic] - Admin Console - Install Application Assistant - Install Alfresco Failed
            - removed _vti_bin.war from the configuration as it is no longer shipped in the ear.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:05:27 +00:00
Alan Davis
4083350641 Merged 5.2.N (5.2.1) to trunk (5.2) 
124773 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124768 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124408 jphuynh: ACE-5135: Fixed alfresco-full-installation version


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:05:07 +00:00
Alan Davis
66c2fbf73e Merged 5.2.N (5.2.1) to trunk (5.2) 
124772 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124767 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124406 jphuynh: ACE-5135: Pre-apply share-services AMP in alfresco.war packaged in EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:03:59 +00:00
Alan Davis
3e0bce08ab Merged 5.2.N (5.2.1) to trunk (5.2) 
124770 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124598 slanglois: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124596 slanglois: ACE-5135 Add aspecjrt jar to myfaces1_1-websphere-shared-lib


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127626 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 12:58:58 +00:00
Alan Davis
c5445b1f15 Merged 5.2.N (5.2.2) to trunk (5.2) (RECORD ONLY) 
- Commits from trunk: 126267
   - record only commits from 5.1.N:
     126666,127017,127070,127127,127164,127196,127211,
     127255,127291,127364,127401,127515

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-02 14:55:50 +00:00
Alan Davis
fd402e08cf Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127467


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-02 14:46:07 +00:00
Alexandra Leahu
3319b6469f Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127458


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-01 13:29:36 +00:00
Raluca Munteanu
a94b7c3f02 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127375


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-25 14:42:00 +00:00
Raluca Munteanu
e63e2e6a09 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127305,127306,127355


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-24 14:50:43 +00:00
Raluca Munteanu
4aa15a7a30 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127296


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-24 14:38:04 +00:00
Cristian Turlica
3cc104e553 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127277,127278


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-20 13:24:24 +00:00
Cristian Turlica
c84d6ca771 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127260


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-20 13:18:34 +00:00
Jean-Pierre Huynh
89691f5370 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
127274 jphuynh: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      127273 jphuynh: MNT-16290: Prevent an existing folder from being deleted when aborting the installation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127275 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 15:40:43 +00:00
Jean-Pierre Huynh
9469c60054 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 
127273 jphuynh: MNT-16290: Prevent an existing folder from being deleted when aborting the installation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 15:40:04 +00:00
Andrei Rebegea
529bd49464 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127225,127234,127236


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 14:57:21 +00:00
Andrei Rebegea
650dafe018 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127216


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 14:54:58 +00:00
Andrei Rebegea
aa5260d711 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 127179,127187


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 14:29:03 +00:00
Andrei Rebegea
231967da7c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 127171


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 14:25:48 +00:00
Jean-Pierre Huynh
bd07ff387a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
127199 jphuynh: BDE-674: Fix conflict tags.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:48:52 +00:00
Jean-Pierre Huynh
06f78b84d3 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
127190 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:48:38 +00:00
Jean-Pierre Huynh
1931851a1d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
127190 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:48:38 +00:00
Jean-Pierre Huynh
c1cc0d0ee8 BDE-674: Fix conflict tags. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-18 11:47:35 +00:00