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
4,087 Commits 324 Branches 2,170 Tags
fb215876b82053e06907b5e8b10a3ce75db2bf5c
Commit Graph

4087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gbroadbent
3d9074966a JAPANESE: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:54:52 +01:00
gbroadbent
c3e4855907 GERMAN: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 including recommendations in RM-4839 2017-04-03 16:53:42 +01:00
Richard Smith
0ede45bb04 Merge branch 'feature/RM-4113-Navigate-Clasification-Guide' into 'master' 
RM-4113 navigate clasification guide

See merge request !173
 2017-04-03 15:01:45 +01:00
Tuna Aksoy
16d4f726e0 RM-2396: Fixed failing integration tests 2017-04-03 12:05:24 +01:00
gbroadbent
11e5c7441f SPANISH: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-03-28 14:01:10 +01:00
gbroadbent
cdff519ebd FRENCH: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 including recommendations in RM-4839 2017-03-28 12:03:39 +01:00
Tuna Aksoy
9b23b2cbde RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-28 07:23:39 +01:00
Richard Smith
dd24bf9815 Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-27 16:48:28 +01:00
Ross Gale
35a8256465 Merge branch 'feature/RM-4745_SubtopicsApiTests' into 'master' 
Feature/rm 4745 subtopics api tests

See merge request !162
 2017-03-27 08:25:14 +01:00
Richard Smith
47c034972f Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-24 15:59:49 +00:00
Oana Nechiforescu
e8bfc8c544 Merge branch 'feature/RM-4339_RestTestsGuideTopicApi' into 'master' 
Feature/rm 4339 rest tests guide topic api

See merge request !135
 2017-03-24 15:24:24 +00:00
Richard Smith
5dcd30ce08 Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-24 11:36:15 +00:00
Ross Gale
b0aee9ab49 rm-4745 merging file 2017-03-24 11:07:59 +00:00
Tom Page
45c4a83b87 RM-4942 Ensure the API sorting is case insensitive. 
Take notice of the locale of the server when performing the sort. Also
fix the security group and mark comparators to use the same system.
 2017-03-23 14:22:19 +00:00
Oana Nechiforescu
9a5a01048c Merge branch 'feature/RM-4339_RestTestsGuideTopicApi' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 2017-03-22 10:21:18 +02:00
Oana Nechiforescu
d3ce2e28b7 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 2017-03-21 23:07:16 +02:00
Ross Gale
9359dc1614 Merge remote-tracking branch 'remotes/origin/feature/RM-4339_RestTestsGuideTopicApi' into feature/RM-4745_SubtopicsApiTests 2017-03-21 14:11:40 +00:00
Richard Smith
bc818d658f Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-21 14:07:00 +00:00
Oana Nechiforescu
7e2f7ea6f9 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 2017-03-21 10:55:16 +02:00
Tuna Aksoy
e7242ec024 Merge branch 'release/V2.5' into merge/RM-3265_toMaster_2 2017-03-21 06:14:37 +00:00
Tuna Aksoy
9183b58153 Merge branch 'release/V2.4' into merge-2.5/RM-3265_to2.5_3 
Conflicts:
	pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
 2017-03-21 06:09:44 +00:00
Tuna Aksoy
4f2467ea5d RM-4760 (Update source control management info in the parent pom) 2017-03-20 18:42:01 +00:00
Tuna Aksoy
0d7d8e2fbf Fixed typo 2017-03-20 10:19:25 +00:00
Tuna Aksoy
68da4b9a93 RM-4808 (Update Record Folder: Reopen a close folder via PUT request throw Permission denied exception) 2017-03-19 00:16:37 +00:00
Oana Nechiforescu
c3c6febd6e Some additional tests, plus review changes and Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/rm-enterprise-public-rest-context.xml
 2017-03-18 21:11:23 +02:00
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