inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,805 Commits 335 Branches 2,191 Tags
40c78dc29865544c2da5b51a48d9c00f24e1229b
Commit Graph

6805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Smith
c96de1018d Merge branch 'master' into feature/RM-4613_Select_Single_Instruction 2017-08-01 13:58:30 +01:00
Richard Smith
854706d0c3 Merge branch 'master' into feature/RM-5332_Classification_Topic_Picker_Automation_sm 2017-08-01 09:25:21 +01:00
Rodica Sutu
fbe2e3dae3 Merge branch 'merge/RM-5308_TestForShareRecordsViaAPI' into 'master' 
Merge/rm 5308 test for share records via api

See merge request !415
 2017-07-27 15:13:31 +01:00
Rodica Sutu
39e2df3a68 Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge/RM-5308_TestForShareRecordsViaAPI 
# Conflicts:
#	rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
 2017-07-27 09:36:48 +03:00
Richard Smith
de4a73c225 Merge branch 'master' into feature/RM-4613_Select_Single_Instruction 2017-07-26 10:30:02 +01:00
Tom Page
c659cc8b4f Merge branch 'merge/MNT-18082_V2.5.0.4' into 'master' 
Merge/mnt 18082 v2.5.0.4

See merge request !409
 2017-07-25 13:44:11 +01:00
Tom Page
b0eab6c382 Merge branch 'merge/RM-5309_PreventSharingRecords' into 'master' 
Merge/rm 5309 prevent sharing records

See merge request !399
 2017-07-25 13:43:03 +01:00
Richard Smith
93f8f20ca8 Merge branch 'master' into feature/RM-4613_Select_Single_Instruction 2017-07-25 09:07:18 +01:00
Tom Page
9968be71d0 Merge branch 'merge/MNT-18083_SearchPerformance' into 'master' 
Merge/mnt 18083 search performance

See merge request !398
 2017-07-25 08:12:52 +01:00
Tom Page
d16343e480 MNT-18082 Merge release/V2.5 into master. 2017-07-24 18:55:49 +01:00
Tom Page
3bdbee6a01 RM-5309 Merge release/V2.5 into master. 2017-07-24 18:49:10 +01:00
Tom Page
a89fbdede0 MNT-18083 Merge release/V2.5 into master. 2017-07-24 18:45:44 +01:00
Tom Page
a808a4a213 Merge branch 'merge-2.5/Fix250xTests' into 'release/V2.5' 
Merge 2.5/fix250x tests

See merge request !397
 2017-07-24 18:38:18 +01:00
Tom Page
f4ae56f84b Merge branch 'merge-2.5/MNT-18082_HotFixV2.5.0.4' into 'release/V2.5' 
Merge 2.5/mnt 18082 hot fix v2.5.0.4

See merge request !389
 2017-07-24 18:37:32 +01:00
Tom Page
dc18563bf7 Merge branch 'feature/RM-5420_RefactorRestAPIModel_cg' into 'master' 
Feature/rm 5420 refactor rest api model cg

See merge request !391
 2017-07-24 18:23:03 +01:00
Tom Page
96ee22624b RM-5420 Code review fixes including move toIndentedString into a helper method. 2017-07-24 15:53:35 +01:00
Ramona Popa
139f1ed1df Merge branch 'feature-2.5/RM-5308_ShareRecordsViaWebscript' into 'release/V2.5' 
RM-5308 - added behaviour bean for qshare:shared aspect and integration test

See merge request !392
 2017-07-20 16:27:10 +01:00
Ramona Popa
c3a3136fb4 RM-5309 - added behaviour bean for qshare:shared aspect and integration test 2017-07-20 11:48:10 +03:00
Tom Page
0a58d8bc6b Merge merge-2.5/MNT-18082_HotFixV2.5.0.4 into merge-2.5/Fix250xTests. 2017-07-19 09:04:42 +01:00
Tom Page
a7c69d4c11 Merge release/V2.5 into merge-2.5/MNT-18082_HotFixV2.5.0.4. 2017-07-19 09:00:28 +01:00
Tom Page
250ae1e9db Merge branch 'merge-2.5/MNT-18083_SearchPerformance' into 'release/V2.5' 
Merge 2.5/mnt 18083 search performance

See merge request !373
 2017-07-19 08:39:44 +01:00
Tom Page
9b077c503b Merge release/V2.5.0.x into release/V2.5. 
Record-only merge of changes to get UI tests to pass (actually this makes
one small change to remove an unused import).
 2017-07-18 13:51:32 +01:00
Tom Page
7cc058b561 Merge release/V2.5.0.x into release/V2.5. 
Merge changes needed for release of V2.5.0.4.
 2017-07-18 13:31:45 +01:00
Andy Healey
dd4ac354b4 Merge branch 'feature/UAreview_2.6_newstrings' into 'master' 
Feature/uareview 2.6 newstrings

