Commit Graph

212 Commits

Author SHA1 Message Date
Tom Page
88a3c42750 RM-5309 Merge release/V2.5 into master. 2017-07-24 18:49:10 +01:00
Ramona Popa
1eb4e09a83 RM-5309 - added behaviour bean for qshare:shared aspect and integration test 2017-07-20 11:48:10 +03:00
Sara Aspery
fb215876b8 fixing IDE whitespaces 2017-06-24 22:49:27 +01:00
Sara Aspery
80434ce57e Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-06-23 16:40:00 +01:00
Tuna Aksoy
fe44da1abe Merge branch 'feature-2.5/RM-5309_SharedFilesCannotBeClasified' into merge/20170620_RM25
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
2017-06-20 16:07:26 +01:00
Sara Aspery
57b3460b58 include_declare_record_refactoring_in_Rest 2017-06-20 11:12:22 +01:00
Sara Aspery
15b1bc41cd Revert "Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI"
This reverts commit 6ff9179588, reversing
changes made to 75b35cdcd7.
2017-06-20 08:27:09 +01:00
Ramona Popa
15e308a547 RM-5309 - Added integration test for the case: when a record is declared, the shared link is removed 2017-06-19 17:46:34 +03:00
Tuna Aksoy
21c881593a Move the code for completing a record from DeclareRecordAction to RecordServiceImpl 2017-06-14 19:38:45 +01:00
Tuna Aksoy
f479000e61 Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into 'release/V2.5'
Feature 2.5/rm 5175 complete record missing metadata

See merge request !324
2017-06-12 21:42:17 +01:00
Tuna Aksoy
f4cdbf12e1 Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into merge/RM_25
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
2017-06-12 20:42:51 +01:00
Sara Aspery
09e3766230 RM-5175_Complete_record_with_missing_metadata changes after review 2017-06-12 16:42:05 +01:00
Tuna Aksoy
1712bac995 RM-4689 (Can delete all RM site content through Repository browser)
Manually backported following changes:

RM-4293
734c1b2a82

RM-4326
a4aac053a8
c6ca74ab26
2017-06-12 16:17:24 +01:00
Sara Aspery
d98d3e9c69 RM-5175_Complete_record_with_missing_metadata 2017-06-10 23:50:15 +01:00
Sara Aspery
a7fddef34b RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:21:49 +01:00
Ana Bozianu
18c7b07d8b Merge RM-5180 from 2.5 into master 2017-05-29 13:10:48 +03:00
Ana Bozianu
fe11ba2df7 RM-5180 - record rejection implementation and integration test 2017-05-25 18:53:15 +03:00
Ana Bozianu
98b10e616f RM-5012 - fix unit tests and cleanedup merge request 2017-05-17 16:04:54 +03:00
Ana Bozianu
eebecbb349 RM-5012 - make record on first event and add identifier on commit or on record complete 2017-05-17 12:58:50 +03:00
Ana Bozianu
d17121ff2c RM-5012 - fix write records created in current transaction 2017-05-16 15:53:29 +03:00
Ana Bozianu
49119d6d3b RM-5012 - fix integration test 2017-05-15 23:57:05 +03:00
Ana Bozianu
5988185459 RM-5012 - fix record folder children - 2 2017-05-15 23:31:42 +03:00
Ana Bozianu
edcd6f482f RM-5012 - fix some tests 2017-05-15 22:34:09 +03:00
Ana Bozianu
f971c80a37 RM-5012 - fixed custom identifier issue 2017-05-12 18:54:31 +03:00
Ana Bozianu
29b0dde8e0 RM-5012 - fixed tests 2017-04-29 12:57:29 +03:00
Ana Bozianu
447dcb800e Revert "Merge branch 'feature/RM-4572_CreateRecordResponseContainsWrongName' into 'master' "
This reverts commit f04022c036, reversing
changes made to 86cd35e0d4.
2017-04-28 16:57:03 +03:00
Ramona Popa
da6fcfc1b5 RM-4926 - added onRemoveAspect policy for RecordAspect 2017-04-28 13:07:22 +01:00
Ramona Popa
d52f479bc5 Merge branch 'release/V2.5' 2017-04-25 11:25:04 +03:00
Ramona Popa
5b6b6e6b43 RM-4611 - missed some formatting 2017-04-21 11:51:57 +03:00
Ramona Popa
fff3b68f39 RM-4611 - removed some debug infos 2017-04-21 11:41:41 +03:00
Ramona Popa
c58a74a27b RM-4611 - modified integration test after review 2017-04-21 11:33:12 +03:00
Ramona Popa
d809cb7879 RM-4611 - Add policy notification implementation and integration test 2017-04-13 17:18:08 +03:00
Tuna Aksoy
b71dfcb3c7 Merge branch 'release/V2.5' into merge/Merge_2332_2396
Conflicts:
	rm-automation/src/test/resources/module.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
2017-03-15 22:17:52 +00:00
Tuna Aksoy
5b7fbc5aa6 Merge branch 'release/V2.4' into merge-2.5/Merge_2332_2396 2017-03-15 16:38:37 +00:00
Tuna Aksoy
e60831a596 Excluded system test from the test suite. 2017-03-15 16:35:22 +00:00
Ana Bozianu
3c045e39ed Merge release/V2.5 into master 2017-03-15 17:59:21 +02:00
Tuna Aksoy
0e6fa39e51 RM-4804_Transfer_Completed_Records 2017-03-15 13:17:38 +00:00
Ana Bozianu
9b513b98d7 Merge merge-2.5 into master 2017-03-15 13:17:37 +02:00
Ana Bozianu
adfe76c1a2 Merge release/V2.4 into release/V2.5 2017-03-15 13:05:23 +02:00
Ana Bozianu
793deafcba RM-3265 - added integration test for moving a closed folder 2017-03-13 18:20:39 +02:00
Silviu Dinuta
fab6cdfe9b RM-4163: added integration test for scenario provided by Roy and got the
fix from master
2017-03-09 16:27:50 +02:00
Ana Bozianu
1b366d5dae Revert "Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion""
This reverts commit 98bce296d2.
2017-03-01 21:32:00 +02:00
Ana Bozianu
98bce296d2 Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion"
This reverts commit 2e39b26c6a.
2017-03-01 20:46:22 +02:00
Ana Bozianu
2e39b26c6a RM-4619 - add the rm search aspect when a record folder is created via conversion 2017-02-27 20:11:01 +02:00
Ana Bozianu
0b81dd90d6 RM-4619 - after doing the automated conversion the record component identifier is editable 2017-02-27 17:51:16 +02:00
Ana Bozianu
92fa327f1e RM-4619 - updated unit tests 2017-02-27 16:17:22 +02:00
Ana Bozianu
f04022c036 Merge branch 'feature/RM-4572_CreateRecordResponseContainsWrongName' into 'master'
Feature/rm 4572 create record response contains wrong name

See merge request !12
2017-02-07 14:53:36 +00:00
Ana Bozianu
539a0a6265 RM-4619 - replaced unit tests with integration tests 2017-02-07 16:24:10 +02:00
Ana Bozianu
7bf586630c RM-4572 - removed records id set in test as it is already set in a behavior 2017-01-06 12:13:14 +02:00
Tuna Aksoy
4462899fb1 RM-4570 (Update license headers) 2017-01-02 19:45:32 +00:00