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,912 Commits 324 Branches 2,170 Tags
227276a24e28c5daacd555055db889600dd6ec2c
Commit Graph

3912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Smith
05d5fbf73e Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-16 16:40:41 +00:00
Tuna Aksoy
ecc5ac590a Merge branch 'merge/Merge_2332_2396' into 'master' 
Merge/merge 2332 2396

See merge request !140
 2017-03-16 08:03:04 +00: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
d290a7c170 Merge branch 'merge-2.5/Merge_2332_2396' into 'release/V2.5' 
Merge 2.5/merge 2332 2396

See merge request !139
 2017-03-15 21:54:29 +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
Tuna Aksoy
343cc06f7a Merge branch 'feature-2.4/RM-2396_Record_upload_failure_via_webdav' into release/V2.4 2017-03-15 16:28:38 +00:00
Ana Bozianu
3c045e39ed Merge release/V2.5 into master 2017-03-15 17:59:21 +02:00
Ana Bozianu
c259648d72 Merge release/2.4 into release/V2.5 2017-03-15 16:48:26 +02:00
Tuna Aksoy
472debefac Fixed share port for local UI tests and also addressed review comment. 2017-03-15 14:39:57 +00:00
Ramona Popa
6ed9ccf4d3 Merge branch 'feature/RM-4804_transfer_completed_records' into 'master' 
RM-4804_Transfer_Completed_Records

See merge request !132
 2017-03-15 13:17:38 +00: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
Tom Page
67234af7f6 Merge master into RM-4339_RestTestsGuideTopicApi. 2017-03-15 08:26:54 +00:00
Ana Bozianu
8f254ba398 Merge branch 'feature-2.4/RM-3265_MoveDestroyedRecordFolders' into 'release/V2.4' 
Feature 2.4/rm 3265 move destroyed record folders

See merge request !127
 2017-03-14 08:22:39 +00:00
David Webster
bb8d1a03e9 Merge remote-tracking branch 'origin/release/V2.5' 2017-03-13 16:39:50 +00:00
David Webster
2ef212e804 Merge commit '52d46bef65bcc27c8424a84bd7af2fe087542c15' into release/V2.5 2017-03-13 16:37:34 +00:00
Tom Page
e7a16b95dd Merge branch 'feature/RM-4159_EnterpriseReSTTests' into 'master' 
feature/RM-4159_EnterpriseReSTTests

See merge request !29
 2017-03-13 16:21:00 +00:00
Ana Bozianu
793deafcba RM-3265 - added integration test for moving a closed folder 2017-03-13 18:20:39 +02:00
David Webster
ed2152dd3c Merge remote-tracking branch 'origin/release/V2.3' into release/V2.4 2017-03-13 16:16:06 +00:00
David Webster
336d120ceb Merge remote-tracking branch 'origin/release/V2.2' into release/V2.3 2017-03-13 16:11:04 +00:00
David Webster
8e2f53ac09 Merge remote-tracking branch 'origin/release/V2.2.1.x' into release/V2.2 2017-03-13 16:09:24 +00:00
Richard Smith
62ecb7307f Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-13 15:13:00 +00:00
Tom Page
eea60ee6d8 Merge branch 'feature/PR-3_tpage-alfresco' into 'master' 
Feature/pr 3 tpage alfresco

See merge request !125
 2017-03-13 14:22:27 +00:00
Ana Bozianu
d729a69922 RM-3265 - fix merge error 2017-03-13 14:53:21 +02:00
Ana Bozianu
ffc1fe1992 Merge feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder into 
feature-2.4/RM-3265_MoveDestroyedRecordFolders
 2017-03-13 14:25:18 +02:00
Rodica Sutu
3bf5296450 Merge branch 'merge/RM-4835_UpdateUITests' into 'master' 
Merge/rm 4835 update ui tests

See merge request !121
 2017-03-13 11:34:40 +00:00
Tom Page
5d3f1f4621 Merge RM-4159_EnterpriseReSTTests into RM-4339_RestTestsGuideTopicApi. 2017-03-13 08:26:47 +00:00
Tom Page
fe45e852f5 RM-4159 Ensure there's exactly one RMRestWrapper. 
Use @PostConstruct to fix the hierarchy after initialisation.
 2017-03-13 08:14:48 +00:00
Tuna Aksoy
5aa3721b91 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-13 01:01:33 +00:00
Tuna Aksoy
98628c75de RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-12 21:00:19 +00:00
Tom Page
1d5df7d857 Add travis_wait command as mvn takes a long time to download dependencies. 
Mirrored from community commit ef23705b9cbd832e5f1025130cfbf74810ddadcf
 2017-03-11 06:22:02 +00:00
Tuna Aksoy
a9375ada87 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-10 17:45:48 +00:00
Tom Page
0ccd845659 Merge RM-4159_EnterpriseReSTTests into RM-4339_RestTestsGuideTopicApi. 2017-03-10 16:39:38 +00:00
Tom Page
4a02f3970b Merge RM-4332_TopicCRUD_REST_API into RM-4159_EnterpriseReSTTests. 2017-03-10 16:38:36 +00:00
Richard Smith
2a85b545f2 Merged branch master into feature/RM-4113-Navigate-Clasification-Guide 2017-03-10 16:21:29 +00:00
Ross Gale
de67adedb7 Merge branch 'feature/RM-4158_ClassificationRestApi' into 'master' 
Feature/rm 4158 classification rest api

See merge request !115
 2017-03-10 16:12:53 +00:00
David Webster
0512d6a308 MNT-17550: Remove unnecessary file changes (should have been a record only merge from V2.3.0.x) 2017-03-10 16:00:23 +00:00
David Webster
4f355ad10d Merge branch 'release/V2.3.0.x' into release/V2.3 2017-03-10 15:53:13 +00:00
David Webster
3e3349a919 Merge branch 'release/V2.2' into release/V2.3 2017-03-10 15:51:22 +00:00
Rodica Sutu
dbda8b4f6a Merge branch 'release/V2.5' into merge/RM-4835_UpdateUITests 
# Conflicts:
#	rm-automation/pom.xml
 2017-03-10 17:41:27 +02:00
Rodica Sutu
83d6e9d820 Merge branch 'merge-2.5/RM-4835_UpdateUITests' into 'release/V2.5' 
Merge 2.5/rm 4835 update ui tests

See merge request !119
 2017-03-10 15:18:21 +00:00
Samuel Langlois
ff00888ac4 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:57:15 +00:00
David Webster
9950f4868c MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:57:15 +00:00
Samuel Langlois
407e1f1e65 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:55:38 +00:00
David Webster
7dce59e4c8 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:55:38 +00:00
David Webster
5960df0286 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2017-03-10 14:52:23 +00:00
David Webster
50bb522a3e Update versions following release of 2.2.0.3 2017-03-10 14:48:11 +00:00
Silviu Dinuta
796f32a461 Merge branch 'feature-2.4/RM-4163_DeclareRecordsConcurrencyIssue' into 'release/V2.4' 
RM-4163: added integration test for scenario provided by Roy and got the

See merge request !116
 2017-03-10 12:51:18 +00:00