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
6,147 Commits 324 Branches 2,170 Tags
dac7a8bcf816d1271d88ea065733cb11a0019bcc
Commit Graph

6147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
5ccea06272 replace the org.apache.commons.lang references to org.apache.commons.lang3 2019-11-26 09:11:08 +02:00
Claudia Agache
486cffb939 Merge branch 'feature/RM-7050_LinkToHeldItemUITests' into 'master' 
RM-7050 Link to Held items UI Tests

Closes RM-7050

See merge request records-management/records-management!1302
 2019-11-26 07:01:34 +00:00
Ramona Popa
4d08521b41 Merge branch 'feature/RM-7047_LinkToHeldItem' into 'master' 
RM-7047: Link to held item from audit entry

Closes RM-7047

See merge request records-management/records-management!1300
 2019-11-26 07:00:28 +00:00
Ramona Popa
58280bc323 RM-7047: Link to held item from audit entry 
- added support for link to held items in audit
   - changed style class for existing links in audit entry
 2019-11-26 07:00:28 +00:00
Rodica Sutu
54d0d7f7f8 update community dependencies to ones from ACS 6.2.0.ea 2019-11-26 08:50:32 +02:00
Ross Gale
813ed3ced6 Update version.properties 2019-11-25 08:35:50 +00:00
Ross Gale
3937379587 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
93f3458498 Merge branch 'merge-2.6/RM-7051_mergeUp' into 'release/V2.6' 
Resolve RM-7051 "Merge 2.6/ mergeup"

See merge request records-management/records-management!1306
 2019-11-22 18:15:24 +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
0fb8c59172 Merge branch 'merge-2.5/RM-7051_mergeUp' into 'release/V2.5' 
Resolve RM-7051 "Merge 2.5/ mergeup"

See merge request records-management/records-management!1305
 2019-11-22 14:25:27 +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
d61a01bca4 Merge remote-tracking branch 'remotes/origin/feature/RM-7047_LinkToHeldItem' into feature/RM-7050_LinkToHeldItemUITests 2019-11-22 15:55:24 +02:00
Ramona Popa
7f89f150e7 RM-7047: Link to held item from audit entry 
- addressed review suggestions
 2019-11-22 14:39:19 +02:00
Ramona Popa
c1a8ff0b43 Merge branch 'master' into feature/RM-7047_LinkToHeldItem 
* master:
  fix test
  removed test as per RM-7061 resolution
  small fixes
  RM-6930 another review update, correct typo in existing message
  RM-6930 review updates
  RM-6930 review updates
  Code review comments (check node path for add to hold and remove from hold audit entries)
  Code review comments
  Delete hold using RM Actions API
  Changed the audited node
  replaced the todos
  Sonar: Format specifiers should be used instead of string concatenation. Sonar: Replace the type specification in this constructor call with the diamond operator ("<>")
  removed unused imports
  Refactored audit tests and holds api
  update method names
  RM-7033 Automate tests for Audit create, delete, add to, and remove from holds
  removed duplicate methods
  RM-6930 adding permissions check for active content in holds defore deletion
 2019-11-22 11:27:26 +02:00
Ramona Popa
cc1a6f1971 RM-7047: Link to held item from audit entry 
- changes after review
 2019-11-22 11:27:08 +02:00
Ross Gale
12aa2c4616 Updating version number after release 2019-11-22 08:55:41 +00:00
cagache
639e7f33dc Merge remote-tracking branch 'remotes/origin/master' into feature/RM-7050_LinkToHeldItemUITests 2019-11-22 09:56:23 +02:00
Claudia Agache
f956f97cbb Merge branch 'feature/RM-7033_AuditHoldTests_no' into 'master' 
RM-7033 Audit hold tests

See merge request records-management/records-management!1294
 2019-11-22 06:17:59 +00:00
alfresco-build
eaca05e4b6 [maven-release-plugin] prepare for next development iteration 2019-11-21 18:15:33 +00:00
alfresco-build
79de26057c [maven-release-plugin] prepare release V2.5.3.3 ags-2.5.3.3 2019-11-21 18:15:29 +00:00
Sara Aspery
150f2e1587 Merge branch 'feature/RM-6930_DeleteHold' into 'master' 
RM-6930 adding permissions check for active content in holds defore deletion

Closes RM-6930

