Commit Graph

3908 Commits

Author SHA1 Message Date
Ana Bozianu
988f3d51a2 Merge feature/RM-4921_ExceptionsDoneOnTransactionCommit into feature/RM-5012_recordIdentifier 2017-05-08 17:40:28 +03:00
Ana Bozianu
ee75a3ac56 RM-4921 - fix upload file to record folder and failing tests 2017-05-08 16:03:51 +03:00
Ana Bozianu
e4af351e43 Merge feature/RM-4921_ExceptionsDoneOnTransactionCommit into feature/RM-5012_recordIdentifier 2017-05-08 11:11:22 +03:00
Ana Bozianu
24c2f294bb RM-4921 - enforce new transaction 2017-05-08 10:50:40 +03:00
Ana Bozianu
ae37cd4d82 Merge feature/RM-4921_ExceptionsDoneOnTransactionCommit into feature/RM-5012_recordIdentifier 2017-05-04 18:43:51 +03:00
Ramona Popa
7352c1fae0 RM-4921 - use retrying transaction for all write operations: create and update 2017-05-04 18:22:56 +03:00
Ana Bozianu
b59311de99 Merge 'feature/RM-4921_ExceptionsDoneOnTransactionCommit' into feature/RM-5012_recordIdentifier 2017-05-03 22:16:53 +03:00
Ramona Popa
84a770d289 RM-4921 - use retrying transaction for creating record category children 2017-05-03 18:06:27 +03:00
Ana Bozianu
c9cf76e744 RM-5012 - added extra check to not add identifier twice 2017-05-03 17:17:18 +03:00
Ana Bozianu
8ed8510ada RM-5012 - remove id_is_temporarily_editable flag 2017-05-03 15:34:50 +03:00
Kristijan Conkas
75a384f7f5 RM-5120: Removed orderBy parameter 2017-05-02 15:48:15 +01:00
Rodica Sutu
56c8ba1293 Merge branch 'feature/RM-4976_ReviewTests_After_Refactoring' into 'master'
RM-4976_ReviewTests_After_Refactoring

See merge request !243
2017-05-01 19:53:58 +01:00
Ana Bozianu
ec580a1db4 RM-5012 - fixed tests 2017-04-29 12:57:29 +03:00
Ana Bozianu
aef81630b6 Revert "Merge branch 'feature/RM-4572_CreateRecordResponseContainsWrongName' into 'master' "
This reverts commit a0710a379a, reversing
changes made to 7c4ead5bdf.
2017-04-28 16:57:03 +03:00
Rodica Sutu
03298bff63 - add some extra checks to catch existing issues 2017-04-28 15:43:16 +03:00
Rodica Sutu
d4666d5b82 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-4976_ReviewTests_After_Refactoring
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/UpdateRecordsTests.java
2017-04-28 15:29:36 +03:00
Ramona Popa
0b7e47fc4b Merge branch 'feature/RM-4926_RMRelatedAspectsCanBeRemoved' into 'master'
RM-4926 - added onRemoveAspect policy for RecordAspect

See merge request !237
2017-04-28 13:07:22 +01:00
Ramona Popa
dba85373ab RM-4926 - added onRemoveAspect policy for RecordAspect 2017-04-28 13:07:22 +01:00
Rodica Sutu
3cd0f4ba13 review updates 2017-04-28 12:43:55 +03:00
Rodica Sutu
977628d42c - group the tests according to structure of the api
- add new tests
- update existing ones
2017-04-28 11:08:18 +03:00
Ramona Popa
f5decace91 Merge branch 'release/V2.5' 2017-04-25 11:25:04 +03:00
Tom Page
d299dffa34 Merge release/V2.5 into master.
Merge of localisation changes from V2.5.
2017-04-25 07:56:19 +01:00
Tom Page
80767e681b Record-only merge release/V2.5 into master. 2017-04-25 07:54:50 +01:00
Oana Nechiforescu
8c1e90cb32 Merge branch 'feature/RM-4950Tests' into 'master'
Feature/rm 4950 tests

See merge request !231
2017-04-24 09:38:08 +01:00
Tom Page
8bb103ffa1 Merge branch 'feature/RM-4952_ReadOnlyParams' into 'master'
Feature/rm 4952 read only params

