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
3,914 Commits 324 Branches 2,170 Tags
8f9b49b965b6bf768afc982a6948115697ff76a5
Commit Graph

3914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Aspery
8f9b49b965 RM-5115 Fixed IDE import settings following review 2017-05-10 09:27:10 +01:00
Sara Aspery
1f2a3ec2af RM-5115 Changes following review 2017-05-10 07:50:33 +01:00
Sara Aspery
7935c884c2 Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-5115_FixListCatChildrenRestAPI 2017-05-09 14:35:53 +01:00
Sara Aspery
6034a3ff60 RM-5115 Get category children REST API disposition schedule fix 2017-05-09 14:34:08 +01:00
Oana Nechiforescu
5635d72f4d 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
b6bbdc62d2 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
b146865ee9 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
ad3880a8a9 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
eef60c3711 fix the createRecordFolderWithRelativePath() test, avoid duplicate record category name 2017-05-05 15:15:06 +03:00
Ana Bozianu
c6cc54d12f Merge master into merge/RM-4612_from_2.5_to_master 2017-05-04 21:34:34 +03:00
Ana Bozianu
48bf50553c fixed onContentUpdated node not found failure 2017-05-04 16:36:58 +03:00
Rodica Sutu
c450aafb00 - minor corrections and fix for deleteInvalidNodesUnfiled() 2017-05-03 16:46:42 +03:00
Kristijan Conkas
75a384f7f5 RM-5120: Removed orderBy parameter 2017-05-02 15:48:15 +01:00
alfresco-build
ecbaac3678 [maven-release-plugin] prepare for next development iteration 2017-05-02 09:15:31 +01:00
alfresco-build
b64a12272f [maven-release-plugin] prepare release V2.5.2-EA1 2017-05-02 09:15:28 +01:00
Ana Bozianu
0c6a5ab324 Revert "[maven-release-plugin] prepare release V2.5.2-EA1" 
This reverts commit 0ae9e02e69.
 2017-05-02 10:54:12 +03:00
Ana Bozianu
fb13248f18 Revert "[maven-release-plugin] prepare for next development iteration" 
This reverts commit 33e00bb1cf.
 2017-05-02 10:53:54 +03:00
alfresco-build
33e00bb1cf [maven-release-plugin] prepare for next development iteration 2017-05-02 08:13:44 +01:00
alfresco-build
0ae9e02e69 [maven-release-plugin] prepare release V2.5.2-EA1 2017-05-02 08:13:41 +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
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