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
3,433 Commits 330 Branches 2,178 Tags
1377cc8e118ac49ad2591bb901b49ac4f50218ca
Commit Graph

3433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
c1fc2d873f Merge branch 'feature/RM-4082_Add_API_Explorer' into 'master' 
Feature/rm 4082 add api explorer

See merge request !528
 2016-09-29 14:09:15 +01: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
David Webster
adca3362ba Update versions to 2.2.0.2-SNAPSHOT 2016-09-28 14:17:06 +01:00
David Webster
21d4f7db03 HF 2.2.0.1 update module version numbers 2016-09-28 11:47:55 +01:00
David Webster
4f5a2631df HF 2.2.0.1 version number updates 2016-09-28 11:28:16 +01:00
Roxana Lucanu-Ghetu
8d2d82e1fe Merge branch 'origin/feature/RM-3347_checkExclusiveClearance' into master 2016-09-27 16:38:33 +03:00
Tom Page
e673d7ab03 Let git handle line endings for us. 2016-09-27 13:55:53 +01:00
Silviu Dinuta
48e6cc47de formatting fix 2016-09-27 12:48:31 +03:00
Silviu Dinuta
b9bb54579e minor formating issue 2016-09-27 12:30:43 +03:00
Silviu Dinuta
8d05147c6e RM-4907: added unit tests for csv acceptance criteria and made 
processNode method protected
 2016-09-27 12:17:04 +03:00
David Webster
5c90f386f4 MNT-16852: back port code fix for add children permission support 2016-09-26 22:17:24 +01:00
David Webster
18e4c800ad Update HF version 2016-09-26 22:12:01 +01:00
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