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
4,525 Commits 335 Branches 2,191 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

4525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silviu Dinuta
3209fff5cd Merge branch 'hotfix-2.3/RM-4097' into hotfix-2.3/RM-4096_RM_4097 2016-09-26 18:26:36 +03:00
Silviu Dinuta
577173c2b6 RM-4097: added fix for both issues 2016-09-26 17:32:53 +03:00
Mihai Cozma
6d1bcef955 Merge remote-tracking branch 'origin/release/V2.3' into release/V2.4 2016-09-26 10:41:17 +03:00
David Webster
55a085b303 Add info on surf build error for those without access to internal maven repo 
Mirrored from community commit 845413179d5f316a498996d9397ef9769626baf5
 2016-09-23 16:59:35 +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
2f8be348d9 Merge master into origin/feature/RM-3347_checkExclusiveClearance. 2016-09-23 14:53:48 +01:00
Tom Page
87898a1f0b Let git handle line endings for us. 2016-09-23 14:53:33 +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
09f3716907 Merge branch 'feature-2.4/MergeV2.4.0.xToV2.4' into 'release/V2.4' 
Feature 2.4/merge v2.4.0.x to v2.4

Merge some minor changes made to rm-automation back to V2.4.

See merge request !519
 2016-09-23 14:30:13 +01:00
Mihai Cozma
dfa5e57eb3 Merge branch 'feature-2.3/MergeV2.2_to_V2.3' into 'release/V2.3' 
Feature 2.3/merge v2.2 to v2.3

See merge request !518
 2016-09-23 14:03:47 +01:00
Mihai Cozma
ce19f694ef Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/MergeV2.2_to_V2.3 2016-09-23 14:34:32 +03: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
Tom Page
73c9da3a52 Merge release/V2.4.0.x into release/V2.4. 2016-09-23 10:31:00 +01:00
Oana Nechiforescu
775be155fa Upgrading the qatools htmlelements dependency. 2016-09-23 10:17:14 +03: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
Tuna Aksoy
0f596a6e21 Merge branch 'release/V2.3' into release/V2.4 
Conflicts:
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java
 2016-09-22 10:39:50 +01:00
Tuna Aksoy
4be658779f RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:16:34 +01:00
Tuna Aksoy
54ce53373d RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:12:28 +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
3b5d7db7d4 Update selenium-grid version to 1.8. 
Hopefully this will allow the UI tests to run on this branch now.
 2016-09-21 16:45:24 +01:00
Tuna Aksoy
03e5920a4f RM-4095 - Excluded RM3993Test from the test execution 2016-09-21 16:28:10 +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