Commit Graph

4161 Commits

Author SHA1 Message Date
Andreea Nechifor
1150e43c62 REPO-1193 MNT-16734: Added a new release version alfresco-messaging-repo 1.2.8
Resolve security issue CVE-2014-3612 updating ActiveMQ 5.13.0.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-15 12:54:40 +00:00
Ancuta Morarasu
30b175e512 Reverse merged 5.2.N (5.2.1)
135848 anechifor: REPO-1193 MNT-16734: Added a new release version alfresco-messaging-repo 1.2.8
         Resolve security issue CVE-2014-3612 updating ActiveMQ 5.13.0.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-15 12:49:13 +00:00
Andreea Nechifor
e6ed9d7b9a 135848 anechifor: REPO-1193 MNT-16734: Added a new release version alfresco-messaging-repo 1.2.8
Resolve security issue CVE-2014-3612 updating ActiveMQ 5.13.0.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-15 10:03:57 +00:00
Kevin Roast
d08dd37c35 Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
134638 kroast: ACE-5700 - [Security] Reflected XSS in admin-tenantconsole

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-13 14:05:21 +00:00
Kevin Roast
2b5212551b ALF-21809 - The Community admin console isn't using the CSRF prevention token pt2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@135119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-13 16:36:11 +00:00
Alexandru Epure
c95ef20357 Merged 5.2.N (5.2.1) to HEAD (5.2)
135057 aepure: REPO-1818: alfresco-platform-distribution POM for 5.2.d / 201612 GA includes incorrect version for Share artifacts
      - removed Share dependencies from alfresco-platform-distribution/pom.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@135081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-10 13:40:45 +00:00
Alexandru Epure
110ec41ad5 REPO-1818: alfresco-platform-distribution POM for 5.2.d / 201612 GA includes incorrect version for Share artifacts
- removed Share dependencies from alfresco-platform-distribution/pom.xml

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-09 13:17:53 +00:00
Alan Davis
d6da8d3084 Merged 5.2.0 (5.2.0) to HEAD (5.2)
134319 kroast: Merged 134318 Copyright 2017 on Alfresco repo web app index page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-07 15:04:27 +00:00
Kevin Roast
0ec271c0b7 Merged HEAD to 5.2.N (5.2.1)
134344 kroast: ALF-21809 - The Community admin console isn't using the CSRF prevention token

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-06 09:16:58 +00:00
Alexandru Epure
e48595542e Merged 5.2.N (5.2.1) to HEAD (5.2)
134835 aepure: ACE-5761: References to Activiti need altering in "notice.txt"
      - Update Activiti license text

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-31 09:14:02 +00:00
Alexandru Epure
df1fe96f22 ACE-5761: References to Activiti need altering in "notice.txt"
- Update Activiti license text

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-31 09:06:29 +00:00
Kevin Roast
3cb36e9724 ALF-21809 - The Community admin console isn't using the CSRF prevention token
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-13 13:58:04 +00:00
Kevin Roast
0dcbf73da3 Copyright 2017 on Alfresco repo web app index page
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-13 07:53:36 +00:00
Samuel Langlois
fc0d45b944 Merged 5.2.0 (5.2.0) to HEAD (5.2)
134298: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      134296: REPO-1710 Retain 'alfresco-community' for zip and installer file names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@134299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-12 14:37:36 +00:00
Samuel Langlois
81da9b4171 REPO-1710 Retain 'alfresco-community' for zip and installer file names
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@134296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-12 13:59:03 +00:00
Alan Davis
c8de49013b Merged 5.2.0 (5.2.0) to HEAD (5.2)
REPO-1710 Complete 5.2 branding items for Alfresco Community Edition
   - Deferred merges: 128252,132775,132846,133049,133250-133252,133265,133283
   - Both branches are now in sync except for version numbers

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@134287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-11 15:35:03 +00:00
Alan Davis
562763bee1 Merged 5.2.0 (5.2.0) to trunk (5.2) (RECORD ONLY) :
- 133259


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@134269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-11 12:36:11 +00:00
Alan Davis
2c1ca84acd Merged 5.2.0 (5.2.0) to HEAD (5.2)
133424 slanglois: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      133352: ACE-5664 Unpack Manager in all installers, otherwise it is missing in Share


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-11 10:32:43 +00:00
Alan Davis
ec17295260 Merged 5.2.0 (5.2.0) to HEAD (5.2)
REPO-1710 Complete 5.2 branding items for Alfresco Community Edition
   - Deferred merges: 133228-133238,133589-133594,133748,133750-133761,133853-133854

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-11 10:28:37 +00:00
Alan Davis
e5b9509f65 Merged 5.2.0 (5.2.0) to HEAD (5.2)
REPO-1710 Complete 5.2 branding items for Alfresco Community Edition
   - Deferred merges: 133228-133238,133589-133594,133748,133750-133761,133853-133854

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-11 10:28:37 +00:00
Samuel Langlois
42a5b632a5 Merged 5.2.0 (5.2.0) to HEAD (5.2)
133894: ACE-5717: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      133889 amukha: MNT-17283: Alfresco One 5.1.2 depends on unreleased version of AOS
          - Updated AOSM version.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@134030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-03 10:54:51 +00:00
