Commit Graph

4344 Commits

Author SHA1 Message Date
Alan Davis
bb7650ed97 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123252


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:21:33 +00:00
Alan Davis
2ff5b05d4c Use 5.1.2-SNAPSHOT of PLAT and SHARE
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:21:02 +00:00
Alan Davis
523a99fd70 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123248


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:15:21 +00:00
Alan Davis
6197c436d6 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123244


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:15:16 +00:00
Alan Davis
16211f4973 Increment version to 5.2.1-SNAPSHOT
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:14:51 +00:00
Alan Davis
0fc01975be Increment version to 5.1.2-SNAPSHOT
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123248 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:12:46 +00:00
Alan Davis
4a917bda2c Merged 5.1.N (5.1.1) to 5.1.1 (5.1.1)
123244 adavis: Increment version to 5.1.1-SNAPSHOT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:06:37 +00:00
Alan Davis
469f59d224 Increment version to 5.1.1-SNAPSHOT
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 14:53:37 +00:00
Alan Davis
6f17189760 Created 5.2.N branch from 5.1.N r123236
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 14:36:32 +00:00
Alan Davis
88fb97d249 Created 5.1.1 branch from 5.1.N r123236
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123241 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 14:35:38 +00:00
Alan Davis
39acd577b4 Increment version to 5.1.1-SNAPSHOT
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 13:27:45 +00:00
Alan Davis
d14a644112 Created 5.1.N branch from 5.1.0 r123195
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 13:22:24 +00:00
Samuel Langlois
e2e4f700df Set version to 5.1.0-SNAPSHOT, ready for 5.1.0.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@123197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-07 18:57:55 +00:00
Samuel Langlois
b08d9d6d29 Set version to 5.1.0-SNAPSHOT, ready for 5.1.0.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@123197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-07 18:57:55 +00:00
Samuel Langlois
f30491abc5 Set version to 5.1.0-SNAPSHOT, ready for 5.1.0.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@123197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-07 18:57:55 +00:00
Samuel Langlois
8871e0ef3c Set version to 5.1.0-SNAPSHOT, ready for 5.1.0.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@123197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-07 18:57:55 +00:00
Samuel Langlois
7b8d393c97 Set version to 5.1.0-SNAPSHOT, ready for 5.1.0.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@123197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-07 18:57:55 +00:00
Samuel Langlois
10b989ec60 Create branch 5.1.0 from AlfrescoOne-201602, reverting to previous naming convention
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.0@123195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-07 18:40:37 +00:00
Samuel Langlois
184b7e2fdf Specify installer.version.name when calling Ant to build installers (so we can override it on the command line)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/AlfrescoOne-201602@123005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 16:03:10 +00:00
Samuel Langlois
32e5fe375b ACE-5135 ACE-5131 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@122874 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-29 16:49:34 +00:00
Ramona Neamtu
d32a74d603 Merged HEAD (5.1) to 5.1.N (5.1.1)
122265 slanglois: Merged 5.1.0 (5.1.0) to HEAD (5.1)
      122178 slanglois: Merged DEV/ACE-5111 to 5.1.0
         122171: ACE-5111 CMIS dictionary loading fails to resolve prefix for Smart Folders 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-17 12:01:10 +00:00
Samuel Langlois
e25a417444 Merged 5.1.0 (5.1.0) to HEAD (5.1)
122178 slanglois: Merged DEV/ACE-5111 to 5.1.0
      122171: ACE-5111 CMIS dictionary loading fails to resolve prefix for Smart Folders 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@122265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-16 12:13:36 +00:00
Samuel Langlois
9ba7ffa0f7 Merged DEV/ACE-5111 to 5.1.0
122171: ACE-5111 CMIS dictionary loading fails to resolve prefix for Smart Folders 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@122178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-12 14:20:13 +00:00
Samuel Langlois
9d91008bd8 Create branch for Alfresco Full Installer AlfrescoOne-201602 from ^/services/full-installer/trunk revision 122017 based on Alfresco One Platform 5.1 and Alfresco One Share 5.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/AlfrescoOne-201602@122018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-10 12:03:57 +00:00
Samuel Langlois
4cfc230473 Create tag for Alfresco One Platform 5.1 from ^/alfresco/HEAD revision 122011
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@122012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-10 10:05:03 +00:00
Samuel Langlois
d9679f5c4f Create tag for Alfresco One Platform 5.1 from ^/alfresco/HEAD revision 122011
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@122012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-10 10:05:03 +00:00
Samuel Langlois
c2337fb0b8 Create tag for Alfresco One Platform 5.1 from ^/alfresco/HEAD revision 122011
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@122012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-10 10:05:03 +00:00
Samuel Langlois
dea8bc7e3c Create tag for Alfresco One Platform 5.1 from ^/alfresco/HEAD revision 122011
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@122012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-10 10:05:03 +00:00
Samuel Langlois
d09ec6416e Create tag for Alfresco One Platform 5.1 from ^/alfresco/HEAD revision 122011
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@122012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-10 10:05:03 +00:00
Raluca Munteanu
b0aa38b573 Merged HEAD (5.1) to 5.1.N (5.1.1)
121650 sdinuta: CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-29 14:49:19 +00:00
Jean-Pierre Huynh
8b10a816db ACE-5073: Added the amps_share folder in the distribution zip.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@121666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-29 12:05:44 +00:00
Silviu Dinuta
6d4ba35bf0 CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-28 17:03:18 +00:00
Jean-Pierre Huynh
b590e84060 ACE-5033: Use AOS Module 1.1 release to fix module name and description
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@121552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-27 15:15:30 +00:00
Raluca Munteanu
646409b4be Merged HEAD (5.1) to 5.1.N (5.1.1)
121379 jphuynh: Merged AOS-Module (5.1.0) to HEAD (5.1)
      121293 jphuynh: ACE-5033: Removed unnecessary string from the localisation files. Corrected the module name for selection in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 14:10:02 +00:00
