Commit Graph

2607 Commits

Author SHA1 Message Date
Steven Glover
d3938f94f3 Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:33:09 +00:00
Jan Vonka
1b3745109c REPO-1144: LockService - add isLocked & isLockedAndReadOnly common helper methods to public API
- remove duplicated code from various locations to use the new methods
- add sanity checks to Lock*Test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:20:52 +00:00
Alexandru Epure
983ab23eb2 Merged 5.2.N (5.2.1) to HEAD (5.2)
128388 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128377 cpopa: MNT-16208 : infinite HTTP loop on /wcservice when using alfrescoNtlm with sso.enabled=false
         -Replaced "webscripts.authenticator.webclient" with "webscripts.authenticator.remoteuser" so to prevent attempts to redirect to the same url, thus eliminating infinite loops. 
         -RemoteUserAuthenticatorFactory seems to work just fine. Also since the Explorer is EOLed it doesn't make anymore to use the WebClientAuthenticatorFactory. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:55:59 +00:00
Alexandru Epure
bbf4d627c6 Merged 5.2.N (5.2.1) to HEAD (5.2)
128238 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128224 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         128205 amukha: MNT-16334: AOSM is not working on any web server except Tomcat
            - Added placeholders for AOSM configuration for building full ear file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129281 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:52:34 +00:00
Alan Davis
a09dd07bde Change version to 5.2.0-CLOUD44-SNAPSHOT
- pom.xml files changed
   - version.properties is already 5.2.0 so does not need to change until the first HF.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.0-CLOUD44/root@128855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-21 09:16:45 +00:00
Alan Davis
32dee258ba Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128377 cpopa: MNT-16208 : infinite HTTP loop on /wcservice when using alfrescoNtlm with sso.enabled=false
      -Replaced "webscripts.authenticator.webclient" with "webscripts.authenticator.remoteuser" so to prevent attempts to redirect to the same url, thus eliminating infinite loops. 
      -RemoteUserAuthenticatorFactory seems to work just fine. Also since the Explorer is EOLed it doesn't make anymore to use the WebClientAuthenticatorFactory. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128388 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-28 06:49:51 +00:00
Constantin Popa
55dcb42998 MNT-16208 : infinite HTTP loop on /wcservice when using alfrescoNtlm with sso.enabled=false
-Replaced "webscripts.authenticator.webclient" with "webscripts.authenticator.remoteuser" so to prevent attempts to redirect to the same url, thus eliminating infinite loops. 
   -RemoteUserAuthenticatorFactory seems to work just fine. Also since the Explorer is EOLed it doesn't make anymore to use the WebClientAuthenticatorFactory. 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@128377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-27 13:35:30 +00:00
Alan Davis
91108d683d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128224 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      128205 amukha: MNT-16334: AOSM is not working on any web server except Tomcat
         - Added placeholders for AOSM configuration for building full ear file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-22 09:30:06 +00:00
Alan Davis
6d007c61d3 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
128205 amukha: MNT-16334: AOSM is not working on any web server except Tomcat
      - Added placeholders for AOSM configuration for building full ear file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@128224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-21 11:08:14 +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
