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,676 Commits 324 Branches 2,170 Tags
1a47c4c44c5f868e355d97cda43408f5a9c1d3cc
Commit Graph

2676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
b8ad24e6bc Merge branch 'hotfix-2.3/RM-4095_Fix_Failing_InplaceRecordPermissionTest' into release/V2.3.0.x 2016-10-03 07:32:34 +01:00
Tuna Aksoy
13cfe5914d RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 22:50:50 +01:00
Tuna Aksoy
deefa0987d RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 21:56:18 +01:00
Tuna Aksoy
18580aa649 RM-4101 (Link to, Copy to and File to rules fail when not run in background) 2016-10-01 17:21:57 +01:00
David Webster
2ceade040e Record Only: Merge branch 'release/V2.3' into release/V2.4 2016-09-30 17:15:47 +01:00
David Webster
028e3d47e3 Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/merge_from_v2.2.0.1 2016-09-30 16:33:49 +01:00
Tom Page
72e875ba1e RM-4162 RM-4907 Merge release/V2.3.0.x into release/V2.3. 2016-09-30 16:23:58 +01:00
David Webster
ecbf4d1edc Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1 2016-09-30 15:35:04 +01:00
Silviu Dinuta
965cb83669 RM-4162: formatting fix 2016-09-29 23:02:13 +03:00
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
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
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
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
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
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
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
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
a4030ba15d Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03: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