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,203 Commits 325 Branches 2,188 Tags
ee32e29f485a49b5aa5535aa0adc1387f0129edb
Commit Graph

57 Commits

Author SHA1 Message Date
Martin Muller
ee91e0b457 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128207 jvonka: V1 REST API: Node Version History - add "revert version" operation
   - ie. promote a previous version to become a new (most recent) version
   - POST /nodes/nodeId/versions/versionId/revert (with request body, optionally majorVersion &/or comment)
   REPO-236


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 10:13:42 +00:00
Alan Davis
cf17943d43 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127899 adavis: Update source headers that came from API-STRIKES-BACK


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 11:13:46 +00:00
Alan Davis
3f0bba6779 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127604 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127414 jvonka: Node Associations - create node with assocs (peer &/or secondary child)
      - can be optionally used to create (eg. mandatory) assoc(s) to other existing node(s)
      RA-925


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 15:18:10 +00:00
Alan Davis
7e1a657cd0 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127581 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126681 jvonka: Node Associations - child assocs
      - in responses return isPrimary (rather than isPrimaryParent)
      - RA-920, RA-930, RA-634


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:14:53 +00:00
Alan Davis
50af2e5cc1 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127579 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126567 jvonka: Node Associations - further updates
      - for child assocs, do not expose assoc child qname (nominally like file/folder for primary child assoc)
      - additional api tests (+ve & -ve) for peer assocs & secondary child assocs
      - RA-745, RA-920, RA-921, RA-930, RA-742, RA-918, RA-919


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127672 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:14:43 +00:00
Alan Davis
c49322624a Merged HEAD (5.2) to 5.2.N (5.2.1) 
127577 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126329 jvonka: Node Associations - initial api tests (+ve & -ve) for secondary child assocs
      - RA-745, RA-920, RA-921, RA-930


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:14:32 +00:00
Alan Davis
a8bf2940b6 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127573 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126282 gjames: RA-878:All api errors should return the standard error, fix 404s


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:14:15 +00:00
Alan Davis
5a9ef6c22a Merged HEAD (5.2) to 5.2.N (5.2.1) 
127572 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126276 jvonka: Node Associations - initial api tests (+ve & -ve) for peer assocs
      - RA-742, RA-918, RA-919


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:14:10 +00:00
Alan Davis
cdd3aa1075 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127567 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126000 jkaabimofrad: RA-933, RA-934, RA-972: Changed the "tickets" API namespace from "alfresco" to "authentication". Also, added support to the REST API test fwk to handle different API namespaces.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:09:26 +00:00
Alan Davis
b9f4a68302 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127561 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125708 jvonka: RA-779 / RA-780: Sites API - fix (create site + permanent delete + create site with same site id)
      - RA-967


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:08:53 +00:00
Alan Davis
a7d99dded0 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127555 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125601 jvonka: RA-779: Sites API - create site
      - additional tests (site description & also max lengths for id, title & description)
      - fix site id validation (repeating valid chars)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127649 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:03:37 +00:00
Alan Davis
c03a318ce9 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127532 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125514 jvonka: RA-779 / RA-780: Sites API - create site & delete site
      - fix delete/remove test status code
      - note: also put back previous rendition status codes (=> raise separate local vs build issue)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:00:15 +00:00
Alan Davis
5e3eff4113 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127531 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125513 jvonka: RA-779 / RA-780: Sites API - create site & delete site
      - follow-on improvemnts (generating site id, adding favorite with option to sip)
      - more tests (+ve & -ve)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 14:00:09 +00:00