Jean-Pierre Huynh
3c81cdfd0c 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
Ancuta Morarasu
d7f6480a4b Merged HEAD (5.2) to 5.2.N (5.2.1)
126634 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125740 jvonka: Merged API-STRIKES-BACK (5.2.0) to FILE-FOLDER-API (5.2.0)
         125736: ALF-21420: cors-filter - bump version (from 1.9.3 to 2.5)
         - ACE-4055


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:41:21 +00:00
Ancuta Morarasu
387291cf76 Merged HEAD (5.2) to 5.2.N (5.2.1)
126573 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124623 jkaabimofrad: SFS-405, RA-778: Added tests and as the result did some minor modifications. Also, removed the ability to set or remove a client via JMX (Read only).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:11:01 +00:00
Ancuta Morarasu
543ec21b5f Merged HEAD (5.2) to 5.2.N (5.2.1)
126475 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122422 gjames: RA-810: Adding api-explorer to the maven devenv.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:36:49 +00:00
Ancuta Morarasu
856e945c9b Merged HEAD (5.2) to 5.2.N (5.2.1)
126436 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121917 jkaabimofrad: RA-778: Added support for QuickShare service to email users notifying them that a content has been shared with them.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:19:27 +00:00
Ancuta Morarasu
e182ae19a5 Merged HEAD (5.2) to 5.2.N (5.2.1)
126409 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121471 jvonka: FileFolder API - add utf8Encoding=UTF-8 for tomcat7-maven-plugin when running repo
      - as per installer & old dev env (=> tomcat7 server.xml
      - this fixes "relativePath" for uri encoding of params (for utf-8 encoded characters in folder/file name)
      RA-755


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:10:40 +00:00
Jamal Kaabi-Mofrad
268417aba2 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125740 jvonka: Merged API-STRIKES-BACK (5.2.0) to FILE-FOLDER-API (5.2.0)
      125736: ALF-21420: cors-filter - bump version (from 1.9.3 to 2.5)
      - ACE-4055


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 12:10:44 +00:00
Jamal Kaabi-Mofrad
e4fd297c55 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124623 jkaabimofrad: SFS-405, RA-778: Added tests and as the result did some minor modifications. Also, removed the ability to set or remove a client via JMX (Read only).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:35:15 +00:00
Jamal Kaabi-Mofrad
f1f4f6ce15 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122422 gjames: RA-810: Adding api-explorer to the maven devenv.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:07:53 +00:00
Jamal Kaabi-Mofrad
8276954fbc Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
121917 jkaabimofrad: RA-778: Added support for QuickShare service to email users notifying them that a content has been shared with them.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126436 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:54:46 +00:00
Jamal Kaabi-Mofrad
a702e4e08b Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
121471 jvonka: FileFolder API - add utf8Encoding=UTF-8 for tomcat7-maven-plugin when running repo
   - as per installer & old dev env (=> tomcat7 server.xml
   - this fixes "relativePath" for uri encoding of params (for utf-8 encoded characters in folder/file name)
   RA-755


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:48:46 +00:00
Raluca Munteanu
b5327e29a1 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/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
dead3c3825 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/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Raluca Munteanu
d6f9f50c39 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/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Raluca Munteanu
16834edbd2 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/BRANCHES/DEV/5.1.N/root@125606 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:55:49 +00:00
Raluca Munteanu
73ffa91a49 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/BRANCHES/DEV/5.1.N/root@125605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:30:21 +00:00
Raluca Munteanu
1ce8e6fa1d 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/BRANCHES/DEV/5.1.N/root@125603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:21:07 +00:00
Samuel Langlois
e678020e7d 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/PATCHES/5.1.1/root@125515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 17:31:22 +00:00
Samuel Langlois
f7e766c149 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/PATCHES/5.1.1/root@125484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 14:11:11 +00:00
Alan Davis
58c88047da Incremented version to 5.2.1 and schema to 10050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:08:35 +00:00
Alan Davis
12b18b9c44 Incremented version to 5.1.2 and schema to 9050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:02:36 +00:00
Alan Davis
f4afde854e Merged 5.1.N (5.1.1) to HEAD (5.1)
119524 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      119405 rneamtu: Merged NESS/5.0.N-2015-11-13/ (5.0.3) to 5.0.N (5.0.4)
         119403: MNT-15072 : Solr is unable to find parents from models which have duplicate namespaces
            - Validate models to have different namespaces
            - Added test for case
   123599 correction to above merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:26:00 +00:00
Alan Davis
061d4856fd Merged 5.1.N (5.1.1) to HEAD (5.1)
114992 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      114940 cturlica: Merged DEV to 5.0.N (5.0.3)
         114938 cturlica: MNT-14367: Unable to connect to CMIS 1.0 and CMIS 1.1 API URL in 5.0.1 only with Kerberos SSO enabled
            - added default fallback for new CMIS URLs and the possibility to disable this fallback if needed (new properties)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:26:29 +00:00
Alan Davis
bf867bbc76 Merged 5.1.N (5.1.1) to HEAD (5.1)
113585 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113499 rmunteanu: Merged DEV to 5.0.N (5.0.3)
         113455: MNT-14718: Problem with Passthru, NTLM, SSO and Mobile
            - Added basic SSO fallback to passthru subsystem


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:25:55 +00:00
Alan Davis
805e8caa63 Increment version to 5.2-SNAPSHOT
- changed versions of AUTH,JLAN,CORE,SURF_WS
   - merged in fixes around multiple SURF/SURF_WS versions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 07:16:14 +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
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
Alan Davis
3f01226087 ACE-4613: Merged 5.1.N (5.1.1) to HEAD (5.1)
118172 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      118083 rneamtu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         117710 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            117626 rneamtu: Merged NESS/4.1.N-2015-11-13 (4.1.11) to V4.1-BUG-FIX (4.1.11)
               117543: MNT-15230 : Update Copyright year to 2016
                  - Updated year; renamed splash_2016.png
         117912 rneamtu: MNT-15230 : Update Copyright year to 2016
            - Modified extra properties files for V4.2.N


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120304 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-17 10:44:50 +00:00
Ramona Neamtu
654bb696ca Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
118083 rneamtu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      117710 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         117626 rneamtu: Merged NESS/4.1.N-2015-11-13 (4.1.11) to V4.1-BUG-FIX (4.1.11)
            117543: MNT-15230 : Update Copyright year to 2016
               - Updated year; renamed splash_2016.png
      117912 rneamtu: MNT-15230 : Update Copyright year to 2016
         - Modified extra properties files for V4.2.N


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-20 10:18:44 +00:00
Raluca Munteanu
001f7b96e9 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114940 cturlica: Merged DEV to 5.0.N (5.0.3)
      114938 cturlica: MNT-14367: Unable to connect to CMIS 1.0 and CMIS 1.1 API URL in 5.0.1 only with Kerberos SSO enabled
         - added default fallback for new CMIS URLs and the possibility to disable this fallback if needed (new properties)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114992 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-23 07:49:04 +00:00
Tatyana Valkevych
95e30d685a Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113499 rmunteanu: Merged DEV to 5.0.N (5.0.3)
      113455: MNT-14718: Problem with Passthru, NTLM, SSO and Mobile
         - Added basic SSO fallback to passthru subsystem


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113585 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-02 11:05:40 +00:00
Samuel Langlois
faf0a3ee60 Create branch 5.1.N from HEAD r111853 identified as 5.1.1-SNAPSHOT
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@111862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-10 13:30:19 +00:00
Joel Bernstein
8a930d5fa6 ACE-777: Comment out the cert-contains parameter in the web.xml files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-02 15:08:40 +00:00
Stefan Kopf
45458b3539 ALF-21405 - AOS should be an optional removable module:
Refactoring project structure

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 13:30:39 +00:00
Gavin Cornwell
f2fe0ce6ab RA-452: Fix spacing irregularities on platform landing page
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 16:39:54 +00:00
Kevin Roast
f5aa32d6f9 Merged BRANCHES/DEV/ADMIN51 to HEAD (5.1)
108655: Fixes for Unlock action to handle cancel checkout case
   108608: Unlock action
   108588: Admin Console actions; Delete Node, Delete Property, Take Ownership, Revert Permissions.
   108583: Branch for admin console changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-04 10:28:34 +00:00
Samuel Langlois
7a6ab4e5f1 ACE-777 Stop providing non-SSL versions of alfresco war and solr4 war files: it is now useless
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-27 14:26:26 +00:00
Joel Bernstein
0442279083 ACE-777: Make cert-contains check the fully subject DN
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-24 17:46:32 +00:00