Commit Graph

313 Commits

Author SHA1 Message Date
Martin Muller
fb024fca86 MNT-15365 Added if nodeExists on executeActionImpl() + test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136842 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-05-22 13:55:08 +00:00
Martin Muller
54c72e1818 MNT-15365 Added if nodeExists on executeActionImpl() + test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-05-22 13:45:34 +00:00
Jan Vonka
d94bb9bd5b REPO-1986: Upload Failing due to Metadata Extraction Issue (MNT-17436) - trivial
- fix when debug logging (if rawValue is null - nothing to do)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-10 11:55:49 +00:00
Jan Vonka
483d79a548 REPO-1986: Upload Failing due to Metadata Extraction Issue (MNT-17436) - part 2
- part 2 - enable "addTags" to handle configurable list of separators (when using "enableStringTagging" option of "extract-metadata" action)
- initial default separators/delimiters => comma, semi-colon & vertical bar (pipe)
- also means we can re-enable & fix ContentMetadataExtractorTagMappingTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-09 16:04:00 +00:00
Jan Vonka
70108770f1 REPO-1986: Upload Failing due to Metadata Extraction Issue (MNT-17436) - part 1
- part 1 - ignore "addTags" failure & log warning instead (when using "enableStringTagging" option of "extract-metadata" action)
- note: add ContentMetadataExtractorTagMappingTest to the test suite (however, initially comment-out existing failing testTagMapping which has previously regressed)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-09 11:24:42 +00:00
Alan Davis
c03a2cc411 MNT-17017 Remove folder name from title when folders are unzipped from the Unzip to action
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-14 13:37:27 +00:00
Derek Hulley
3c8205b03f Fix code formatting for code in 'org.alfresco.repo.action' packages
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133311 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-01 14:31:04 +00:00
Jamal Kaabi-Mofrad
9faaad1d45 Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
133081 jkaabimofrad: APPSREPO-61: First cut of automatic time expiry enhancement to the quick-sharing functionality.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 16:53:39 +00:00
Ramona Neamtu
354f66df4c Reverse merged 5.2.N (5.2.1)
131742 rneamtu: SHA-1629 : Creating a link to file in a different location
            - Added support for multiple files in doclink.post webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-26 09:39:37 +00:00
Ramona Neamtu
2d7b780763 131742 rneamtu: SHA-1629 : Creating a link to file in a different location
- Added support for multiple files in doclink.post webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-25 14:39:25 +00:00
Derek Hulley
0065739435 Remove tabs found during investigation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-24 14:37:00 +00:00
Jan Vonka
cc97515300 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
Martin Muller
88818dca9a Fixed some javadoc errors. REPO-466
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-01 08:34:26 +00:00
Raluca Munteanu
b3dcbae981 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127307 cturlica: Merged 5.1.0 (5.1.0.6) to 5.1.N (5.1.2)
      127235 cturlica: MNT-16292: Unzipped files which have folders do not get the cm:titled aspect applied
         - updated ImporterActionExecuter to add titled aspect
         - added test case for change and refactored test class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-24 14:36:04 +00:00
Raluca Munteanu
6afb44e712 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
dc6b2852d0 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
8674e2bfc8 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
Andreea Dragoi
fc26cc8af1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124303 rneamtu: MNT-15881 : CLONE - Share rule constraints missing due to ActionExecuterAbstractBase's regression
      Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124129 rneamtu: Merged DEV to 5.0.N (5.0.4)
            124118 rneamtu: MNT-15802: Share rule constraints missing due to ActionExecuterAbstractBase's regression
               - Set parameter constraint name for localized parameters
               - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 15:18:46 +00:00
Alan Davis
c2e645b2ae Merged 5.1.N (5.1.1) to HEAD (5.1)
118306 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      118229 aleahu: MNT-14730 : Approve and Reject workflow not working in subfolders after the rule has been applied
         - Renamed the copied file when executing a simple workflow rule in order to avoid name conflicts by using copyAndRename instead of copy.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:29:42 +00:00
