Commit Graph

4909 Commits

Author SHA1 Message Date
Alan Davis
5546c363be Fix/mnt 15937 cmis filter 2017-07-21 16:09:06 +01:00
Alan Davis
5dd0fc26e5 Fix/mnt 15937 cmis filter 2017-07-21 14:32:53 +01:00
Ancuta Morarasu
1cbb113c3a REPO-2346: Create develop branch from 5.2.N and change version to 5.3-SNAPSHOT 2017-07-13 15:39:27 +03:00
David Webster
5cbcb7d493 MNT-18018: Use same de-dupe marker detection in client side code to prevent version comparison displaying if filename difference will be ignored on upload.
(partial merge - changes in share were skipped)
(cherry picked from commit 3614ebb6510a4137dd7ce7d988def985ea6eb1d6)
2017-07-13 15:23:04 +03:00
David Webster
252563d05f MNT-18018: Ensure filename is correctly escaped before being passed into RegEx.
(cherry picked from commit 787e42b0639412a66a6c4e5b0658b9b9e9992fcc)
2017-07-13 15:22:43 +03:00
David Webster
42e2243dc0 MNT-18018: Add check to ensure that we don't introduce spurious filename changes when using Edit Offline repeatedly.
(cherry picked from commit 638112d0a073da1591f16970dde48d9b908b5cd5)
2017-07-13 15:22:20 +03:00
Jan Vonka
40737b18ec Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137954 jvonka: REPO-2555: Retrieve Audit Application Entries - temporarily comment out failed testGetAuditEntries
   - added TODOs & comment to sub-task REPO-2598


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:12:05 +00:00
Jan Vonka
e50e49d525 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137952 jvonka: REPO-2555: Retrieve Audit Application Entries - fix compilation issue & minor refactor/cleanup
   - see sub-task REPO-2619


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:11:58 +00:00
Jan Vonka
0e86382a6b Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137949 anechifor: REPO-2555 validate auditAppId


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:11:51 +00:00
Jan Vonka
03ec9fbbcf Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137948 jvonka: REPO-1785: Get Audit App Info - minor code formatting & consistency fix 
   - noticed whilst verifying REPO-2585


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:11:43 +00:00
Jan Vonka
fa37e7b8f2 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137947 anechifor: add total items


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:11:37 +00:00
Jan Vonka
589867297f Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137946 anechifor: add totalItems


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:11:31 +00:00
Jan Vonka
a706379934 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137945 anechifor: REPO-2555 audit Entries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:11:22 +00:00
Jan Vonka
a04d774ff6 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137931 anechifor: REPO-2555 audit-entries added include


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:11:16 +00:00
Jan Vonka
1b35b79dfa Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137930 anechifor: REPO-2555 audit-entries retrieve


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137973 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:11:09 +00:00
Jan Vonka
97299a3616 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137927 eknizat: REPO-1298 Enable/Disable Application Auditing - Changes following code review


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137972 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:11:02 +00:00
Jan Vonka
131985f84d Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137926 aforascu: REPO-2555 / REPO-2598 - Retrieve Application Audit Entries
       - commented failing tests for Response Codes 400&404


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:10:54 +00:00
Jan Vonka
9fcff2ecad Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137925 aforascu: REPO-2555 / REPO-2598 - Retrieve Application Audit Entries
       - added Junit positive and negative tests for audit entries: checked response codes and basic audit entry details 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:10:45 +00:00
