inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,616 Commits 324 Branches 2,170 Tags
04a74aa6996041d009ea7bc45f93cf209b648d93
Commit Graph

836 Commits

Author SHA1 Message Date
Roxana Lucanu
d0cb729f35 Merge branch 'release/V3.0' into merge-3.1/RM-7060_FixSearchAspect 2019-12-09 14:39:06 +02:00
Roxana Lucanu
45e39aa4bd Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:49:30 +02:00
Roxana Lucanu
6035370684 Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect 2019-12-04 15:44:29 +02:00
Roxana Lucanu
8d5ff56f8f Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect 2019-12-03 11:58:42 +02:00
Ross Gale
6b01d76ed1 Merge branch 'release/V3.0' into merge-3.1/mergeUp 2019-11-29 15:55:07 +00:00
Ross Gale
3505e8dfd6 fix conflicts 2019-11-29 10:59:47 +00:00
Roxana Lucanu
a7f2dec355 RM-7060 Reapply search aspect when filing/moving 2019-11-26 21:57:35 +02:00
Ross Gale
3937379587 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
ffaf55c7d3 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x' 
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303

Adds web script to ensure all records have correct disposition instructions
 2019-11-22 18:15:24 +00:00
Ross Gale
df6d92d031 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x' 
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303

Adds web script to ensure all records have correct disposition instructions
 2019-11-22 14:25:27 +00:00
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
82046a2f0f Back-port fix from MNT-19967 
(cherry picked from commit 4de260d588)
 2019-07-10 07:52:28 +03:00
rlucanu
8438e17a8d Reset code back to b03837b751. 2019-07-10 07:49:40 +03:00
rlucanu
a606a343b3 Revert "Record only merge of version change." 
This reverts commit 6e197f2a2d, reversing
changes made to 211244279a.
 2019-07-09 12:12:28 +03: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
cagache
7a370248a2 Sonar critical bug: inefficient use of keySet iterator instead of entrySet iterator 2019-07-03 17:30:10 +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