Alan Davis
bfa0404bab Merged HEAD (5.2) to 5.2.N (5.2.1) 
127528 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125406 jvonka: RA-779 / RA-780: Sites API - initial commit for create site [default/functional Share site ;-)] & delete site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127638 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 13:59:39 +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
287f92d3ff Merged HEAD (5.2) to 5.2.N (5.2.1) 
126616 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125219 jkaabimofrad: Fixed minor formatting issue in the toString methods. Also, removed unused imports.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:32:24 +00:00
Ancuta Morarasu
95affed365 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126581 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124740 gjames: RA-847, RA-848 Retrieving deleted nodes


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:11:01 +00:00
Ancuta Morarasu
8d6a950702 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126550 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124200 jvonka: RA-869: Remove "include" processing from "includeSource" entity for /nodes/nodeId/children endpoint


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:07:27 +00:00
Ancuta Morarasu
7925bca309 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126542 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123495 jvonka: Nodes (FileFolder) API - add optional relativePath (to make folders) when creating a folder, empty file or other custom node
      RA-703


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:04:50 +00:00
Ancuta Morarasu
543d2bbf1c Merged HEAD (5.2) to 5.2.N (5.2.1) 
126538 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123316 jvonka: Nodes (FileFolder) API - add optional include allowableOperations 
      RA-770


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:04:10 +00:00
Ancuta Morarasu
70dbbd521d Merged HEAD (5.2) to 5.2.N (5.2.1) 
126526 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123086 jkaabimofrad: Added support to allow the REST API tests to set the request headers.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:59:22 +00:00
Ancuta Morarasu
5fe5afaf0b Merged HEAD (5.2) to 5.2.N (5.2.1) 
126509 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122792 jkaabimofrad: RA-676, RA-677, RA-678: 
          - Added check to return 404 response when the renditionId is registered but is not applicable for the node's mimeType.
          - Added check to return 400 when the source node has no content.
          - Changed the create rendition response to return an empty body.
          - Modified the exception when the renditionId is not registered.
          - Fixed the framework to include “errorKey” in the error response which was missing from some exceptions such as EntityNotFoundException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126853 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:47:33 +00:00
Ancuta Morarasu
b6eec668c7 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126495 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122697 jvonka: (Quick) Shared Links API - first-cut for shared links api tests (+ve & -ve)
      - also tweaks to REST api test 'fwk' (harness)
      RA-773, RA-708, RA-776, RA-750, RA-829, RA-775


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:44:55 +00:00
Ancuta Morarasu
c5dcb1659f Merged HEAD (5.2) to 5.2.N (5.2.1) 
126483 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122594 jvonka: REST api fwk: pass through query params for DELETE method
      - also update REST api test fwk
      RA-837


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126827 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:41:53 +00:00
Ancuta Morarasu
fbe19dfc15 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126481 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122580 jvonka: Nodes (FileFolder) API - return isFile in node info (renamed from isContent) in addition to isFolder
      RA-828, RA-741


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126825 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:37:52 +00:00
Ancuta Morarasu
3d71d8c3ee Merged HEAD (5.2) to 5.2.N (5.2.1) 
126476 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122483 jkaabimofrad: RA-678: Updated create rendition Api + tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:37:00 +00:00
Ancuta Morarasu
88b0a9159f Merged HEAD (5.2) to 5.2.N (5.2.1) 
126472 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122394 jkaabimofrad: RA-677: Added node's renditions REST API.
              - Retrieve information about a rendition of a node + test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126816 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:35:46 +00:00