See merge request !226
2017-04-21 13:24:09 +01:00
Ramona Popa
03bb1295c8 Merge branch 'release/V2.5' into feature-2.5/RM-4985_AddPolicyNotificationRecordDeclaration 2017-04-21 11:57:02 +03:00
Ramona Popa
3ea1cad6dd RM-4611 - missed some formatting 2017-04-21 11:51:57 +03:00
Ramona Popa
cec0f84cce RM-4611 - removed some debug infos 2017-04-21 11:41:41 +03:00
Ramona Popa
7d23f57a60 RM-4611 - modified integration test after review 2017-04-21 11:33:12 +03:00
gbroadbent
53507e8626 FRENCH: Updated bundles based on EN rev2017-04-11. Fix for RM-4839 2017-04-21 09:26:13 +01:00
Tom Page
e272a5e003 Increase travis_wait to thirty minutes.
Our community build takes around about twenty minutes, and so was failing
occasionally with a time out.

Mirrored from community commit 3db1cda372c5824ca172002810b030f8fdc12860
2017-04-21 07:52:12 +01:00
Tom Page
3940944e8d RM-4952 Merge master into RM-4952_ReadOnlyParams. 2017-04-20 15:06:05 +01:00
Oana Nechiforescu
5775bfad54 Merge remote-tracking branch 'origin/master' into feature/RM-4950Tests 2017-04-18 16:37:31 +03:00
Tom Page
7b654197fb Record-only merge release/V2.4 into release/V2.5. 2017-04-18 10:26:40 +01:00
Tom Page
3f25832d50 Record-only merge release/V2.4.0.x into release/V2.4. 2017-04-18 10:25:35 +01:00
Tom Page
c4e81b2f46 Record-only merge release/V2.3 into release/V2.4. 2017-04-18 10:25:04 +01:00
Tom Page
0ad61203f8 RM-4952 Add automation test for this bug.
Also remove setters from POJOs (and replace with builders where necessary).
2017-04-18 09:46:45 +01:00
Tom Page
d231772e75 Record-only merge release/V2.3.1.x into release/V2.3. 2017-04-18 08:13:23 +01:00
Tuna Aksoy
2ff30a8f2d Merge branch 'release/V2.5' 2017-04-17 22:22:25 +01:00
Tuna Aksoy
622b8874fa (Record only) Merge branch 'release/V2.4' into release/V2.5 2017-04-17 22:21:23 +01:00
alfresco-build
b76769d2b4 [maven-release-plugin] prepare for next development iteration 2017-04-17 19:48:35 +01:00
alfresco-build
548e19e159 [maven-release-plugin] prepare release V2.4.1 2017-04-17 19:48:32 +01:00
Tuna Aksoy
9c817c9f92 Merge branch 'merge/merge_release_v25_14042017_2' into 'master'
Merge/merge release v25 14042017 2

See merge request !225
2017-04-15 19:58:49 +01:00
Tuna Aksoy
e8e24f40d2 Merge branch 'release/V2.5' into merge/merge_release_v25_14042017_2
Conflicts:
	rm-automation/pom.xml
2017-04-14 23:56:00 +01:00
Oana Nechiforescu
fede2c1b73 Merge branch 'feature/RM-4946MoveAPIs' into 'master'
Feature/rm 4946 move apis

See merge request !204
2017-04-14 07:40:48 +01:00
Tuna Aksoy
6a340b0651 Merge branch 'release/V2.4' into release/V2.5 2017-04-13 17:38:59 +01:00
Tom Page
5a67660ffc Merge branch 'feature-2.4/RM-5013_VitalRecordPreventsAccess' into 'release/V2.4.0.x'
RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'"

See merge request !218
2017-04-13 15:45:59 +01:00
Ramona Popa
c43f014845 RM-4611 - Add policy notification implementation and integration test 2017-04-13 17:18:08 +03:00
Tom Page
dfddbe840e Update version to 2.3.1.2-SNAPSHOT. 2017-04-13 14:47:41 +01:00
Tom Page
daffe519a0 Update version to 2.3.1.1. 2017-04-13 14:11:51 +01:00