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,990 Commits 335 Branches 2,191 Tags
02eec901b3758acba0442712999efe30cd0b43d6
Commit Graph

4990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silviu Dinuta
431c6cd31b RM-4162: fixed formatting 2016-09-29 22:44:37 +03:00
Silviu Dinuta
9ec3f89637 RM-4162: added extra parentNodeRef parameter, checked writers and 
readers individually for null and added unit tests for the changes
 2016-09-29 18:44:06 +03:00
Tuna Aksoy
9a3c26a556 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
6bc7e5ead1 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
10d7deed1b RM-4082 (Extend POM dependencies to include API Explorer) 2016-09-28 18:54:08 +01:00
David Webster
3bf3ece86b Update versions to 2.2.0.2-SNAPSHOT 2016-09-28 14:17:06 +01:00
David Webster
31e10e6a4a HF 2.2.0.1 update module version numbers 2016-09-28 11:47:55 +01:00
David Webster
b63fe71b99 HF 2.2.0.1 version number updates 2016-09-28 11:28:16 +01:00
Roxana Lucanu-Ghetu
5802126ee0 Merge branch 'origin/feature/RM-3347_checkExclusiveClearance' into master 2016-09-27 16:38:33 +03:00
Tom Page
2e0cebc7c6 Let git handle line endings for us. 2016-09-27 13:55:53 +01:00
Silviu Dinuta
6cb9298ba3 formatting fix 2016-09-27 12:48:31 +03:00
Silviu Dinuta
0c9eeffd21 minor formating issue 2016-09-27 12:30:43 +03:00
Silviu Dinuta
54c4710120 RM-4907: added unit tests for csv acceptance criteria and made 
processNode method protected
 2016-09-27 12:17:04 +03:00
David Webster
2b4c6616bc MNT-16852: back port code fix for add children permission support 2016-09-26 22:17:24 +01:00
David Webster
5f0c239e5f Update HF version 2016-09-26 22:12:01 +01:00
Silviu Dinuta
c5e537fa69 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
6189376e17 RM-4097: added fix for both issues 2016-09-26 17:32:53 +03:00
Mihai Cozma
27a3091319 Merge remote-tracking branch 'origin/release/V2.3' into release/V2.4 2016-09-26 10:41:17 +03:00
David Webster
b1dcda9735 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
d083371d8b 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
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
5328db71c5 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
5f40921c12 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
5fbdca7735 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
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
Tom Page
e679622743 Merge release/V2.4.0.x into release/V2.4. 2016-09-23 10:31:00 +01:00
Oana Nechiforescu
a98a41d5f7 Upgrading the qatools htmlelements dependency. 2016-09-23 10:17:14 +03: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
Tuna Aksoy
96e9f8828f 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
44dbc31061 RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:16:34 +01:00
Tuna Aksoy
45e3abd962 RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:12:28 +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
c53321073d 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
684939995a RM-4095 - Excluded RM3993Test from the test execution 2016-09-21 16:28:10 +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