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
2,759 Commits 324 Branches 2,170 Tags
feb9bc09c7d55c8906ebbc1f93e98ffcbe9e597c
Commit Graph

2759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
feb9bc09c7 Temp workaround to fix the failing integration tests 2016-10-05 23:58:05 +01:00
Ana Bozianu
62952a9306 Revert "Extracted RM Community REST API code to a separate project" 
This reverts commit 165c08749b.
 2016-10-05 16:16:52 +03:00
Ana Bozianu
ec66655a1b Revert "Removed RecordsManagementCustomModel and RecordsManagementModel from RM Community Repi and added it to the new RM Community REST API project" 
This reverts commit 74f867dae1.
 2016-10-05 16:16:04 +03:00
Tuna Aksoy
74f867dae1 Removed RecordsManagementCustomModel and RecordsManagementModel from RM Community Repi and added it to the new RM Community REST API project 2016-10-05 00:08:02 +01:00
Tuna Aksoy
165c08749b Extracted RM Community REST API code to a separate project 2016-10-04 12:28:39 +01:00
Ana Bozianu
85d5a80620 RM-4012 - rebamed to fileplan components and used nodes service 2016-10-04 13:01:19 +03:00
Ana Bozianu
3b284fbea9 RM-4012 - added the ig rest api 2016-10-03 14:35:20 +03:00
Tuna Aksoy
9b4727ba5f Temp fix to mitigate different Alfresco versions in RM Community (5.2) and RM Enterprise (5.1) 2016-09-29 08:31:15 +01:00
Tuna Aksoy
d5ca1f3208 RM-4082 (Extend POM dependencies to include API Explorer) 2016-09-28 18:54:08 +01:00
Tom Page
59c707a59b Merge V2.3.c to master. 
Record-only merge to ensure the community releases are available via the
community mirror.
 2016-09-23 16:17:13 +01:00
Tom Page
3c7882c0ff Merge release/V2.5 into master. 2016-09-23 14:37:59 +01:00
Tom Page
eacfd00e0c Let git handle line endings for us. 2016-09-23 14:36:49 +01:00
Tom Page
f4b29684e0 Merge release/V2.5.0.x into release/V2.5. 2016-09-23 10:40:54 +01:00
Tom Page
8b89dcee5b Merge release/V2.4 into release/V2.5. 2016-09-23 10:40:35 +01:00
Tom Page
cf26f9b207 Let git handle line endings for us. 2016-09-23 10:38:16 +01:00
Tom Page
b3b2585e99 Let git handle line endings for us. 2016-09-23 10:34:36 +01:00
Tuna Aksoy
aa8e1c1b32 RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:47:29 +01:00
Tuna Aksoy
717e2f85ba RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:45:57 +01:00
Tom Page
a33b0b8764 Merge branch 'feature-2.5/RM-3692_ReduceLogging' into 'release/V2.5' 
Feature 2.5/rm 3692 reduce logging

RM-3692 Merge the UI test logging changes to release/V2.5.

See merge request !498
 2016-09-22 08:49:31 +01:00
Tom Page
0347fd310a Merge branch release/V2.3 into release/V2.4. 2016-09-21 14:56:52 +01:00
Tom Page
b46bc7fd05 Merge release/V2.4.0.x into release/V2.4. 2016-09-21 14:55:30 +01:00
Tom Page
014e9662bc Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Tom Page
cb2457641f Let git handle line endings for us. 2016-09-21 14:53:15 +01:00
Ana Bozianu
016f7bcf7e Merge release/V2.5 to master 2016-09-21 16:45:30 +03:00
Ana Bozianu
87cf030e77 Merge branch 'feature/merge_2.5_to_master' into 'master' 
Feature/merge 2.5 to master

Merged release/V2.5 into master

See merge request !515
 2016-09-21 14:22:58 +01:00