See merge request records-management/records-management!1286
 2019-11-21 16:09:49 +00:00
cagache
a427eb6423 Merge remote-tracking branch 'remotes/origin/feature/RM-7047_LinkToHeldItem' into feature/RM-7050_LinkToHeldItemUITests 2019-11-21 16:32:38 +02:00
Ross Gale
e0dd0ca886 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
 2019-11-21 14:32:24 +00:00
Ramona Popa
bc7caea25c RM-7047: Link to held item from audit entry 
- consider Delete Hold as deleteObject
 2019-11-21 14:11:57 +02:00
Ross Gale
8f42f0caf0 RM-7051 merge 2019-11-21 11:08:39 +00:00
Ross Gale
9e4586b699 RM-7051 review comments 2019-11-21 11:04:35 +00:00
Sara Aspery
c6302fd034 Merge branch 'master' into feature/RM-6930_DeleteHold 2019-11-21 10:07:15 +00:00
cagache
f75e6eedda Merge remote-tracking branch 'remotes/origin/master' into feature/RM-7033_AuditHoldTests_no 2019-11-21 12:04:39 +02:00
Ramona Popa
d98d5538d0 Merge branch 'master' into feature/RM-7047_LinkToHeldItem 
* master:
  Code review changes
  Code review changes
 2019-11-21 12:01:52 +02:00
Christopher Shields
dfaff93661 Merge branch 'feature/RM-7029_RemoveFromHold' into 'master' 
Resolve RM-7029 "Feature/ removefromhold"

Closes RM-7029

See merge request records-management/records-management!1304
 2019-11-21 09:52:41 +00:00
Roy Wetherall
347a2ef9db Prevent unwanted audit entries appearing when updating the records 2019-11-21 13:54:09 +11:00
Ross Gale
022647d84b RM-7051 simplyfing sql and adding check for links 2019-11-21 01:16:37 +00:00
Ross Gale
9099444e2d RM-7051 updating messaging 2019-11-20 13:33:35 +00:00
Ramona Popa
f94b580dc9 Merge branch 'master' into feature/RM-7047_LinkToHeldItem 
* master:
 2019-11-20 14:56:11 +02:00
Chris Shields
5d08fcf1d4 Merge branch 'master' into feature/RM-7029_RemoveFromHold 2019-11-20 11:24:17 +00:00
Chris Shields
0b3f1c793d Code review changes 2019-11-20 11:16:04 +00:00
cagache
710e738f16 fix test 2019-11-20 13:07:45 +02:00
Ross Gale
9c1904db77 RM-7051 running the find records and update as system 2019-11-20 10:51:33 +00:00
cagache
b059e96fac removed test as per RM-7061 resolution 2019-11-20 12:19:11 +02:00
Sara Aspery
6cec2bb099 Merge branch 'master' into feature/RM-6930_DeleteHold 2019-11-20 09:49:29 +00:00
cagache
4fd762ff43 small fixes 2019-11-20 11:24:21 +02:00
cagache
1b0b871fa3 Merge remote-tracking branch 'remotes/origin/feature/RM-7029_RemoveFromHold' into feature/RM-7033_AuditHoldTests_no 2019-11-20 08:38:25 +02:00
cagache
92b88491e5 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-7033_AuditHoldTests_no 2019-11-20 08:37:52 +02:00
Chris Shields
bc5c5bd51d Code review changes 2019-11-19 21:11:50 +00:00
Sara Aspery
00c7f87779 Merge branch 'feature/RM-7028_Add_Add_To_Hold_ToAudit' into 'master' 
RM-7028 Audit add to hold

Closes RM-7028

See merge request records-management/records-management!1296
 2019-11-19 18:21:37 +00:00
Ross Gale
cdf1118b29 RM-7051 removing previous sql code 2019-11-19 16:20:39 +00:00
Ross Gale
364ee7838a RM-7051 removing patch code updating webscript 2019-11-19 13:38:40 +00:00
Chris Shields
4a89c38f2d Merge branch 'feature/RM-7028_Add_Add_To_Hold_ToAudit' into feature/RM-7029_RemoveFromHold 2019-11-19 12:14:04 +00:00
Chris Shields
ad963bb24e RM-7029 Audit remove from hold 2019-11-19 12:05:06 +00:00
Sara Aspery
8140859d03 RM-7028 review updates 2019-11-19 11:15:45 +00:00