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

843 Commits

Author SHA1 Message Date
Andrei Rebegea
a9549c55e2 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137073 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136944 gjames: SEARCH-451: Switching to the new pivot format


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:17:40 +00:00
Andrei Rebegea
eb83300ad8 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137072 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136941 msuzuki: Search-340, added date parsing to range


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:17:33 +00:00
Andrei Rebegea
c493041e85 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137070 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136895 msuzuki: Search-340, adding more unit test to support inclusive and exclusive range


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137585 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:17:19 +00:00
Andrei Rebegea
57fabd13a8 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137067 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136888 msuzuki: Search-340, align range response with interval response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:17:00 +00:00
Andrei Rebegea
ecf8dae504 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137066 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136887 gjames: SEARCH-449: Added localisation element


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:16:53 +00:00
Andrei Rebegea
d776dffab9 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137063 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136846 msuzuki: Serach-427, refactored to return the facets response as a generic facets when group by is used


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:16:30 +00:00
Andrei Rebegea
31488e63aa Merged 5.2.N (5.2.2) to HEAD (5.2) 
137061 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136814 gjames: SEARCH-348: Better timezone handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:16:16 +00:00
Andrei Rebegea
229f589b01 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137060 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136808 gjames: SEARCH-339: Adding bucketInfo for intervals with consistent names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:16:10 +00:00
Andrei Rebegea
4ddc581743 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137058 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136805 msuzuki: Search-340, changed range to a collection as it may handle many range facets


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:15:56 +00:00
Andrei Rebegea
02a518aeea Merged 5.2.N (5.2.2) to HEAD (5.2) 
137055 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136780 msuzuki: Search-340, amend from range to ranges


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:15:34 +00:00
Andrei Rebegea
16a9bda859 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137054 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136777 msuzuki: Search-340, renamed range to ranges


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:15:27 +00:00
Andrei Rebegea
df0417e4d8 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137052 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136774 msuzuki: Search-340, renamed facetInfo to bucketInfo


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:15:11 +00:00
Andrei Rebegea
a813e4abb3 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137049 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136763 gjames: SEARCH-339: Switching to an Interval Set


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:14:51 +00:00
Andrei Rebegea
7b6b639ee0 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137048 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136744 msuzuki: Search-340, amend naming to match json param


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:14:44 +00:00
Andrei Rebegea
cd217d1ffc Merged 5.2.N (5.2.2) to HEAD (5.2) 
137045 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136712 msuzuki: Search-340, added filterQuery to facet range response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:14:23 +00:00
Andrei Rebegea
d6ccfa432f Merged 5.2.N (5.2.2) to HEAD (5.2) 
137044 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136707 gjames: SEARCH-348: Adding timezone to search api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:14:14 +00:00
Andrei Rebegea
1ceecf1ebf Merged 5.2.N (5.2.2) to HEAD (5.2) 
137043 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136705 msuzuki: Search-340, added tags and excludeFilters to pojo


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:14:07 +00:00
Andrei Rebegea
198b386e85 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137042 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136699 msuzuki: search-340, added addtional facet data relating to range on the generic facet model


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:14:00 +00:00
Andrei Rebegea
5160e8495b Merged 5.2.N (5.2.2) to HEAD (5.2) 
137041 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136690 msuzuki: Search-340, Added addtional params: include, other and hardend


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:13:53 +00:00
Andrei Rebegea
7f6eebd6ae Merged 5.2.N (5.2.2) to HEAD (5.2) 
137039 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136676 gjames: SEARCH-441: Adding a "history" scope that uses a fake store mapping to call a /solr/history index


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137554 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:13:39 +00:00
Andrei Rebegea
5e9c375c7c Merged 5.2.N (5.2.2) to HEAD (5.2) 
137038 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136673 msuzuki: SEARCH-340, adding facet range search


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:13:29 +00:00
Andrei Rebegea
3185fba7bb Merged 5.2.N (5.2.2) to HEAD (5.2) 
137036 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136645 gjames: SEARCH-409: Better pivot with stats handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137551 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:13:15 +00:00
Andrei Rebegea
aa13c3c07a Merged 5.2.N (5.2.2) to HEAD (5.2) 
137034 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136625 gjames: SEARCH-409: Changing metrics to a Set


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:12:59 +00:00
Andrei Rebegea
7b0a2cadf8 Merged 5.2.N (5.2.2) to HEAD (5.2) 
137033 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136624 gjames: SEARCH-409: Better handling of stats metric response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:12:52 +00:00
Andrei Rebegea
2268dc626a Merged 5.2.N (5.2.2) to HEAD (5.2) 
137032 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136623 gjames: SEARCH-409: Initial solr stats api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:12:45 +00:00
Andrei Rebegea
528aa67e3b Merged 5.2.N (5.2.2) to HEAD (5.2) 
137030 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136312 gjames: SEARCH-339: Fixing afts filterquery


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:12:28 +00:00
Andrei Rebegea
eb82985892 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136757 jkaabimofrad: Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      136752 jkaabimofrad: APPSREPO-147: Renamed 'pathInfo' to 'path' to be consistent with other APIs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137506 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:07:59 +00:00
Andrei Rebegea
8b861a9ce4 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136756 jkaabimofrad: Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      136749 jkaabimofrad: Minor re-formatting (replace tabs with spaces) noted via APPSREPO-147.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:07:51 +00:00
Andrei Rebegea
c063c87d16 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136755 jkaabimofrad: Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      136745 jkaabimofrad: APPSREPO-147: Added an optional "include=path" parameter to the "list favorites" API as well as create and get a single favorite endpoints.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137504 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:07:44 +00:00
Andrei Rebegea
9112b8117a Merged 5.2.N (5.2.2) to HEAD (5.2) 
136710 jkaabimofrad: Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      136704 jkaabimofrad: APPSREPO-165: Added tests for testing the 'include' parameter with 'path' and/or 'allowableOperations' upon creating a shared link.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:07:07 +00:00
Andrei Rebegea
6f2ed57436 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136709 jkaabimofrad: Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      136698 mbhave: APPSREPO-184: Added integration test for /shared-links?include=path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137498 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:07:01 +00:00
Andrei Rebegea
f3df178426 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136102 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      136072 gjames: SEARCH-334: Adding SearchRequestContext and pivot logic


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:01:14 +00:00
Andrei Rebegea
60a863c546 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136101 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      136071 gjames: SEARCH-334: Adding pivot to the request


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:01:06 +00:00
Andrei Rebegea
749096b969 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136098 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135972 gjames: SEARCH-339: Changed facet intervals to use the generic facets metric


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137470 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:00:45 +00:00
Andrei Rebegea
203a0a2bb3 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136097 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135953 msuzuki: SEARCH-374, added new response to display group faceting in buckets


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137469 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:00:37 +00:00
Andrei Rebegea
1f5f8cf0ee Merged 5.2.N (5.2.2) to HEAD (5.2) 
136096 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135842 gjames: SEARCH-376: Adding the includeRequest parameter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137468 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:00:27 +00:00
Andrei Rebegea
d197450d1a Merged 5.2.N (5.2.2) to HEAD (5.2) 
136095 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135807 gjames: SEARCH-377: Adding "queries" filter query param


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:00:19 +00:00
Andrei Rebegea
2f42e9814b Merged 5.2.N (5.2.2) to HEAD (5.2) 
136093 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135772 gjames: SEARCH-419: Correct handling of fieldfacet label and exclusion filters


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 11:00:06 +00:00
Andrei Rebegea
5b308a6ea3 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136090 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135624 gjames: SEARCH-339: Correct use of the interval field


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137462 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 10:59:45 +00:00
Andrei Rebegea
469fe100cf Merged 5.2.N (5.2.2) to HEAD (5.2) 
136084 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135514 gjames: SEARCH-339: Adding filterQuery to facet interval/facet fields


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137456 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 10:59:04 +00:00
Andrei Rebegea
867026b9a2 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136081 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135511 gjames: SEARCH-372: Adding filterQuery to facetQueries result


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137453 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 10:58:43 +00:00
Andrei Rebegea
97c6e79205 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136080 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135510 gjames: SEARCH-372: Adding filterQuery to the result, wip


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137452 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 10:58:36 +00:00
Andrei Rebegea
21cbaef6a3 Merged 5.2.N (5.2.2) to HEAD (5.2) 
136077 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135431 gjames: SEARCH-339: A basic restapi for facet intevals


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137449 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 10:58:13 +00:00
Andrei Rebegea
ca1054e794 Merged 5.2.N (5.2.2) to HEAD (5.2) 
135933 jkaabimofrad: Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      135878 jkaabimofrad: APPSREPO-118: A few minor tweaks based on peer review.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 10:56:52 +00:00
Andrei Rebegea
b8a2b60ea1 Merged 5.2.N (5.2.2) to HEAD (5.2) 
135931 jkaabimofrad: Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      135804 jkaabimofrad: APPSREPO-35, APPSREPO-118: Added tests for reset password service and REST API.
          - Added a utility class (EmailUtil) to work with MailActionExecutor in test mode
          - Added a new workflow task responsible for sending the reset password confirmation email (per peer review)
          - Changed the reset-password endpoint to return a 202 response for an inactive workflow or invalid workflow id, key or mismatched user
          - Some other minor changes as the result of adding tests
          - Also, fixed tests failures by changing the reset password workflow definition target namespace URI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 10:56:38 +00:00
