Commit Graph

1561 Commits

Author SHA1 Message Date
Andrei Rebegea
ad1f01c12f Merged 5.2.N (5.2.2) to HEAD (5.2)
136782 amukha: MNT-17850 Stop auto refresh of login link page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:08:14 +00:00
Alan Davis
b4ed1d1fce Merged 5.2.N (5.2.1) to HEAD (5.2)
131286 amukha: Merged DEV to 5.2.N (5.2.1)
      131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
      131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - added patch to remove JBPM database tables
      131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - replaced generic DB script with database specific scripts
      131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - Fix DB2 patch
      131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - Fix JBPM table removal patch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:46:48 +00:00
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
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
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
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
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
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
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
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
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
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
Erik Winlof
124f05593e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:18:05 +00:00
Erik Winlof
1ea3931e33 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78425: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75800: ACE-2149: EOL AVM / WCM


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:12:32 +00:00
Erik Winlof
34d911b025 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78414: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75784: ACE-2149: EOL AVM / WCM
       - Get 'web-client' project to compile
       - For further work, all bits that required commenting or changing were tagged with '// WCM'
         i.e. a search for 'WCM' will highlight all the code changes made
       - TODO: Visit jsp files and other config to do a proper job


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:08:20 +00:00
Erik Winlof
93b80fd294 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:01:49 +00:00
Erik Winlof
f8b88e624f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78392: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75693: ACE-2149 Remove AVM/WCM - first round, based on the following Sparta commits
         08f1ff556cf3e8eb370e433b69b634026c848af1: SlimRepo: comment-out AVM schema bootstrap and wcm-services-context
            - plus associated bootstrap/startup fallout
            - note: disabling/removing WCM/AVM will be a work-in-progress due to tight code coupling :-(
         cdb78eeae53522cc2d78feb94be49d11648fa582; SlimRepo: comment-out AVM schema bootstrap and wcm-services-context
             - follow-on to fix "regenerate_renditions" fallout error (in Alfresco Explorer web client)
         33337ad4239df91b9a8dc7a00be43e55ffef5bef: SlimRepo: remove WCM/AVM - round 1 (wip)
            - removal of some of the AVM code and tests (including core impl such as AVMServiceImpl, AVMRepository, AVMSyncServiceImpl, underlying DAOs etc)
            - fix Spring config (major impact) and any obvious compile-time fallout
            - ensured repo starts and ran (some of the) repo unit tests
            - also check basic Explorer access
         47e50847bbbbdda5fd64a27c212dfbdd625cbfdb: Jenkins build/test repo - minor: disable/remove repo tests
            - disabled unused tests, removed remaining AVM* tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 11:57:51 +00:00
Mark Rogers
52b661d392 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75673: Merged EOL into HEAD-BUG-FIX (5.0): ACE-2149: removal of AVM/WCM
      75611: Remove catalina-virtual project, and all mentions of the virtual tomcat
      75619: Remove jndi-client projects and ServletContextFormDataFunctionsAdapter, which references it
      75626: Remove wdr-deployment project
      75637: Remove CompanyFooterBean and PressReleaseBean classes, packaged as resources in web-client and specially compiled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77522 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:32:37 +00:00
Mark Rogers
d619e3cf22 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75488: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74477: Merged DEV to V4.2-BUG-FIX (4.2.3).
         73923: MNT-11654: Manage System Users: Email domain, which contains underscore, is not valid.
         73998: MNT-11654: Manage System Users: Email domain, which contains underscore, is not valid.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:25:22 +00:00
Will Abson
388632a561 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73996: ACE-2028 Change invisible images to match 5.0 version


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:19:00 +00:00
Will Abson
430ad17e85 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73690: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73594: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73593: Merged V3.4-BUG-FIX (3.4.15) to V4.1-BUG-FIX (4.1.10)
            73526: MNT-11319: Merged DEV to V3.4-BUG-FIX (3.4.15).
               73508: MNT-11319 Accented Characters wrongly unzipped
                      - In Import dialog was added drop down list of encoding options. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:07:37 +00:00
Will Abson
0206ff2d7f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
72743: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      72388: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         72287: Merged V3.4-BUG-FIX (3.4.15) to V4.1-BUG-FIX (4.1.10)
            72240: MNT-11319: Merged DEV to V3.4-BUG-FIX (3.4.15).
               71633: MNT-11319 Accented Characters wrongly unzipped
                         In Import dialog was added ZIP file contains high-byte filename characters such as Japanese, Chinese or Korean check box. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:38:54 +00:00
Will Abson
f4deaea7ad Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71772: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71677: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         71430: Merged DEV to V4.1-BUG-FIX (4.1.9)
            70396: MNT-11360: XSS: vulnerabilities found in Alfresco Explorer 
               - Additional encoding was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:34:39 +00:00
Will Abson
e895e57280 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71601: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70356: MNT-11233: DEV to V4.2-BUG-FIX (4.2.3)
         67973: MNT-11233: Alfresco CMIS API /alfresco/api/-default-/cmis/versions/1.1/atom cannot be used with external authentication
            - Move RemoteUserMapper from Web-Client to Repository project. Use RemoteUserMapper in PublicApiAuthenticator to retrieve remote user from request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:31:06 +00:00
Pavel Yurke
f1fbba755b ACE-1787: Reverse Merged - Wrong commit was made
71809: ACE-1787 Drop-down menu icon is not displayed for many cases
             Added a constant arrow symbol ("&#9662") to be used in the drop down menus.
   71928: ACE-1787 Drop-down menu icon is not displayed for many cases
             Added a constant arrow symbol ("&#9662") to be used in the drop down menus. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-30 11:02:18 +00:00
Pavel Yurke
53bfef6c1e ACE-1787: Merged DEV to HEAD (4.3/Cloud).
71809: ACE-1787 Drop-down menu icon is not displayed for many cases
             Added a constant arrow symbol ("&#9662") to be used in the drop down menus.
   71928: ACE-1787 Drop-down menu icon is not displayed for many cases
             Added a constant arrow symbol ("&#9662") to be used in the drop down menus.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-28 10:53:15 +00:00
Mark Rogers
ecadace15f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68161: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67875: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         67795: Merged DEV to V4.1-BUG-FIX (4.1.9)
             67728: MNT-11251: Impossible to upload/create content when lifecycle workflow is deployed
                 'org.alfresco.web.bean.content.BaseContentWizard.getObjectTypes()' has been wrapped with retrying transaction to avoid not transactional invocations of dictionary methods which access the repository


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68443 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:21:29 +00:00
Mark Rogers
40d423fb04 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67755: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      66972: Merged V4.2.2 (4.2.2) to V4.2-BUG-FIX (4.2.3)
         66591: Merged DEV to 4.2.2
            66584: MNT-8444: The Email field was not checked for rightness 
               A validator for email field is added now.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68390 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:04:08 +00:00
Andrey Che
b76163af97 Merged DEV to HEAD (4.3/Cloud)
66480: ACE-1154: Outcome of the Review and Approve task is not displayed in the "My Completed Task" component.
      Oracle specific issue: Set default value for outcome label.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-03 06:14:54 +00:00
Alan Davis
6c50dfa622 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
66052: ACE-1154: Outcome of the Review and Approve task is not displayed in the "My Completed Task" component.
   Reverse Merge: unapproved solution was committed to the head branch but should to dev firstly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:38:24 +00:00
Alan Davis
330a5c3465 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
66051: ACE-1154: Outcome of the Review and Approve task is not displayed in the "My Completed Task" component.
   Oracle specific issue: Set default value for outcome label.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66290 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:37:20 +00:00
Pavel Yurke
7d3ca3cb8d ACE-1153: Alfresco Explorer: It is impossible to change start location for the users.
- Remove read-only transactions from UserPreferencesBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 09:01:36 +00:00
Alan Davis
91acc8e050 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:59:18 +00:00
Alan Davis
ec0ae9541c Merged HEAD-BUG-FIX (Cloud/4.3) to HEAD (Cloud/4.3)
62517: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62259: Merged DEV to V4.2-BUG-FIX
      61593 : MNT-10642 : Alfresco Explorer has javascript vulnerability opening HTML files
       Before opening HTML files via Alfresco Explorer remove javascript using StringUtils 
      62178 : MNT-10642 : Alfresco Explorer has javascript vulnerability opening HTML files
       Was corrected code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-19 12:01:07 +00:00
Alan Davis
13db776f4e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60831: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60750:  Merged DEV to V4.2-BUG-FIX (4.2.1)
         60659: MNT-10145: JSF: Inconsistent browser behaviour when setting <language-select> to false
        - Some jsp pages were updated to set locale for the current user context. Also, getLanguage() methods were modified to take into account useInterfaceLanguage flag.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62367 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:40:02 +00:00
Alan Davis
e45c170f22 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59743: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59519: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59442: Merged DEV to V4.1-BUG-FIX (4.1.8)
            59317: MNT-9900 : Alfresco Explorer is using URL Encoding when downloading a file
            Removed additional encoding of file name for IE browser.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 07:57:55 +00:00
Alan Davis
63f8379212 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59734: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59507: Reverse Merged - Wrong commit was made
         59504 : MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
            59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
               - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation). 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62177 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:15:46 +00:00
Alan Davis
1ac86d0d45 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59732: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59504: MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
          59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
                 - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:13:58 +00:00
Alan Davis
538e468caf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59726: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59493: MNT-10171: Merged DEV to V4.2-BUG-FIX 
       59289 : MNT-10171 : Exception thrown if Share metadata is longer than 1024 characters
        Set 'maxlength' attribute to 1024 (characters) for 'description' property in share and jsf client. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:08:53 +00:00