Alex Mukha
cdefbd2bf1 Merged 5.1.N (5.1.1) to HEAD (5.1)
116289 amukha: ACE-4513: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      116284 amukha: MNT-15091: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         116280 amukha: MNT-15090: Merged DEV to V4.2-BUG-FIX (4.2.6)
            115799: MNT-15075 : [Pentest 121015] ZIP extraction code execution
               Fix and test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-09 11:51:52 +00:00
Gethin James
410c24d2d1 Better Null handling, ACE-4246
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@112631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-22 15:29:30 +00:00
Gethin James
d6b3f5acd3 Removed the use of Locale.setDefault(locale) ACE-4246
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@112630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-22 15:29:28 +00:00
Gethin James
156937fe92 Merge Sabre4 to HEAD
110749: Additional Public apis. RA-553


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:05:22 +00:00
Tatyana Valkevych
5814865fc8 Merged 5.0.N (5.0.3) to HEAD (5.1)
110768: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110604: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         110200: Merged DEV to V4.1-BUG-FIX (4.1.11)
            109557: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
               - Caching mechanism for the actions' parameters labels has been implemented. Labels for action's parameters will be loaded into RAM for the configured set of locales for each parameter of each definition of the action. Affected tests have been changed.,
         110327: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
            - Changed locale setting to fix build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 13:11:16 +00:00
Tatyana Valkevych
7dd2291753 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
e6985eb2b1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
106092: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      106073: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         106001: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
            105937: Merged DEV to V4.1-BUG-FIX (4.1.11)
               104782: MNT-13819 : Alfresco throws "TooBusyException" when uploading several files for transformation
                  -close TikaPoweredContentTransformer writer if input stream fails
                  -TransfomerActionExecutor : do not used shared transformationOption member for multithred transformation requests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106099 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-13 07:07:47 +00:00
Alan Davis
681ff6b9c4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104506: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104357: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104292: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104235: MNT-13951 : Please use LinkedHashMap in EnumParameterConstraint.java to take control on selectone.ftl's dropdown list options order
               - Changed collection type from HashMap to LinkedHashMap.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:00:11 +00:00
Tatyana Valkevych
dee9fdcf00 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103947: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103926: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         103902: MNT-13205 - hide the cancel exception from the log, small refactoring of the exception logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-12 15:32:40 +00:00
Alan Davis
a4a7c5f8e7 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
f0546e3819 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94379: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94324: Merged DEV to V5.0.N (5.0.1)
         94107: MNT-13084: Invitation email to the site are not received
            - Support both Object[] and List<> subject params.
         94248: MNT-13084: Invitation email to the site are not received
            - Add support for String value in PARAM_SUBJECT_PARAMS
            - Add unit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95080 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:40:04 +00:00
Alan Davis
c9ca04c8dc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93668: ALF-21099 - MailActionExecutor.java doesn't support sending email by doing CC/BCC


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94991 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:31:16 +00:00
Alan Davis
4912765624 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93246: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93128: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93076: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            92995: Merged DEV to V4.1-BUG-FIX (4.1.10)
               92749 : MNT-12835 : bad management of SMTP 4XX errors leading to a "java.lang.OutOfMemoryError: Java heap space" error
                  - Do not provide MailException to logger.error to avoid MainExcepetion.printStackTrace of wrapped messages


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:14:16 +00:00
Alan Davis
0bc48ce882 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92323: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92224: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92166: MNT-12534: Javascript Mail action does not handle the subjectParams parameter
         Added a check for null parameters. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94868 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:47:27 +00:00
Alan Davis
34c8dba387 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92322: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92223: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92126: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.5)
            90326: MNT-12534: Javascript Mail action does not handle the subjectParams parameter
            Changed MailActionExecuter to use subject parameters as List.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:47:18 +00:00
Alan Davis
c10e66fae2 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90995: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90951: Merged DEV (4.2.2) to V4.2-BUG-FIX (4.2.5)
         64813: MNT-10944 : Rules doesnt work with multiple custom property
         Added code to property value comparator to support multi valued properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:10:16 +00:00
