cagache
c1b3decae4
Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/MNT-20740_BinDuplicationHotFix
2019-09-03 13:36:48 +03:00
cagache
995a771b51
Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT-20740_BinDuplicationHotFix
...
# Conflicts:
# rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtilityUnitTest.java
# rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/ContentDestructionComponentUnitTest.java
2019-09-03 10:10:18 +03:00
cagache
fa48983bb6
apply code style
2019-09-02 13:33:37 +03:00
Roy Wetherall
a48cb2755c
Deal with review comments
2019-08-30 11:28:44 +10:00
Roy Wetherall
8e26f5aad5
Addition tests for records, fixed up a couple of issues in the query method as a result.
2019-08-29 21:35:00 +10:00
Roy Wetherall
1c539f9f05
Fix issue with inaccurate results returning from content URL query
...
* added integration test for MNT scenarios
* checked for nodeId's that don't exist in query results
* changed DAO method to return set of node references rather tha nodeId strings
* turned off logging by default
2019-08-29 12:28:04 +10:00
Roy Wetherall
211ebba2f2
Add logging to rm query DAO implementation
2019-08-29 09:50:57 +10:00
Sara Aspery
d79caf2466
Merge branch 'feature-2.7/MNT-20740_BinDuplicationHotFix' into hotfix-2.7/MNT-20740_BinDuplicationHotFix
...
# Conflicts:
# rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java
2019-08-22 12:29:45 +01:00
Sara Aspery
18bd7d7fac
MNT-20740 New db query
2019-08-22 11:19:34 +01:00
Sara Aspery
7c4d8e91ab
MNT-20740 BinDuplicationHotFixSqlRefactor
2019-07-30 16:35:48 +01:00
cagache
9c344bd97b
Merge MNT-20741 fix from release/V3.0 branch to release/V3.1 branch
2019-07-19 08:50:05 +03:00
Ross Gale
557ce8b432
Removing severe sonar warnings
...
(cherry picked from commit 665c579560
)
(cherry picked from commit 16f96e6e91
)
2019-07-18 11:15:01 +03:00
cagache
894dd69c74
Merge MNT-20741 fix from release/V2.7 branch to release/V3.0 branch
2019-07-18 09:17:18 +03:00
Ross Gale
807032334d
MNT-20741 adding code to check for subtypes
2019-07-11 15:41:14 +01:00
Ross Gale
075794981b
MNT-20740 initial commit for delete protection for copied records
2019-07-10 10:53:27 +01:00
cagache
0b765199fe
Merge IE changes from release/V3.0 branch to release/V3.1 branch
2019-07-04 17:11:45 +03:00
cagache
91534ac7df
code review comments
2019-07-04 11:28:35 +03:00
cagache
ff8816a38e
Update branch with latest release/V3.0 changes
2019-07-04 10:01:06 +03:00
cagache
cd76665548
Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-6892_SonarFixes
2019-07-04 09:47:50 +03:00
Ross Gale
95220d099b
RM-6564 adding documentation
2019-07-02 12:21:00 +01:00
cagache
2071139e6e
Sonar critical bug: inefficient use of keySet iterator instead of entrySet iterator
2019-07-02 12:06:13 +03:00
cagache
39245d19c8
Removed redundant local variables
2019-07-01 16:45:32 +03:00
cagache
723183021a
Removed redundant conditional expression
2019-07-01 16:34:24 +03:00
cagache
c5907dbc10
Removed unnecessary null check before Boolean.parseBoolean
2019-07-01 16:28:48 +03:00
cagache
da33dc1ae1
Removed unnecessary semicolon
2019-07-01 16:19:52 +03:00
cagache
6bc4ec03a6
Sonar code smell: Replace the type specification in this constructor call with the diamond operator ("<>")
2019-07-01 16:01:43 +03:00
cagache
26019f50ea
Merge changes from V3.0 branch
2019-07-01 12:12:32 +03:00
Ross Gale
602bcd7c63
Merge branch 'release/V3.0' into feature-3.0/RM-6564_IE_DevelopmentTask
2019-06-26 10:51:42 +01:00
Ross Gale
676e7be940
RM-6831 updating search value
...
(cherry picked from commit a002f1d1c5
)
2019-06-21 16:21:49 +03:00
Ross Gale
5c7e51d8b3
RM-6831 adding sonar fix
...
(cherry picked from commit 01b4146582
)
2019-06-21 16:21:30 +03:00
cagache
1a8ee3d19e
fix Sonar: Empty statements should be removed
...
(cherry picked from commit 365fddc247
)
2019-06-21 16:20:35 +03:00
cagache
e0aaea61d2
Fix sonar Performance - Boxed value is unboxed and then immediately reboxed
...
(cherry picked from commit 7f73ad8227
)
2019-06-21 16:16:01 +03:00
Ross Gale
8b949ad483
RM-6836 remove unused imports
...
(cherry picked from commit 8515b9c2f8
)
2019-06-21 16:06:43 +03:00
Ross Gale
8245909bf2
RM-6836 formatting change
...
(cherry picked from commit f0fe989822
)
2019-06-21 16:06:18 +03:00
Ross Gale
fd8a6a0cd4
RM-6836 formatting change
...
(cherry picked from commit a000f99c04
)
2019-06-21 16:05:55 +03:00
Ross Gale
b799e5600b
RM-6836 formatting change
...
(cherry picked from commit 05c70ede63
)
2019-06-21 16:05:24 +03:00
Ross Gale
b65400746e
RM-6836 adding review comments
...
(cherry picked from commit 07d4c451ca
)
2019-06-21 16:05:09 +03:00
Ross Gale
02093eac33
RM-6836 adding the severe and serious sonar fixes
...
(cherry picked from commit 9f2336d487
)
2019-06-21 16:04:47 +03:00
Ross Gale
b44d8e3be5
Removing sonar warnings
...
(cherry picked from commit 86f66dbd85
)
2019-06-21 16:04:28 +03:00
Ross Gale
16f96e6e91
Removing severe sonar warnings
...
(cherry picked from commit 665c579560
)
2019-06-21 16:03:43 +03:00
Ross Gale
46212a2aae
RM-6836 updating variable beanname
...
(cherry picked from commit c99fa9b421
)
2019-06-21 16:03:22 +03:00
Rodica Sutu
77f750455c
Merge branch 'feature/RM-6835_FixJavaDocRMCommunity' into 'master'
...
Fix java docs for rm community repo:
Closes RM-6835
See merge request records-management/records-management!1163
2019-06-20 15:14:31 +01:00
Ross Gale
75b4bc5ca5
Merge branch 'feature/RM-6865_RemoveEncoding' into 'master'
...
Resolve RM-6865 "Feature/ removeencoding"
Closes RM-6865
See merge request records-management/records-management!1196
2019-06-20 07:33:47 +01:00
Ross Gale
8a37916e3a
RM-6865 code review changes
2019-06-19 08:20:55 +01:00
Ross Gale
d5d74d6899
RM-6865 removing encoding of path in action body
2019-06-18 17:47:39 +01:00
Ross Gale
c82d586479
RM-6865 removing encoding of path in action body
2019-06-18 17:45:46 +01:00
Tuna Aksoy
3aa4b95470
RM-6141: RM_support_for_the_Insight_Engine
...
(cherry picked from commit 8858f8fd188e70d1175cf3134cda2af80cf967fc)
2019-06-18 17:55:55 +03:00
Claudia Agache
86ad2dcd93
Merge branch 'feature/RM-6847_SonarMajorIssues' into 'master'
...
RM-6847 Fix some of sonar major issues
See merge request records-management/records-management!1191
2019-06-18 12:57:01 +01:00
Ross Gale
b907ff04cb
RM-6865 adding null check
2019-06-17 14:43:39 +01:00
Ross Gale
dc38a2031b
Merge branch 'feature/RM-6831_SecuritySonarFix' into 'master'
...
Resolve RM-6831 "Feature/ securitysonarfix"
Closes RM-6831
See merge request records-management/records-management!1189
2019-06-14 14:15:05 +01:00