Andrei Rebegea
d183eda49f Merged 5.2.N (5.2.2) to HEAD (5.2) 
135899 aforascu: REPO-2156 / MNT-16748: Failing to extract auditing entries from SearchService using Share, CMIS.
   - Added two JUnit tests that test that the audit records are added when using SearchService query(SearchParameters): one in the AuditMethodInterceptorTest and another one in AuditWebScriptTest that is using the Rest-API get audit method to query the audit
   - Refactored also an existing test in AuditMethodInterceptorTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137433 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-15 10:56:19 +00:00
Andrei Rebegea
4a08eff542 Merged 5.2.N (5.2.2) to HEAD (5.2) 
135686 jvonka: REPO-2110 / MNT-17477: Trivial - fix test
   - re-fix mismatch (4.2 vs 5.x) in test helper only


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-14 17:08:26 +00:00
Andrei Rebegea
66c9e10176 Merged 5.2.N (5.2.2) to HEAD (5.2) 
135685 jvonka: Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
      135683 jvonka: Merged 5.0.N (5.0.5) to 5.1.N (5.1.3)
         135681 jvonka: Merged V4.2-BUG-FIX (4.2.8) to 5.0.N (5.0.5)
            135658 jvonka: Merged 5.0.N (5.0.5) to V4.2-BUG-FIX (4.2.8)
                REPO-2110 / MNT-17477: CMIS: SXSS+CSRF vulnerability (browser binding)
                     - tweak test (for unexpected NPE in 4.2)
                     - resolve backport conflict


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-14 17:08:19 +00:00
Andrei Rebegea
04a0ef631c Merged 5.2.N (5.2.2) to HEAD (5.2) 
135684 jvonka: Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
      135682 jvonka: Merged 5.0.N (5.0.5) to 5.1.N (5.1.3)
         135680 jvonka: Merged V4.2-BUG-FIX (4.2.8) to 5.0.N (5.0.5)
            135657 jvonka: Merged 5.0.N (5.0.5) to V4.2-BUG-FIX (4.2.8)
                REPO-2110 / MNT-17477: CMIS: SXSS+CSRF vulnerability (browser binding)
                     - tweak test (for unexpected NPE in 4.2)
                     - resolve backport conflict


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-14 17:08:12 +00:00
Andrei Rebegea
9b499c911a Merged 5.2.N (5.2.2) to HEAD (5.2) 
135606 jvonka: REPO-2110 / MNT-17477: CMIS: SXSS+CSRF vulnerability (browser binding)
   - force download=attachment (Content-Disposition headers) for all content types, except those white-listed (eg. pdf & specific img types)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137404 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2017-06-14 17:07:39 +00:00