Alex Mukha
24ccfb0dcd MNT-17283: Alfresco One 5.1.2 depends on unreleased version of AOS
- Updated AOSM version.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@133889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-19 14:19:47 +00:00
Daniel Billigmaier
193f04e4fe JAPANESE: Updated installer strings (REBRANDED) for 5.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133826 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-16 11:06:22 +00:00
Daniel Billigmaier
fa02ce9b8a FRENCH, ITATIAN, DUTCH, NORWEGIAN (BOKMAL), BRAZILIAN PORTUGUESE, SIMPLIFIED CHINESE, RUSSIAN: Updated installer strings (REBRANDED) for 5.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-14 16:14:11 +00:00
Gloria Broadbent
3288c9426b GERMAN and SPANISH: Installer files rebranded
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133526 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-09 11:06:33 +00:00
Gloria Broadbent
2fde610837 Amending double space in the English installer
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-09 11:05:12 +00:00
Alan Davis
d9d09913d3 Merged 5.2.0 (5.2.0) to HEAD (5.2)
133327 amukha: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      133305 amukha: REPO-1658: ACE-5627: GPL components that were removed in 5.1 are still listed in "notice.txt" file
         - Removed the unused components.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-06 17:24:19 +00:00
Alan Davis
f24a151ad1 Merged 5.2.0 (5.2.0) to HEAD (5.2)
133050 amorarasu: REPO-1541: Revert changes done to web.xml in MNT-16334 due to Servlet 2.5 limitation - removed placeholders for AOSM.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-06 17:17:10 +00:00
Alan Davis
d8e17a3f28 Merged 5.2.0 (5.2.0) to HEAD (5.2)
132913 kroast: Merged DEV/5.2.N_SUPPORTTOOLS to 5.2.N (5.2.1)
      132731-132912 kroast: REPO-491 - Support Tools Productisation
         REPO-1560	Support tools part of the Administration Console code base
         REPO-1212	Merge in current Support Tools refactoring
      	REPO-519	   Improve CSS
      	REPO-1075	Support Tools JMX Screen should include button to download a JMX Dump
      	REPO-1076   Message should be added to the Active Sessions page about the limits of logging out a repo user
         Code cleanup
         Remove old _es translations (before full L10N pass)
         Removal of code duplications and includes
         More refactoring of pages, removal of duplicated code, removal of poor quality code and practices.
         Remove more l10n files that will be replaced.
         REPO-502    Localisation and language - pt1
         REPO-502    Localisation and language - pt2
         REPO-502    Localisation and language - pt3
         REPO-502    Localisation and language - pt4
         REPO-506    Unit and integration testing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133367 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-06 17:03:07 +00:00
