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,007 Commits 324 Branches 2,170 Tags
dcc20cbfb49b79f15255f30ff2ba978a014dd55c
Commit Graph

6007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
7ca293d815 update min version ACS version for the text context 2019-11-26 16:05:47 +02:00
Ross Gale
9806fb2f9c Merge branch 'merge-2.7/RM-7051_RecordOnly' into 'release/V2.7' 
Resolve RM-7051 "Merge 2.7/ recordonly"

See merge request records-management/records-management!1311
 2019-11-26 13:24:29 +00:00
Ross Gale
f2f49c0b5e Record only merge of version change. 2019-11-26 11:36:53 +00:00
Ross Gale
c2bf8ff202 Merge branch 'merge-2.6/RM-7051_RecordOnly' into 'release/V2.6' 
Resolve RM-7051 "Merge 2.6/ recordonly"

See merge request records-management/records-management!1310
 2019-11-26 11:28:38 +00:00
Ross Gale
26804bfffe Record only merge of version change. 2019-11-26 11:22:35 +00:00
Ross Gale
3eedbf0836 Merge branch 'merge-2.5/RM-7051_RecordOnly' into 'release/V2.5' 
Resolve RM-7051 "Merge 2.5/ recordonly"

See merge request records-management/records-management!1309
 2019-11-26 11:16:17 +00:00
Ross Gale
1214128e2b Record only merge of version change. 2019-11-26 10:38:34 +00:00
Ross Gale
72c1e02832 Merge branch 'merge-2.7/RM-7051_MergeUp' into 'release/V2.7' 
Resolve RM-7051 "Merge 2.7/ mergeup"

See merge request records-management/records-management!1308
 2019-11-26 08:43:17 +00:00
Rodica Sutu
d449052a95 replace the ARGs parameter from Dockerfile 2019-11-26 10:18:29 +02:00
Rodica Sutu
f9e1654467 update the docker dependencies on community to ACS 6.2.0.ea 2019-11-26 09:27:49 +02:00
Rodica Sutu
6b1e06f4aa replace the org.apache.commons.lang references to org.apache.commons.lang3 2019-11-26 09:11:08 +02:00
Claudia Agache
8131ed23fd 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
15a854138e 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
f3439fd917 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
18ea746491 update community dependencies to ones from ACS 6.2.0.ea 2019-11-26 08:50:32 +02:00
Ross Gale
98f0487068 Update version.properties 2019-11-25 08:35:50 +00:00
Ross Gale
cc52137795 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
2b2c0b6d55 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
5d3efcc4c4 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
705a2daaf8 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
92c8c2db21 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
1f8930b417 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
5222b0ec2d RM-7047: Link to held item from audit entry 
- addressed review suggestions
 2019-11-22 14:39:19 +02:00
Ramona Popa
cd25439cd2 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
33099b4c18 RM-7047: Link to held item from audit entry 
- changes after review
 2019-11-22 11:27:08 +02:00
Ross Gale
b6a7b93a52 Updating version number after release 2019-11-22 08:55:41 +00:00
cagache
9502502262 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-7050_LinkToHeldItemUITests 2019-11-22 09:56:23 +02:00
Claudia Agache
ae4cb95012 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
3c0a62fa81 [maven-release-plugin] prepare for next development iteration 2019-11-21 18:15:33 +00:00
alfresco-build
7fba698dd8 [maven-release-plugin] prepare release V2.5.3.3 2019-11-21 18:15:29 +00:00
Sara Aspery
43ff851167 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
6c888b3e5f 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
1001429288 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
20f46a99cf RM-7047: Link to held item from audit entry 
- consider Delete Hold as deleteObject
 2019-11-21 14:11:57 +02:00
Ross Gale
8c597c28d3 RM-7051 merge 2019-11-21 11:08:39 +00:00
Ross Gale
fbf379d6f2 RM-7051 review comments 2019-11-21 11:04:35 +00:00
Sara Aspery
056de88500 Merge branch 'master' into feature/RM-6930_DeleteHold 2019-11-21 10:07:15 +00:00
cagache
a958d37450 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-7033_AuditHoldTests_no 2019-11-21 12:04:39 +02:00
Ramona Popa
39576852eb 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
86cf1f4878 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
42e6fbdb6a Prevent unwanted audit entries appearing when updating the records 2019-11-21 13:54:09 +11:00
Ross Gale
bbadc9799e RM-7051 simplyfing sql and adding check for links 2019-11-21 01:16:37 +00:00
Ross Gale
9bf4f1d9d9 RM-7051 updating messaging 2019-11-20 13:33:35 +00:00
Ramona Popa
de2f945c8b Merge branch 'master' into feature/RM-7047_LinkToHeldItem 
* master:
 2019-11-20 14:56:11 +02:00
Chris Shields
47f4dd2598 Merge branch 'master' into feature/RM-7029_RemoveFromHold 2019-11-20 11:24:17 +00:00
Chris Shields
d8862b1ee3 Code review changes 2019-11-20 11:16:04 +00:00
cagache
0f656d721e fix test 2019-11-20 13:07:45 +02:00
Ross Gale
7d7946ea06 RM-7051 running the find records and update as system 2019-11-20 10:51:33 +00:00
cagache
f98a0fa037 removed test as per RM-7061 resolution 2019-11-20 12:19:11 +02:00
Sara Aspery
c10c31310e Merge branch 'master' into feature/RM-6930_DeleteHold 2019-11-20 09:49:29 +00:00