Commit Graph

2031 Commits

Author SHA1 Message Date
Alan Davis
6f411d0d27 Merged 5.2.N (5.2.1) to HEAD (5.2)
130406 jvonka: REPO-1062 / MNT-16176: allow existing users to use SSO external auth via Sharewhen repo is read-only
   - re-implement the fix (note: we do not allow auto-creation of missing users)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:03:27 +00:00
Alan Davis
c12bf069fa Merged 5.2.N (5.2.1) to HEAD (5.2)
129764 jvonka: 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/HEAD/root@130225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 14:42:34 +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
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
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
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
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
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
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
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
Joel Bernstein
ad8e4d0eaa ACE-777: integrate the X509 Auth Servlet Filter into solr4 and web-client projects.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-21 15:07:27 +00:00
Samuel Langlois
92e919c9ba Merged AIR-SPRINT1 (5.1.0) to HEAD (5.1/Cloud)
107702: Only show the share link if "share-services" is installed RA-398


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-21 10:47:10 +00:00
Tatyana Valkevych
b15a2e772b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Alan Davis
7a5a9562b7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104579: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      102989: RA-203: Move FormUIGetRestApiIT.java out of alfresco-platform


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:23:00 +00:00
Alan Davis
243fee317e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104577: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      102942: RA-202: Break dependency to spring-surf in alfresco-platform


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:21:59 +00:00
Tatyana Valkevych
3216523536 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101159: DOCS-1067 Fixing generation of Javadoc with JDK8


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 15:38:38 +00:00
Alan Davis
36680a6542 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
37501be12a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99117: ACE-3703 - Refactor Repository Admin Console framework to allow the basic framework to work in Community version
    - Improved Community system summary screen with basic JVM and Repository info
    - Added Processor (cpus) count to System Summary screen for Enterprise/Community
    - Added system version label to /alfresco index page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99183 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-10 22:37:51 +00:00
Alan Davis
68ac3bcdf9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99067: ACE-3703 - Refactor Repository Admin Console framework to allow the basic framework to work in Community version
    - Added Community Admin Console link to index page
    - Basic system summary screen impl


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-09 21:21:18 +00:00
Alan Davis
f5b1ec7735 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98427: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98385: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98335: MNT-13467: Merged CLOUD39 (Cloud 39.3) to 5.0.1 (5.0.1)
            98254: MNT-13466: 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98534 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:43:45 +00:00
Tatyana Valkevych
d7c4ac87da Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98198: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98160: Merged DEV to 5.0.N (5.0.2)
         98042: MNT-13442: Accessing nodes via ticket URL yields "Error during download content servlet processing: null"
            - added null check for normal resource bundle


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-02 12:08:44 +00:00
Alan Davis
12d42a1fd0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93267: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93242: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93175: MNT-12484: Merged DEV to V4.2-BUG-FIX (4.2.5)
            89773: MNT-12484: VTI server fails to authenticate behind an AJP proxy if HTTP authentication headers are sent in addition to the REMOTE_USER CGI variable
               - For VTI give precedence to external authentication with remote user over HTTP Basic


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:20:43 +00:00
Alan Davis
ce4d6c872a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92637: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92609: MNT-13050: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92590: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            << Also included some extra changes for 5.0.N >>
            92585: Merged V4.1-BUG-FIX (4.1.10) to V4.2.4 (4.2.4)
               92550: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  92444 : MNT-12987 : Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
                  92458 : MNT-12987 : Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
                     - Renamed splash_2015.png
         92606: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            92605: MNT-13042: CLONE - Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
            - A few more files for 4.2.4
         - A few more files for 5.0.N


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:55:26 +00:00
Alan Davis
e9d98d5802 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92620: ACE-3703 - Refactor Repository Admin Console framework to allow the basic framework to work in Community version
     - Framework base moved to web-client project.
     - Refactored Enterprise admin console to base from the web-client one.
     - Empty Community admin console start page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:53:46 +00:00
