inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,819 Commits 325 Branches 2,188 Tags
f3cb1c224dbd1efb7be462ae61df38a7906e7718
Commit Graph

51 Commits

Author SHA1 Message Date
Gethin James
f3cb1c224d Merged searchapi (5.2.1) to 5.2.N (5.2.1) 
129808 gjames: SEARCH-112: Adding SearchContext to the response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:18:46 +00:00
Gethin James
c12508fb75 Merged searchapi (5.2.1) to 5.2.N (5.2.1) 
129775 gjames: Updated the auto-generated headers using mvn license:update-file-header


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:14:38 +00:00
Gethin James
bfd32ef859 Merged searchapi (5.2.1) to 5.2.N (5.2.1) 
129774 gjames: SEARCH-113: Moving more api logic to helper classes, using a "trait" style


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:14:29 +00:00
Alan Davis
10aebdcf28 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127592 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127226 gjames: RA-1064: Added a WebScriptExceptionResolver


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:18:42 +00:00
Alan Davis
b2fe847b6c Merged HEAD (5.2) to 5.2.N (5.2.1) 
127571 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126242 gjames: RA-878:All api errors should return the standard error object


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:14:04 +00:00
Alan Davis
b111c81f6a Merged HEAD (5.2) to 5.2.N (5.2.1) 
127564 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125761 gjames: RA-652: new stack trace message and logId property


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:09:10 +00:00
Alan Davis
4f5b776112 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127536 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125552 gjames: RA-652: Stack traces not returned, but in the log, only for 500 or debugging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:03:10 +00:00
Alan Davis
14ad5c3635 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127535 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125551 gjames: RA-652: Stack traces not returned, but in the log.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:03:04 +00:00
Ancuta Morarasu
bb0598991a Update source headers - add new Copyrights for new Java files synced from Head (part 3). 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 14:24:54 +00:00
Ancuta Morarasu
31766e2d9e Merged HEAD (5.2) to 5.2.N (5.2.1) 
126609 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125121 gjames: RA-675: Fixed the descriptionURL in error response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:20:33 +00:00
Ancuta Morarasu
6e66fbc924 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126590 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124822 jkaabimofrad: RA-889: Fixed test failure as the result of my r124813 commit.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:13:30 +00:00
Ancuta Morarasu
0779769e84 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126554 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124208 gjames: RA-892: Improved the error message handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:08:05 +00:00
Ancuta Morarasu
bb83241cbb Merged HEAD (5.2) to 5.2.N (5.2.1) 
126536 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123214 gjames: RA-812: Changed http 400 to 404


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:03:36 +00:00
Ancuta Morarasu
ef3ca313a1 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126522 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123025 gjames: RA-757: Handle integrity exceptions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:58:45 +00:00
Ancuta Morarasu
0f836e8090 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126520 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122978 jvonka: RA-766: Update REST fwk - implement "include" query param (used by nodes & shared-links) and deprecate "select" (still used by tasks & cmm).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:58:26 +00:00
Ancuta Morarasu
eb78ee21a1 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126517 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122952 gjames: RA-211: test for custom caching


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126861 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:56:38 +00:00
Ancuta Morarasu
4d9adbcb20 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126516 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122951 gjames: RA-827: test for 202


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:56:29 +00:00
Ancuta Morarasu
185892b06e Merged HEAD (5.2) to 5.2.N (5.2.1) 
126505 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122762 gjames: RA-211: Improving the test coverage of WithResponse


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126849 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:46:24 +00:00
Ancuta Morarasu
642e497a69 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126504 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122759 gjames: RA-211: Changing execution actions to handle WithResponse. Rework>Java7


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:46:15 +00:00
Ancuta Morarasu
62144d05b0 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126502 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122757 gjames: RA-211: Updated the javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:45:55 +00:00
Ancuta Morarasu
551eb0b4d7 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126496 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122700 gjames: RA-211: Response header handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126840 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:45:04 +00:00
Ancuta Morarasu
5e3016c92c Merged HEAD (5.2) to 5.2.N (5.2.1) 
126493 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122640 gjames: RA-211: Renamed ResponseCallBack to WithResponse (because its not a callback)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:44:37 +00:00
Ancuta Morarasu
c3c4692c2c Merged HEAD (5.2) to 5.2.N (5.2.1) 
126490 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122636 gjames: RA-211: Adding the ResponseCallBack to the Multipart actions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:44:06 +00:00
Ancuta Morarasu
83029d134f Merged HEAD (5.2) to 5.2.N (5.2.1) 
126479 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122547 gjames: RA-823:  Allow the implementation to specify the "source entity" first.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126823 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:37:33 +00:00
Ancuta Morarasu
64afcc134e Merged HEAD (5.2) to 5.2.N (5.2.1) 
126478 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122543 gjames: RA-211: Moving around execution logic in preparation for more flexible respoonse handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126822 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:37:23 +00:00
Ancuta Morarasu
8f1051b408 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126477 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122518 gjames: RA-211: Added the webscriptrequest to the Params interface


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:37:12 +00:00
Ancuta Morarasu
5d0aee7ea2 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126474 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122419 gjames: RA-827 More testing of custom status codes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126818 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:36:13 +00:00
Ancuta Morarasu
e1d542438c Merged HEAD (5.2) to 5.2.N (5.2.1) 
126473 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122418 gjames: RA-827 Supporting custom status codes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:36:03 +00:00
Ancuta Morarasu
44754541b7 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126465 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122317 gjames: Adding more test coverage of the webscript executors


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:25:17 +00:00
Ancuta Morarasu
6546bb5411 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126464 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122276 gjames: Improving the test coverage of webscriptGet


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:25:06 +00:00
Ancuta Morarasu
3a8243a94b Merged HEAD (5.2) to 5.2.N (5.2.1) 
126463 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122275 gjames: Improving the tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:24:58 +00:00
Ancuta Morarasu
4d978eb9be Merged HEAD (5.2) to 5.2.N (5.2.1) 
126462 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122241 gjames: RA-833: Added a RelationshipResourceBinaryAction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:24:48 +00:00
Ancuta Morarasu
22872f1def Merged HEAD (5.2) to 5.2.N (5.2.1) 
126461 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122240 gjames: RA-833: Initial framework changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:24:37 +00:00
Ancuta Morarasu
6b821ac9c9 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126455 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122167 gjames: RA-823 adding "source" into the collection output


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:23:20 +00:00
Ancuta Morarasu
c90ab5e034 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126454 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122166 gjames: Changed the method name because Jan didn't like it.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:23:09 +00:00
Ancuta Morarasu
89702bf9d0 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126452 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122164 gjames: RA-823 adding "includeSource" param


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:22:50 +00:00
Ancuta Morarasu
72dca1b5be Merged HEAD (5.2) to 5.2.N (5.2.1) 
126435 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121907 gjames: RA-774 Renaming action to operation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:18:56 +00:00
Ancuta Morarasu
d40f530d88 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126430 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121865 gjames: RA-774 Unit test handled Throwable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:18:09 +00:00
Ancuta Morarasu
764af23ef7 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126429 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121864 gjames: RA-774 Allow the use of "Void" parameter type


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:18:01 +00:00
Ancuta Morarasu
37dcc5fedb Merged HEAD (5.2) to 5.2.N (5.2.1) 
126421 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121808 gjames: RA-774 Improving action tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:15:11 +00:00
Ancuta Morarasu
096b13dc40 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126420 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121807 gjames: RA-774 Added basic action support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:15:01 +00:00
Ancuta Morarasu
d446539d39 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126413 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121614 jvonka: REST fwk - allow select clause properties to take precedence (ie. be included) when using properties 'filter'
      - eg. select=abc,def&properties=id,name, ghi ... should return all five (not just id,name,ghi)
      RA-739


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126759 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:14:00 +00:00
Ancuta Morarasu
5fbede5332 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126380 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120084 jkaabimofrad: RA-640, RA-681: made "update node content" API to return the default JSON representation of the file node. Also added a test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 10:53:26 +00:00
Ancuta Morarasu
78a2510b8d Merged HEAD (5.2) to 5.2.N (5.2.1) 
126358 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119623 jvonka: RA-663: Update REST fwk - fix BinaryResource update (currently masks entity PUT operation)
      - use "updateProperty" (instead of "update") to be consistent with other binary resource methods
      - note: REST fwk relies on unique method names across the resource actions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 10:47:42 +00:00
Raluca Munteanu
27333f1d39 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
386a4aca06 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
Jamal Kaabi-Mofrad
8855ef66f8 ACE-4469: Merged BRANCHES/DEV/HEAD-SFS (cherry picked) to HEAD 
113520: SFS-179: Added multipart upload support into Public API framework.
   114561: SFS-179: Added tests for upload API, as well as minor fixes.
   114732: SFS-179: Changed the assert import from 3.X to 4.X.
   114734: SFS-179: Added unit tests for Public API framework multiPart support.
   114735: SFS-179: Fixed unit test failure.
- Also removed mergeinfo added in r112639

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 23:25:59 +00:00
Tatyana Valkevych
22d2935235 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
6ae2064bfe 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
cfb92ca02b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
92755: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92746: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         92700: MNT-13026: JDK8: 5 test failures in remote-api
         Fixed tests to check JSON correctly as in JDK8 the objects have different order.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-01-31 12:05:28 +00:00