Jan Vonka
4ec36646bd Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137909 eknizat: REPO-1298,REPO-2624 Enable/Disable Application Auditing - Add junit tests for 501 error code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:10:38 +00:00
Jan Vonka
87d5202adf Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137908 anechifor: REPO-2619 - adding implementation of listAuditEntries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137968 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:10:30 +00:00
Jan Vonka
bb0ab874a0 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137907 jvonka: Trivial improvement: Queries REST API Test - testFieldsId
   - noticed whilst running ApiTest suite locally for new V1 Audit REST API
   - hence initially committed on 5.2.N-AUDIT-API branch (prior to merge to 5.2.N
   - this tests now passes even if AbstractSingleNetworkSiteTest -> useDefaultNetwork is set to true


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:10:23 +00:00
Jan Vonka
4032d49248 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137906 aforascu: REPO-1785 / REPO-2585 - Retrieve Audit Application info
       - deleted AuditTest.java and added the methods from it to AuditAppTest.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:10:01 +00:00
Jan Vonka
8ed0f981b8 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137905 anechifor: REPO-2619 - adding implementation of listAuditEntries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137965 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:09:55 +00:00
Jan Vonka
0da3bb1492 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137900 eknizat: REPO-1298,REPO-2624 Enable/Disable Application Auditing - Add junit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:09:49 +00:00
Jan Vonka
e66ff31d3c Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137899 aforascu: REPO-1785 / REPO-2585 - Retrieve Audit Application info
       - added a negative test (501 response code) for testGetAuditApp() Junit
       - added AuditTest class as an extra layer for methods and objects common to audit Junits (e.g enabling / disabling system audit) 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:09:43 +00:00
Jan Vonka
72ca042f3b Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137897 anechifor: REPO-2619 - adding implementation of listAuditEntries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137962 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:09:36 +00:00
Jan Vonka
bbfd3a75a6 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137892 eknizat: REPO-1298 Enable/Disable Application Auditing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:09:29 +00:00
Jan Vonka
02d812a0cd Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137889 aforascu: REPO-1785 / REPO-2585 - Retrieve Audit Application info
       - added Junit tests (positive and negative)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137960 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:09:21 +00:00
Jan Vonka
623a37d005 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137882 anechifor: REPO-1784 - Retrieve Audit Applications Implementation subtask - REPO-2581


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:09:14 +00:00
Jan Vonka
610e56bc74 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137875 anechifor: REPO-1784 - Retrieve Audit Applications Implementation subtask - REPO-2580


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:09:06 +00:00
Jan Vonka
79f180d901 Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)
137839 jvonka: V1 Audit API - Retrieve Audit Application info (REPO-1785)
   - initial code impl (tests to follow)
   REPO-437, REPO-2584


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-12 12:08:59 +00:00
Jan Vonka
41bce5da29 REPO-2181 - improve V0 Audit API param defaults & error handling
- we no longer silently ignore non-null NumberFormatException (throws 400 bad argument)
- important when clearing/deleting audit (to minimise chance that url typo will clear more than expected)
- also fixes trivial typo raised in ALF-21865 (getParamFromTime doesn't use DEFAULT_FROM_TIME)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-07-04 20:40:59 +00:00
Jan Vonka
b5d6a8696a REPO-2117: Deleted nodes pagination returns incorrect properties
- fix paging call (in API impl) & add a sanity test (to JUnit test suite)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137827 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-26 10:20:40 +00:00
Jelena Cule
d62104b859 MNT-17978: Reverting fix for MNT-17978: Non-domain users were not able to access webdav by mapping the network drive in windows explorer
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-26 08:28:44 +00:00
Martin Muller
862ca386fb REPO-2557, ALF-21907 Added a new test szenario where the node creator is tested if he can delete the locked node.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-23 10:56:29 +00:00
Ancuta Morarasu
270ab7e87d Fix the api-explorer version, there is no 5.2.2-SNAPSHOT version yet.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-23 07:34:24 +00:00
Alexandru Epure
3cf0d61d32 REPO-2520: Community: SiteMembership Java API calls should tell which site resulted in errors
Changed tests asserts from (actual value, expected value) to (expected value, actual value) as recommended in the Junit Assert Javadoc.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-22 12:57:06 +00:00
Jelena Cule
df62dc33cf MNT-17978: Non-domain webdav users unable to authenticate via kerberos: both non-domain and domain webdav clients should be able to access webdav when kerberos is configured without breaking share logging in as well as share kerberos sso (related to MNT-16931, MNT-17850, MNT-17858)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-20 00:36:02 +00:00
Alan Davis
6507678eeb Merged HEAD (5.2) to 5.2.N (5.2.2) (RECORD ONLY):
130397,130443,132419,132425,132567,132653-132654,132661-132685,132688,132692-132694,132709,
    132711-132712,132714,132723-132726,133002-133012,133249,133358-133411,133432,133563,133595,
    133762,133855,134029,134173-134200,134202-134211,134270,134302,134317,134837,134895-134896,
    134969-134988,134995,135081,135119,135778,136876,136905,137301-137420,137428-137657,137659
    The two branches should now be the same except for the version numbers and any commits on
    5.2.N after r137427

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-16 08:33:50 +00:00
Andrei Rebegea
3124dc432c Merged 5.2.N (5.2.2) to HEAD (5.2)
137425 gjames: MNT-18051: Changed stats count to countValues


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:27:02 +00:00
Andrei Rebegea
2e23dd9087 Merged 5.2.N (5.2.2) to HEAD (5.2)
137421 gjames: SEARCH-480: Fixing search api display property.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:26:55 +00:00
Andrei Rebegea
5e5a00ad97 Merged 5.2.N (5.2.2) to HEAD (5.2)
137180 msuzuki: Search-463, implement fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137647 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:24:39 +00:00
Andrei Rebegea
8d0caa5cd4 Merged 5.2.N (5.2.2) to HEAD (5.2)
137160 rneamtu: MNT-17620 : Upload new version action for a duplicate file name changes the name of the file
      - do not change the fileName when uploading a new version


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137644 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:24:17 +00:00
Andrei Rebegea
48d70627d2 Merged 5.2.N (5.2.2) to HEAD (5.2)
137129 msuzuki: Search-340, fix default values of range inclusion and data-model update


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137638 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:23:38 +00:00
Andrei Rebegea
f2d7101698 Merged 5.2.N (5.2.2) to HEAD (5.2)
137119 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1)
      137021 skopf: REPO-2054 - GS Replacement: Implement new transformer to invoke the rasterizer, depending on chosen technology
      - Fix Bamboo builds


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:23:11 +00:00
Andrei Rebegea
7929b96f56 Merged 5.2.N (5.2.2) to HEAD (5.2)
137115 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1)
      136982 anechifor: added profile


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:22:43 +00:00
Andrei Rebegea
64aa4fe869 Merged 5.2.N (5.2.2) to HEAD (5.2)
137092 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      137028 gjames: SEARCH-456: quoting filter queries where possible


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:20:04 +00:00
Andrei Rebegea
7ff9c239bd Merged 5.2.N (5.2.2) to HEAD (5.2)
137090 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      137024 msuzuki: Search-426, align response of V1 with grouping to be the same as V2


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:19:48 +00:00
Andrei Rebegea
d8d29f6c2f Merged 5.2.N (5.2.2) to HEAD (5.2)
137089 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      137019 msuzuki: Search-340, added unit test to cover range start and end inclusive options


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137604 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:19:41 +00:00
Andrei Rebegea
b2be228977 Merged 5.2.N (5.2.2) to HEAD (5.2)
137088 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      137016 gjames: SEARCH-340: Changing range tags to label


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:19:31 +00:00