Samuel Langlois
9454b44dfd ACE-5664 Unpack Manager in all installers, otherwise it is missing in Share
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-06 15:43:11 +00:00
Alex Mukha
3f95fd0011 REPO-1658: ACE-5627: GPL components that were removed in 5.1 are still listed in "notice.txt" file
- Removed the unused components.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-01 10:56:15 +00:00
Samuel Langlois
cccf521fb0 Merged 5.2.0 (5.2.0) to trunk (5.2) (RECORD ONLY) : 133283 / 133281 (to be merged later)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@133284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-29 16:55:50 +00:00
Samuel Langlois
3fe63186ac Merged 5.2.N_REBRANDING (5.2.N_REBRANDING) to 5.2.N (5.2.1)
133279: REPO-1458 Fix paths to alfresco-content-services-share-distribution


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@133281 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-29 16:05:48 +00:00
Alan Davis
235ce4c579 Merged 5.2.0 (5.2.0) to trunk (5.2) (RECORD ONLY) :
- 133265


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@133266 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-29 10:15:17 +00:00
Alan Davis
02ce653a27 Merged 5.2.N_REBRANDING (5.2.N_REBRANDING) to 5.2.N (5.2.1)
133263 adavis: REPO-1458 alfresco-content-services-share-distribution


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@133264 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-29 10:09:25 +00:00
Alan Davis
c92dee8188 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) : 128024,128037,128096,128219,128336,128366,128436,128572
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@133254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 21:07:56 +00:00
Alan Davis
9639d9ff70 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) : 133250-133252 (to be merged later)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@133253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 21:05:31 +00:00
Alan Davis
7601bf991a Merged 5.2.N_REBRANDING (5.2.N_REBRANDING) to 5.2.N (5.2.1)
133153 adavis: REPO-1458 Installer changes alfresco-one-ear-distribution


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@133252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:58:37 +00:00
Alan Davis
8c2c493bc6 Merged 5.2.N_REBRANDING (5.2.N_REBRANDING) to 5.2.N (5.2.1)
133143 adavis: REPO-1458 Found a couple of "Alfresco One" references in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@133251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:58:26 +00:00
Alan Davis
d37e1e6793 Merged 5.2.N_REBRANDING (5.2.N_REBRANDING) to 5.2.N (5.2.1)
133125 adavis: REPO-1458 build artifact names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@133250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:58:14 +00:00
Alan Davis
1d24e610a3 Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)
133214 adavis: REPO-1458 ALFRESCO TRIAL AGREEMENT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:22:36 +00:00
Alan Davis
af72fd3204 Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)
133187 adavis: REPO-1458 ECM message in installer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:22:27 +00:00
Alan Davis
8dfc4ef8d4 Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)
133186 adavis: REPO-1458 Splash screen for 2017


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:22:18 +00:00
Alan Davis
41e605e067 Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)
133183 adavis: REPO-1458 Splash screen for 2017


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:22:10 +00:00
Alan Davis
2d3e6b2bf8 Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)
133148 adavis: REPO-1458
      - Installer changes (from Andy H)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:21:58 +00:00
Alan Davis
20c29e88fd Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)
133144 adavis: REPO-1458
      - Installer changes (from Andy H)
      - Found a couple of "Alfresco One" references in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:21:49 +00:00
Alan Davis
6ef09b2f66 Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)
133144 adavis: REPO-1458
      - Installer changes (from Andy H)
      - Found a couple of "Alfresco One" references in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:21:49 +00:00
Alan Davis
54785de921 Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)
133123 adavis: REPO-1458 build artifact names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 20:16:59 +00:00
Ancuta Morarasu
7930008958 REPO-1541: Revert changes done to web.xml in MNT-16334 due to Servlet 2.5 limitation - removed placeholders for AOSM.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133050 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-23 14:28:20 +00:00
Ancuta Morarasu
c0166a1d7a REPO-1541: Revert changes done to web.xml in MNT-16334 due to Servlet 2.5 limitation - AOSM uses web fragments.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@133049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-23 14:24:35 +00:00