Commit Graph

3912 Commits

Author SHA1 Message Date
Ramona Popa
227276a24e Merge branch 'feature/RM-5116_autoRenameOnRestAPI' into 'master'
RM-5116 - added support for autoRename parameter

See merge request !259
2017-05-10 12:05:55 +01:00
Ramona Popa
0e39334a19 RM-5116 - added support for autoRename parameter 2017-05-10 12:05:54 +01:00
Oana Nechiforescu
d9ca68300e Merge branch 'merge/Merge25AddRMSearchContainersCheck' into 'master'
Merge/merge25 add rm search containers check

See merge request !262
2017-05-08 16:00:24 +01:00
Rodica Sutu
5dce51b84e Merge branch 'feature/RM-5119_FixDeleteInvalidNodesUnfiled' into 'master'
feature/RM-5119_FixDeleteInvalidNodesUnfiled

See merge request !252
2017-05-08 15:33:30 +01:00
Oana Nechiforescu
58846b6e8a Merge branch 'master' of https://git.alfresco.com/records-management/records-management into merge/Merge25AddRMSearchContainersCheck 2017-05-08 11:53:15 +03:00
Oana Nechiforescu
d8b85b24c9 Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge25AddRMSearchContainersCheck
# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/page/SharePage.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/TestData.java
2017-05-07 23:35:58 +03:00
Rodica Sutu
066add969c fix the createRecordFolderWithRelativePath() test, avoid duplicate record category name 2017-05-05 15:15:06 +03:00
Ana Bozianu
18a15d39be Merge master into merge/RM-4612_from_2.5_to_master 2017-05-04 21:34:34 +03:00
Ana Bozianu
83bd318948 fixed onContentUpdated node not found failure 2017-05-04 16:36:58 +03:00
Rodica Sutu
05b43fb770 - minor corrections and fix for deleteInvalidNodesUnfiled() 2017-05-03 16:46:42 +03:00
Kristijan Conkas
dd89f9864c RM-5120: Removed orderBy parameter 2017-05-02 15:48:15 +01:00
alfresco-build
6b1a0e4615 [maven-release-plugin] prepare for next development iteration 2017-05-02 09:15:31 +01:00
alfresco-build
19c5b09535 [maven-release-plugin] prepare release V2.5.2-EA1 ags-2.5.2-EA1 2017-05-02 09:15:28 +01:00
Ana Bozianu
b493bb6662 Revert "[maven-release-plugin] prepare release V2.5.2-EA1"
This reverts commit ccc117ed50.
2017-05-02 10:54:12 +03:00
Ana Bozianu
0dea341e0b Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 6ac173c85e.
2017-05-02 10:53:54 +03:00
alfresco-build
6ac173c85e [maven-release-plugin] prepare for next development iteration 2017-05-02 08:13:44 +01:00
alfresco-build
ccc117ed50 [maven-release-plugin] prepare release V2.5.2-EA1 2017-05-02 08:13:41 +01:00
Rodica Sutu
cbc7658de3 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
Rodica Sutu
8a231f2634 - add some extra checks to catch existing issues 2017-04-28 15:43:16 +03:00
Rodica Sutu
9ffd5f8ff7 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
858224064d 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
da6fcfc1b5 RM-4926 - added onRemoveAspect policy for RecordAspect 2017-04-28 13:07:22 +01:00
Rodica Sutu
e439f8d14b review updates 2017-04-28 12:43:55 +03:00
Rodica Sutu
cf96210824 - 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
d52f479bc5 Merge branch 'release/V2.5' 2017-04-25 11:25:04 +03:00
Tom Page
3e7f89a40d Merge release/V2.5 into master.
Merge of localisation changes from V2.5.
2017-04-25 07:56:19 +01:00
Tom Page
b255247659 Record-only merge release/V2.5 into master. 2017-04-25 07:54:50 +01:00
Oana Nechiforescu
5422c8eee9 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
2118319134 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
dee2610acb Merge branch 'release/V2.5' into feature-2.5/RM-4985_AddPolicyNotificationRecordDeclaration 2017-04-21 11:57:02 +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
gbroadbent
6e284bb3de FRENCH: Updated bundles based on EN rev2017-04-11. Fix for RM-4839 2017-04-21 09:26:13 +01:00
Tom Page
14932dfcc4 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
fa19f48bb6 RM-4952 Merge master into RM-4952_ReadOnlyParams. 2017-04-20 15:06:05 +01:00
Oana Nechiforescu
74d14d277c Merge remote-tracking branch 'origin/master' into feature/RM-4950Tests 2017-04-18 16:37:31 +03:00
Tom Page
fd91e8442f Record-only merge release/V2.4 into release/V2.5. 2017-04-18 10:26:40 +01:00
Tom Page
928235c72e Record-only merge release/V2.4.0.x into release/V2.4. 2017-04-18 10:25:35 +01:00
Tom Page
2d0775a588 Record-only merge release/V2.3 into release/V2.4. 2017-04-18 10:25:04 +01:00
Tom Page
a73d7d461b 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
adda202a88 Record-only merge release/V2.3.1.x into release/V2.3. 2017-04-18 08:13:23 +01:00
Tuna Aksoy
f105bd66c1 Merge branch 'release/V2.5' 2017-04-17 22:22:25 +01:00
Tuna Aksoy
a12f4af083 (Record only) Merge branch 'release/V2.4' into release/V2.5 2017-04-17 22:21:23 +01:00
alfresco-build
1a47c4c44c [maven-release-plugin] prepare for next development iteration 2017-04-17 19:48:35 +01:00
alfresco-build
e4fb71bfdb [maven-release-plugin] prepare release V2.4.1 ags-2.4.1 2017-04-17 19:48:32 +01:00
Tuna Aksoy
84098315fc 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
4daf95adc7 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
4e03515e83 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
b7f360216e Merge branch 'release/V2.4' into release/V2.5 2017-04-13 17:38:59 +01:00