Ana Bozianu
82fcad4297 Merge branch 'feature-2.5/merge_2.4_to_2.5' into 'release/V2.5' 
Feature 2.5/merge 2.4 to 2.5

Merged release/V2.4 into release/V2.5

See merge request !514
 2016-09-21 14:22:55 +01:00
Ana Bozianu
35a76b2353 Merge feature-2.5/merge_2.4_to_2.5 into feature/merge_2.5_to_master 2016-09-21 15:57:40 +03:00
Ana Bozianu
8fd8782c8e Merge 2.4 merge fix into 2.5 2016-09-21 15:56:06 +03:00
Tom Page
23384d99d6 Merge release/V2.2 into release/V2.3. 2016-09-21 13:50:13 +01:00
Tom Page
c09b79799e Merge release/V2.3.0.x into release/V2.3. 2016-09-21 13:49:00 +01:00
Tom Page
7e14b5231b Let git handle line endings for us. 2016-09-21 13:48:28 +01:00
Tom Page
d4937aeda4 Let git handle line endings for us. 2016-09-21 13:47:25 +01:00
Ana Bozianu
be9f4f6f04 fixed merge error 2016-09-21 15:40:27 +03:00
Ana Bozianu
4ce68e9039 Merge release/2.5 into master 2016-09-21 15:12:01 +03:00
Ana Bozianu
85db34ff48 Merge release/V2.4 into release/V2.5 2016-09-21 14:33:23 +03:00
Ana Bozianu
935d6319e1 Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Tuna Aksoy
5b70f71779 Merge branch 'feature/Merge_2.5_to_master' into 'master' 
Feature/merge 2.5 to master

See merge request !512
 2016-09-21 00:06:57 +01:00
Tuna Aksoy
8a965e09a8 Merge branch 'release/V2.5' 2016-09-21 00:00:24 +01:00
Tuna Aksoy
612542b31e Merge branch 'feature-2.5/Merge_2.5.a_to_2.5' into 'release/V2.5' 
Feature 2.5/merge 2.5.a to 2.5

See merge request !511
 2016-09-20 23:55:22 +01:00
Tuna Aksoy
12af32f190 Merge branch 'release/V2.5.a' into release/V2.5 2016-09-20 23:51:11 +01:00
Tuna Aksoy
1d8bf3e67d Merge branch 'release/V2.5' into 'master' 
Merge changes from release/V2.5 into master

See merge request !509
 2016-09-20 23:27:32 +01:00
alfresco-build
485c61a185 [maven-release-plugin] prepare for next development iteration 2016-09-20 21:41:49 +01:00
alfresco-build
cc92ca4055 [maven-release-plugin] prepare release V2.5.a 2016-09-20 21:41:46 +01:00
Tuna Aksoy
b5db94d1fd Create RM 2.5.a 2016-09-20 20:55:08 +01:00
Tuna Aksoy
4fb8eb32d0 Merge branch 'feature-2.5/RM-3902_RM_2_5_Community_Release' into 'release/V2.5' 
Feature 2.5/rm 3902 rm 2 5 community release

See merge request !508
 2016-09-20 16:52:40 +01:00
Tuna Aksoy
c3e480b649 RM-3902 (RM 2.5 Community Release) 2016-09-20 16:05:40 +01:00
Silviu Dinuta
1bc18c7b85 Merge release/V2.3.0.x into release/V2.3 2016-09-20 16:31:09 +03:00
Silviu Dinuta
183ee64545 Merge branch 'hotfix-2.3/RM-3993_Fixed_Integration_Test' into 'release/V2.3.0.x' 
Hotfix 2.3/rm 3993 fixed integration test

fixed the integration test

See merge request !506
 2016-09-20 14:16:03 +01:00
Silviu Dinuta
4386673eb7 RM-3993: change after review 2016-09-20 14:29:01 +03:00
Ana Bozianu
a2fb6994ed Read-only merge release/V2.3.0.x into release/V2.3 2016-09-20 14:10:33 +03:00