Raluca Munteanu
e84c3f836d Merged HEAD (5.1) to 5.1.N (5.1.1)
121378 jphuynh: Merged AOS-Module (5.1.0) to HEAD (5.1)
      121281 jphuynh: ACE-5033: Changed the component name in the installer to Office Services Module. Alfresco Office Services Module is too long and doesn’t fit properly in the checkbox panel. (This also adds consistency with Google Docs integration)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 14:09:19 +00:00
Raluca Munteanu
0da54ddcd0 Merged HEAD (5.1) to 5.1.N (5.1.1)
121377 jphuynh: Merged AOS-Module (5.1.0) to HEAD (5.1)
      121280 jphuynh: ACE-5033: Updated installbuilder arguments to add aos-module distribution folder.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 14:08:59 +00:00
Raluca Munteanu
a15ab69cdc Merged HEAD (5.1) to 5.1.N (5.1.1)
121375 jphuynh: Merged AOS-Module (5.1.0) to HEAD (5.1)
      121223 jphuynh: ACE-5033: Rebranded Sharepoint Imitation to AOS Module in the bitrock installer files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 14:07:42 +00:00
Raluca Munteanu
2e7c487bb0 Merged HEAD (5.1) to 5.1.N (5.1.1)
121375 jphuynh: Merged AOS-Module (5.1.0) to HEAD (5.1)
      121223 jphuynh: ACE-5033: Rebranded Sharepoint Imitation to AOS Module in the bitrock installer files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 14:07:42 +00:00
Jean-Pierre Huynh
e4b2bd6530 Use AOS Module 1.0 release
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@121399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 13:47:01 +00:00
Jean-Pierre Huynh
9b0c4bac79 Merged AOS-Module (5.1.0) to trunk (2015.0)
121277 jphuynh: ACE-5033: Use aos-module 1.0-SNAPSHOT until we release the version


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@121387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 10:08:06 +00:00
Jean-Pierre Huynh
b0a82992d7 Merged AOS-Module (5.1.0) to trunk (2015.0)
121226 jphuynh: ACE-5033: Updated installers with the rebranding of Sharepoint Imitation to AOS Module.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@121386 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 10:07:58 +00:00
Jean-Pierre Huynh
5e8d47d92b Merged AOS-Module (5.1.0) to HEAD (5.1)
121293 jphuynh: ACE-5033: Removed unnecessary string from the localisation files. Corrected the module name for selection in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121379 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 08:35:18 +00:00
Jean-Pierre Huynh
aceaca5def Merged AOS-Module (5.1.0) to HEAD (5.1)
121281 jphuynh: ACE-5033: Changed the component name in the installer to Office Services Module. Alfresco Office Services Module is too long and doesn’t fit properly in the checkbox panel. (This also adds consistency with Google Docs integration)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 08:35:10 +00:00
Jean-Pierre Huynh
0f2b75c412 Merged AOS-Module (5.1.0) to HEAD (5.1)
121280 jphuynh: ACE-5033: Updated installbuilder arguments to add aos-module distribution folder.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 08:35:01 +00:00
Jean-Pierre Huynh
0132467940 Merged AOS-Module (5.1.0) to HEAD (5.1)
121223 jphuynh: ACE-5033: Rebranded Sharepoint Imitation to AOS Module in the bitrock installer files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 08:34:33 +00:00
Jean-Pierre Huynh
c01ae98176 Merged AOS-Module (5.1.0) to HEAD (5.1)
121223 jphuynh: ACE-5033: Rebranded Sharepoint Imitation to AOS Module in the bitrock installer files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 08:34:33 +00:00
Alan Davis
e2328b32ec Merged HEAD (5.1) to 5.1.N (5.1.1)
121253 sdinuta: CM-709: Virtual to Smart: merge VF branches (core/share) into HEAD,trunk


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-22 16:24:13 +00:00
Alan Davis
ef77e4af2f Merged HEAD (5.1) to 5.1.N (5.1.1)
121253 sdinuta: CM-709: Virtual to Smart: merge VF branches (core/share) into HEAD,trunk


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-22 16:24:13 +00:00
Silviu Dinuta
d926367677 CM-709: Virtual to Smart: merge VF branches (core/share) into HEAD,trunk
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-21 15:52:46 +00:00
Silviu Dinuta
0700271f42 CM-709: Virtual to Smart: merge VF branches (core/share) into HEAD,trunk
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-21 15:52:46 +00:00