Alan Davis
09b085174e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
88173: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      88063: Merged DEV to V4.2-BUG-FIX (4.2.4)
         87653 : MNT-12464 : Duplicated email sent upon starting Pooled Review and Approve workflow
            - Added check for multiple identical emails to user
            - Added unit test
         87670 : MNT-12464 : Duplicated email sent upon starting Pooled Review and Approve workflow
            - Added check for multiple identical emails to user
         87758 : MNT-12464 : Duplicated email sent upon starting Pooled Review and Approve workflow
            - Changed test coverage
         87993 : MNT-12464 : Duplicated email sent upon starting Pooled Review and Approve workflow
            - Changed test coverage


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:59:33 +00:00
Mark Rogers
533f29e96b ACE-2173 : EOL RMI Services Attempt 2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-01 12:03:12 +00:00
Alan Davis
8ac2f6540e Reverse Merge HEAD (5.0/Cloud)
<< Appears to be cause of 7 failures in https://bamboo.alfresco.com/bamboo/browse/ALF-ENT-150 >>
   86040: ACE-2173 : EOL RMI Services


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86050 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 22:17:28 +00:00
Mark Rogers
bcdf0c5108 ACE-2173 : EOL RMI Services
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 16:29:07 +00:00
Pavel Yurke
290f3ec8a0 ACE-2564: Merged DEV to HEAD (5.0/Cloud)
85938: ACE-2564: Cloud - No task assignment email notification when a task is created by an External User
      - Run as primary tenant for user to retrieve fromActualUser email property. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 11:02:14 +00:00
Mark Rogers
2aef07876d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85071: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84416: This is the repo-tier part of MNT-12701. Adds a "take ownership" repository action.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85386 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:46:03 +00:00
Erik Winlof
f7c9eb6db8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78565: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77792: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         77393: Merged DEV to V4.2.3 (4.2.3)
            76812: MNT-11695 : Site cannot be deleted if copy/move outbound rule exists
            Fixed move action, implemented a JUnit test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:35:11 +00:00
Erik Winlof
e35970c3f1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78500: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76815: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         76612: Merged DEV to V4.2.3 (4.2.3)
            73832: MNT-11695 : Site cannot be deleted if copy/move outbound rule exists
            Added a test to simulate the issue.
            73871: MNT-11695 : Site cannot be deleted if copy/move outbound rule exists
            Added a check for the destination not to be in a pending delete list for copy action executer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:20:30 +00:00
Erik Winlof
e94f8f8351 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:13:50 +00:00
Mark Rogers
025ea2b305 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77083: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72905: Adding a comment on future direction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 14:42:11 +00:00
Mark Rogers
af44652c45 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76560: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      75816: Merged DEV V4.2-BUG-FIX to V4.2-BUG-FIX (4.2.3)
         75777: MNT-11598: Escaped Freemarker query templates don't work with org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinition
           - Workaround with unescaping Free Marker template has been applied and tested with the newly implemented test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:28:42 +00:00
Will Abson
88f2d1dc6f 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
0b5a6de25c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73354: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73241: MNT-11079: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67748: MNT-11079: "Start Workflow" email notification is not sent out if the recipient's User Name contians "@"
            - During defining mail recipients first check email field and only then check if the username is the valid email address. Fix formatting and cleanup for other MailActionExecuterTest tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:59:25 +00:00
Will Abson
7f6997d65b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73350: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73193: Merged DEV to V4.2-BUG-FIX (4.2.3)
        73075: MNT-8886 Users with disabled accounts receive email notification from workflow 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74768 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:58:55 +00:00
Will Abson
b6d669e9c4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73072: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      72995: MNT-11488: Merged DEV to V4.2-BUG-FIX (4.2.3)
         71868: MNT-11488: Duplicate notification when notification rule set for multiple users
            - Fix MailActionExecuter to send bulk message to all recipients only one time if template was not defined for rule. Add unit test for case.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:55:04 +00:00