inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,743 Commits 330 Branches 2,178 Tags
66e449b715da40c73cd40ff347c59b6ca1c85c9c
Commit Graph

2743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
66e449b715 Merge master into origin/feature/RM-3347_checkExclusiveClearance. 2016-09-23 14:53:48 +01:00
Tom Page
a93f44f8bc Let git handle line endings for us. 2016-09-23 14:53:33 +01:00
Tom Page
92010f7b36 Merge release/V2.5 into master. 2016-09-23 14:37:59 +01:00
Tom Page
483bb55a13 Let git handle line endings for us. 2016-09-23 14:36:49 +01:00
Tom Page
cf1fe4ac45 Merge release/V2.5.0.x into release/V2.5. 2016-09-23 10:40:54 +01:00
Tom Page
ac679929c0 Merge release/V2.4 into release/V2.5. 2016-09-23 10:40:35 +01:00
Tom Page
e0cc131aa8 Let git handle line endings for us. 2016-09-23 10:38:16 +01:00
Tom Page
bbf9580519 Let git handle line endings for us. 2016-09-23 10:34:36 +01:00
Tuna Aksoy
9ecea8d44f RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:47:29 +01:00
Tuna Aksoy
b4298928bd RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:45:57 +01:00
Tom Page
4fa04a779a 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
083c8a9d5d Merge branch release/V2.3 into release/V2.4. 2016-09-21 14:56:52 +01:00
Tom Page
515e5619b4 Merge release/V2.4.0.x into release/V2.4. 2016-09-21 14:55:30 +01:00
Tom Page
b08d4a788e Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Tom Page
d57d024474 Let git handle line endings for us. 2016-09-21 14:53:15 +01:00
Ana Bozianu
1243fc574a Merge release/V2.5 to master 2016-09-21 16:45:30 +03:00
Ana Bozianu
064712fb5a 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
3b7c47ab67 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
f84324d125 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
a249953a92 Merge 2.4 merge fix into 2.5 2016-09-21 15:56:06 +03:00
Tom Page
b167506924 Merge release/V2.2 into release/V2.3. 2016-09-21 13:50:13 +01:00
Tom Page
d5b4caa6e0 Merge release/V2.3.0.x into release/V2.3. 2016-09-21 13:49:00 +01:00
Tom Page
00737dd7ba Let git handle line endings for us. 2016-09-21 13:48:28 +01:00
Tom Page
8e577015f6 Let git handle line endings for us. 2016-09-21 13:47:25 +01:00
Ana Bozianu
16927d264c fixed merge error 2016-09-21 15:40:27 +03:00
Ana Bozianu
0a084b2f60 Merge release/2.5 into master 2016-09-21 15:12:01 +03:00
Ana Bozianu
4d2fc69747 Merge release/V2.4 into release/V2.5 2016-09-21 14:33:23 +03:00
Ana Bozianu
a4030ba15d Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Tuna Aksoy
27fa6bd373 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
27fb481469 Merge branch 'release/V2.5' 2016-09-21 00:00:24 +01:00
Tuna Aksoy
74d9a2dec0 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
c604b4930b Merge branch 'release/V2.5.a' into release/V2.5 2016-09-20 23:51:11 +01:00
Tuna Aksoy
a234bab816 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
b11503ba2b [maven-release-plugin] prepare for next development iteration 2016-09-20 21:41:49 +01:00
alfresco-build
5d2dad22ab [maven-release-plugin] prepare release V2.5.a ags-2.5.a 2016-09-20 21:41:46 +01:00
Tuna Aksoy
2f2ea5a2ff Create RM 2.5.a 2016-09-20 20:55:08 +01:00
Tuna Aksoy
a39ef7e8d5 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
fa74649d2f RM-3902 (RM 2.5 Community Release) 2016-09-20 16:05:40 +01:00
Silviu Dinuta
e5b1163656 Merge release/V2.3.0.x into release/V2.3 2016-09-20 16:31:09 +03:00
Silviu Dinuta
ebc3b40cee 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
367babb851 RM-3993: change after review 2016-09-20 14:29:01 +03:00
Ana Bozianu
5624e06ca5 Read-only merge release/V2.3.0.x into release/V2.3 2016-09-20 14:10:33 +03:00
Silviu Dinuta
cc77cfa3a3 incremented to 2.3.0.8-SNAPSHOT 2016-09-20 14:06:58 +03:00
Ana Bozianu
e96f7c73a3 Merge release/V2.3.0.x into release/V2.3 2016-09-20 14:00:59 +03:00
Silviu Dinuta
85655193e4 removed SNAPSHOR from version of all pom files 2016-09-20 13:07:44 +03:00
Roxana Lucanu-Ghetu
dac54f9484 Merge branch 'feature-2.3/RM-2188_PreviewNotAvailableDeclaredRecord' into 'release/V2.3' 
Feature 2.3/rm 2188 preview not available declared record

Backported changes from fixed issue RM-3030 in V2.4.

See merge request !493
 2016-09-20 10:05:53 +01:00
Silviu Dinuta
bfc0319684 RM-3993: fixed integration test 2016-09-20 11:41:20 +03:00
Roy Wetherall
a442fa9303 Merge branch 'hotfix-2.3/RM-3993_IntegrationTest' into 'release/V2.3.0.x' 
Hotfix 2.3/rm 3993 integration test

See merge request !505
 2016-09-20 01:27:31 +01:00
Tuna Aksoy
b8adf5b254 RM-3993 (Exceptions thrown when concurrently creating identical folder structure) 2016-09-20 00:54:14 +01:00
Silviu Dinuta
c8c4676e30 RM-3993: added integration test 2016-09-19 16:45:22 +03:00