Alan Davis
f32360afb1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90921: MNT-12765 - No endpoints can be configured in Share that use external-auth and a different URL - as they will be redirected down the URL for 'alfresco' endpoint.
   Merged PROPERTY_GROUP_PROTOTYPING (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      90742: Refactoring of SSO paths
       - Added Session User authentication support to RemoteUserAuthenticatorFactory - so can use cookie based auth for example with Public API route.
       - Tidy up of common duplicated code constants e.g. _alfAuthTicket
       - Added Global Authentication Filter around the /api/* endpoint to allow SSO active over Public API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:07:31 +00:00
Alan Davis
04eb119eff Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90919: MNT-12764 - The X-Alfresco-Remote-User (SsoUserHeader) SSO code path executes x2 requests and is stateful when it does not need to be
   Merged PROPERTY_GROUP_PROTOTYPING (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      90559: Refactoring of SSO paths
       - Web-client mappings for new authenticator


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:07:05 +00:00
Alan Davis
a4cc7dac9c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
87703: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      86519: Merged DEV to V4.2-BUG-FIX (4.2.4).
         86173: MNT-12417: Send mail action in Alfresco Explorer is using neither the default from adress nor the currently logged in user's adress


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:47:33 +00:00
Alan Davis
ed947e5a98 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
86193: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      86111: Merged DEV to V4.2-BUG-FIX (4.2.4)
         86029 : MNT-12463 : logout button is displayed in Share (and in Explorer) when 'external' authentication is used/context.externalAuthentication not taken into account
            - Logout button is will be displayed if logged not a guest and not used 'external' authentication.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:43:05 +00:00
Alan Davis
0e6c3f18ac Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85757: MNT-12461 : Enable and fix FormUIGetRestApiIT following merged of MNT-11660 from V4.2-BUG-FIX - update web-scripts-application-context-webframework-test.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94517 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:34:07 +00:00
Alan Davis
de2a66166c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85753: MNT-12461 : Enable and fix FormUIGetRestApiIT following merged of MNT-11660 from V4.2-BUG-FIX
    Tune the pom.xml and updated test-config-custom-forms.xml .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:33:58 +00:00
Alan Davis
381840c2bd Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85731: MNT-12461: Bring back the changes of MNT-11660
      - moved the new test from web-framework-commons to web-client, where it belongs (w-f-c shouldn't depend on remote-api)
      - renamed the test FormUIGetRestApiIT because it is an integration test, not a unit test
      - disabled the execution of this test. Needs more work to sort it out - probably missing dependencies
      85650: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         << Breaks the build >>
         85615: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            <<Reverting the reverse - unit test was fixed>>
            80815: Fix Build (pt2) Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
               80357: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
                  79075: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
                     78918: Merged DEV to V4.2.3 (4.2.3)
                        78889: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                           Was added new unit test.
                  79079: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
                     78994: Merged DEV to PATCHES/V4.2.3 
                      78981 : MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                         Updated some code for unit test.
                  79081: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
                     79043: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                        Added webframeworkcommons classpath for unit test in build.xml .
                  79138: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Rename config file for test and update unit test source.
                  79140: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Deleted old config file for test.
                  79283: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Added info messages to unit test
                  80123: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Added info messages and log to unit test. 
                  80207: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Updated the freemarker template for test webscript
                  80261: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Updated unit test. 
                  80302: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Updated unit test. 
         


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:33:48 +00:00
Jared Ottley
e04fa83ce0 [ACE-3372] CORS enable Alfresco One
-Add maven artifact dependencies for CORS Filter libraries to web-client projects pom.xml
-Add filter and filter mapping declarations to web-client projects web.xml
--These declarations are commented out by default.
--When uncommented the Share web client's domain must be added to the list of allowed origins because the share proxy service can call resources filtered by the mappings
--The default mappings that will be filtered when uncommented are /api/*, /service/*, /s/*, and /cmisbrowser/*



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-31 04:18:50 +00:00
Pavel Yurke
6bf78f48b0 Merged DEV to HEAD (5.0.0)
87647: ACE-3047 : Bulk Import Tool: Status page is not refreshed automatically during import process
      - Ensure that bulk import started before redirecting client to the status page.
   87648: ACE-3048 : Bulk Import Tool: IE: Script error on Bulk Filesystem In-place Import Tool page - 'YUI' is undefined
      - Missing javascript resource.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-10 14:11:33 +00:00
Matt Ward
9ae80fccf1 ACE-2826: NullPointerException during to startup Alfresco OOB installation.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85919 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 14:31:47 +00:00
Kevin Roast
80b278aef7 ACE-2931 - Alfresco community /alfresco shows message about invalid license.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-26 15:19:10 +00:00
Mark Rogers
5402e83baa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85070: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84413: ACE-2330 - AOS: Replace html dialog shown in FileOpen and SaveAs dialog windows


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:45:33 +00:00
Mark Rogers
bc0ae2ac24 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84946: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83645: ACE-2668


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:22:48 +00:00
Mark Rogers
7aaa372ed0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84896: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83386: ACE-2668


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:59:11 +00:00
Alan Davis
de70eaf6cb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84671: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84518: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         84351: Merged DEV to V4.1-BUG-FIX (4.1.10)
            79271 : MNT-11522 : Document modified date is being updated by Workflow
               - Fix bug. Change create a workflow package for the attached items and add them. Add Behavior Filter.
            81662 : MNT-11522 : Document modified date is being updated by Workflow
               - Create Unit test. 
            83496 : MNT-11522 : Document modified date is being updated by Workflow
               - Change unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 08:34:12 +00:00
Alan Davis
a60436cc48 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83339: Merged KEVINR1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82499: ACE-2091 - EOL Explorer
         Index page - CMIS labels and corrected API URLs (from Greg)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 16:52:11 +00:00
Alan Davis
50c010f67e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83337: Merged KEVINR1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82359: ACE-2091 - EOL Explorer
         For Community version, a link to Jira and to the forums
         For Enterprise version, a link to support.alfresco.com


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 16:51:56 +00:00
Erik Winlof
3f7f571de6 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80950: Change new /alfresco index page to display warning on failed license deploy (missing License error)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 05:57:38 +00:00
Erik Winlof
f1e6acaa67 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80927: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80892: ACE-2091 EOL Explorer.
       - Website link on index page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 05:55:44 +00:00
Erik Winlof
53e3bbdce1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80926: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80888: ACE-2091 EOL Explorer.
       - Basic /alfresco index page added with links to documentation, Share, Admin Console, WebScripts, CMIS etc.
       - Rearranged some core CSS files from Admin Console so they are reusable in standard webapp


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 05:55:27 +00:00
Erik Winlof
6722639949 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80925: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80870: ACE-2091 EOL Explorer.
       - Move of WebClient configuration, message bundles and extension points to Thor private module
       - Added handling to SSO endpoints to handle optional WebClient config service
       - Tested: Enterprise build, Cloud build, build unit tests, NTLM SSO/Cookie SSO path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 05:54:57 +00:00
Erik Winlof
90c223c2c3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80924: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80469: ACE-2091 EOL Explorer.
      ACE-2014 EOL URL Addressibility API
       - 90% of the Explorer Client config, pages and assets moved to privatemodules/thor
       - Explorer client available via mvn -Pcloud build only
       - Alfresco minimal index page added
       - Deprecated and disabled: Servlets related to Explorer e.g. ExternalAccessServlet, CommandServlet - will be removed fully in 5.1
       - Removed: Explorer liferay portlet context, jboss portlet context, collaboration WebScript remoteapi (Explorer), old web assets no longer used
       - Tested: Enterprise build, Cloud build, build unit tests, NTLM SSO/Cookie SSO path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 05:52:30 +00:00