Ancuta Morarasu
775380563a Merged HEAD (5.2) to 5.2.N (5.2.1) 
126468 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122327 jkaabimofrad: RA-673, RA-678: Added node's renditions REST API. 
                    - Retrieve Renditions For Node + tests
                    - Create Rendition


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:35:12 +00:00
Ancuta Morarasu
434a3808e7 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126456 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122175 gjames: RA-823 added parseListSource() proxy method and SiteMembers source entity test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:23:30 +00:00
Ancuta Morarasu
1c7a2ac93c Merged HEAD (5.2) to 5.2.N (5.2.1) 
126449 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122013 jvonka: Nodes (FileFolder) API - add isContent (in addition to isFolder) to node info
      RA-828, RA-741


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:22:22 +00:00
Ancuta Morarasu
c8b6320632 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126412 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121563 jkaabimofrad: RA-640: Fixed encoding issue when updating binary content, as well as, multipart uploading.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:12:23 +00:00
Ancuta Morarasu
d559c54151 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126401 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121206 jvonka: FileFolder API - NodeApiTest - minor updates around 'expected' checks
      - pre-work (eg. before implementing "move" and also hiding "sys" namespace aspects/props, etc) 
      RA-638, RA-683


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:02:45 +00:00
Ancuta Morarasu
970b2ca96e Merged HEAD (5.2) to 5.2.N (5.2.1) 
126386 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120471 jvonka: FileFolder API - NodeApiTest - follow-on to fix NPE in debug logging
      RA-641


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 10:56:59 +00:00
Ancuta Morarasu
7801810028 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126385 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120469 jvonka: FileFolder API - NodeApiTest - add test to retrieve content
      - also update test fwk to support post request body as byte array (as well as string)
      RA-641


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 10:56:47 +00:00
Ancuta Morarasu
08ac84ff25 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126384 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120464 jkaabimofrad: RA-725: Changed the "userName" property in minimal person response to "id".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 10:56:17 +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
49327679bb Merged HEAD (5.2) to 5.2.N (5.2.1) 
126373 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119840 jvonka: FileFolder API - update NodeApiTest (testCreateFolder & testCreateEmptyFile)
      - follow pre-existing "expected" api test pattern


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 10:51:18 +00:00
Ancuta Morarasu
e97f9132ad Merged HEAD (5.2) to 5.2.N (5.2.1) 
126372 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119837 jvonka: FileFolder API - fix build (BCK) & api tests
      - as agreed, for now split test client api models from server-side impl
      - rename existing Node/Document/Folder to FavouriteNode/Document/Folder (for backwards compat')


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 10:51:08 +00:00
Ancuta Morarasu
b774ad0ac4 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126353 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118880 jkaabimofrad: Fixed test failure .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 10:46:55 +00:00
Ancuta Morarasu
d05f7bb484 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126351 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118825 jkaabimofrad: RA-655: manual merge of SFS module to FILE-FOLDER-API.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 10:46:38 +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
Raluca Munteanu
9a889c69ea 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
Jean-Pierre Huynh
f8fa061ba3 Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119558 gcornwell: Merged code coverage improvements to 5.1-MC1 (5.1.0)
      r117774 gjames: RA-567: Increase /workflow/processes API code coverage
      r117773 gjames: RA-567: /workflow/processes coverage, removed unused ActivitiTypeConverter
      r116883 gjames: RA-531: reapplied change after merge, for MultiTServiceImpl test coverage
      r116629 gjames: RA-568 Increase /workflow/process-definitions API code coverage
      r116574 gjames: RA-569 Increase /workflow/tasks API code coverage
      r116286 gjames: RA-567: Increase /workflow/processes API code coverage
      r115853 gjames: RA-566: Increasing /people api coverage (description field)
      r115811 gjames: RA-566: Increasing /people api coverage
      r113007 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DynamicNamespacePrefixResolver RA-521
      r113006 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DictionaryComponent RA-514
      r112969 gjames: Adding additional test coverage for TemplateServiceImpl RA-530
      r112960 gjames: Alternative test approach for ModuleServiceImpl RA-520
      r112703 gjames: Adding additional test coverage for NodeLocatorService RA-522
      r112702 gjames: Adding additional test coverage for JobLockServiceImpl RA-516
      r112699 gjames: Adding additional test coverage for ModuleServiceImpl RA-520
      r112508 gjames: Adding additional test coverage for RenditionServiceImpl RA-526
      r112476 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112475 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112238 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112237 gjames: Adding additional test coverage for TaggingService RA-529
      r112236 gjames: Adding additional test coverage for MultiTServiceImpl RA-531
      r112206 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112167 gcornwell: RA-523: Increase NodeService code coverage (removed redundant code that was testing a version store we no longer use)
      r112102 gjames: Reverted changes to PermissionServiceImpl for RA-524
      r112048 gjames: Temporarily removed some PermissionServiceImpl code. I need to put it back.
      r111620 gjames: Adding additional test coverage for PermissionService RA-524
      r111619 gjames: Added some @Override to make Sonar happier
      r111456 gjames: Adding additional test coverage for AuthenticationService RA-509
      r111427 gjames: Adding additional test coverage for AttributeService RA-509
      r111317 gjames: Adding additional test coverage for WorkflowService RA-533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:35:05 +00:00
Jean-Pierre Huynh
921dbb04ae Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119082 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118568 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         118398 gjames: RA-607 BCRYPT Improved the logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:17:10 +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
Tatyana Valkevych
c70953278a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
104025: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103975: MNT-13938: Public API does not set any HTTP caching headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-13 16:25:31 +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