See merge request !386
 2017-07-13 10:55:48 +01:00
Andy Healey
5cc758a274 Update action-service.properties 2017-07-13 09:31:56 +01:00
Andy Healey
816705a840 DOCS-3531 - Update records-management-service.properties 2017-07-12 14:35:09 +01:00
Andy Healey
22f098ed35 DOCS-3531 - Update action-service.properties 2017-07-12 14:33:22 +01:00
Richard Smith
0d72d21701 Merge branch 'master' into feature/RM-4613_Select_Single_Instruction 2017-07-11 10:06:39 +01:00
Tuna Aksoy
e6837bc2ef (Record only) Merge branch 'release/V2.5' 
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-community/pom.xml
#	rm-community/rm-community-repo/pom.xml
#	rm-community/rm-community-share/pom.xml
#	rm-enterprise/pom.xml
#	rm-enterprise/rm-enterprise-repo/pom.xml
#	rm-enterprise/rm-enterprise-share/pom.xml
 2017-07-10 16:56:11 +01:00
Tuna Aksoy
9e832df5ec RM-5345: Fixed review comments (cherry picked from commit 16ead6e) 
RM-5346: Null pointers should not be dereferenced (cherry picked from commit 2220fd8)
 2017-07-10 16:47:44 +01:00
Richard Smith
51b0db46c3 Merge branch 'master' into feature/RM-4613_Select_Single_Instruction 2017-07-10 14:28:31 +01:00
alfresco-build
77edc9f3fe [maven-release-plugin] prepare for next development iteration 2017-07-10 14:21:19 +01:00
alfresco-build
23a51d64e6 [maven-release-plugin] prepare release V2.5.2 2017-07-10 14:21:16 +01:00
Tuna Aksoy
b6150e1aa2 Merge branch 'merge/RM25_20170709' into 'master' 
Merge/rm25 20170709

See merge request !384
 2017-07-10 13:36:13 +01:00
Richard Smith
f95e454fc0 RM-4613 Further updates 2017-07-10 10:38:42 +01:00
Oana Nechiforescu
6366ebad96 Merge branch 'hotfix-2.5/RM-5369FixInviteUsersTestMethod' into 'release/V2.5.0.x' 
Hotfix 2.5/rm 5369 fix invite users test method

See merge request !382
 2017-07-10 08:30:10 +01:00
Tuna Aksoy
2e78ed572a Merge branch 'feature-2.5/RM-5359_integration_test' into merge/RM25_20170709 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-authorities-SqlMap.xml
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-common-SqlMap.xml
 2017-07-09 18:41:25 +01:00
Rodica Sutu
caec7c3006 Merge branch 'feature-2.4/RM-4835_UpdateInviteUsersMethod' into 'release/V2.4' 
Feature 2.4/rm 4835 update invite users method

See merge request !117
 2017-07-07 15:50:20 +03:00
alfresco-build
ebd7d53b59 [maven-release-plugin] prepare for next development iteration 2017-07-03 12:15:19 +01:00
alfresco-build
aa45d64290 [maven-release-plugin] prepare release V2.5.0.4 2017-07-03 12:15:16 +01:00
Tuna Aksoy
83db97a5e3 RM-5359 (An admin user can't declare as record a secured file) 2017-06-30 17:22:38 +01:00
Tuna Aksoy
a206c1e95e Merge branch 'feature/RM-5345_Fix_security_issues' into 'master' 
Feature/rm 5345 fix security issues

See merge request !374
 2017-06-30 15:45:29 +01:00
Tuna Aksoy
3e76025ee5 Merge branch 'merge/RM_25_2017_07_28' into 'master' 
Merge/rm 25 2017 07 28

See merge request !376
 2017-06-28 17:28:17 +01:00
Tuna Aksoy
16ead6e811 RM-5345: Fixed review comments 2017-06-28 16:03:38 +01:00
Tuna Aksoy
14dbe100cf Merge branch 'release/V2.5' into merge/RM_25_2017_07_28 2017-06-28 14:36:45 +01:00
Sara Aspery
5afc93fbbf Merge branch 'feature/RM-4431_LatestCompleteRecordChanges' into 'master' 
Feature/rm 4431 latest complete record changes

See merge request !371
 2017-06-28 14:08:16 +01:00
Tuna Aksoy
965539d8f2 RM-5347: Resources should be closed 2017-06-27 16:52:51 +01:00
Tuna Aksoy
2220fd889e RM-5346: Null pointers should not be dereferenced 2017-06-27 16:35:51 +01:00
Tom Page
082ec147f7 MNT-18083 Merge release/V2.5.0.x into release/V2.5. 2017-06-27 16:24:40 +01:00
alfresco-build
c1f5ca99a4 [maven-release-plugin] prepare for next development iteration 2017-06-27 16:01:03 +01:00