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
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
Tuna Aksoy
b5db94d1fd Create RM 2.5.a 2016-09-20 20:55:08 +01:00
Tuna Aksoy
4fb8eb32d0 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
c3e480b649 RM-3902 (RM 2.5 Community Release) 2016-09-20 16:05:40 +01:00
Silviu Dinuta
1bc18c7b85 Merge release/V2.3.0.x into release/V2.3 2016-09-20 16:31:09 +03:00
Silviu Dinuta
183ee64545 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
4386673eb7 RM-3993: change after review 2016-09-20 14:29:01 +03:00
Ana Bozianu
a2fb6994ed Read-only merge release/V2.3.0.x into release/V2.3 2016-09-20 14:10:33 +03:00
Silviu Dinuta
bad87a123e incremented to 2.3.0.8-SNAPSHOT 2016-09-20 14:06:58 +03:00
Ana Bozianu
a930f5e4f1 Merge release/V2.3.0.x into release/V2.3 2016-09-20 14:00:59 +03:00
Silviu Dinuta
08855c6d2f removed SNAPSHOR from version of all pom files 2016-09-20 13:07:44 +03:00
Roxana Lucanu-Ghetu
ec363a3838 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
30569e3339 RM-3993: fixed integration test 2016-09-20 11:41:20 +03:00
Mihai Cozma
5fe9416725 Merge branch 'feature-2.2/RM-3991_The_Audit_log_page_displayed_is_empty' into 'release/V2.2' 
Feature 2.2/rm 3991 the audit log page displayed is empty

See merge request !502
 2016-09-20 07:35:15 +01:00
Roy Wetherall
7be668aaef 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
ca5316b6e2 RM-3993 (Exceptions thrown when concurrently creating identical folder structure) 2016-09-20 00:54:14 +01:00
Silviu Dinuta
bf3bd71041 RM-3993: added integration test 2016-09-19 16:45:22 +03:00
Mihai Cozma
ad163b0301 Fix audit issue 2016-09-19 15:06:13 +03:00
Mihai Cozma
fbe55ac0a9 Revert "Fix audit issue" 
This reverts commit d8f0c87c5b.
 2016-09-19 14:48:14 +03:00
Mihai Cozma
d8f0c87c5b Fix audit issue 2016-09-19 14:46:42 +03:00
Mihai Cozma
19231330f6 Merge branch 'feature-2.3/RM-3991_The_Audit_log_page_displayed_is_empty_' into 'release/V2.3' 
Feature 2.3/rm 3991 the audit log page displayed is empty

See merge request !500
 2016-09-19 08:11:04 +01:00
Mihai Cozma
39afa6e9f1 Fix audit issue 2016-09-19 09:18:09 +03:00
Tom Page
171efade80 Merge release/V2.4 into release/V2.5. 2016-09-16 16:06:40 +01:00
Tom Page
3f321077e5 Merge branch 'feature-2.4/LoggingForUITests' into 'release/V2.4' 
Feature 2.4/logging for ui tests

Use console logging when running UI tests.

Redirect java.util.logging to slf4j, and reduce the noise from Selenium down to just warnings and errors.

See merge request !494
 2016-09-16 15:57:15 +01:00
Tom Page
a5325e8cb1 Use console logging when running UI tests. 
Redirect java.util.logging to slf4j, and reduce the noise from Selenium
down to just warnings and errors.
 2016-09-15 15:59:07 +01:00
Roxana Lucanu
eb3fa4acb3 RM-3030 - renamed variable and changed comment 
(cherry picked from commit d5efeec830)
 2016-09-15 16:12:55 +03:00
Roxana Lucanu
d0b8a79a8a RM-3030 - added filePlan aspect for every thumbnail from renditions 
(cherry picked from commit 1de1bcf5f4)
 2016-09-15 15:45:34 +03:00
Tuna Aksoy
a778357b9d Merge branch 'hotfix-2.3/RM-3996_unit_test_for_DynamicAuthoritiesGet' into 'release/V2.3.0.x' 
Hotfix 2.3/rm 3996 unit test for dynamic authorities get

Fixed bug with infinite loop when batchsize=0 and adapted the unit tests that Roy wrote for the patch and added some more.

See merge request !491
 2016-09-15 12:38:00 +01:00
Silviu Dinuta
1b7fd10f66 RM-3996: added unit tests 2016-09-15 14:05:31 +03:00
Silviu Dinuta
d3628be26b RM-3996: added unit tests and fixed the bug with infinite loop when 
batchsize=0
 2016-09-15 14:04:06 +03:00
Tuna Aksoy
4cb9a285d0 Merge branch 'hotfix-2.3/RM-3906-V2.3.0.8' into 'release/V2.3.0.x' 
Hotfix 2.3/rm 3906 v2.3.0.8

Implemented GET webscript that removes dynamic authorities.

See merge request !490
 2016-09-14 10:32:49 +01:00
Silviu Dinuta
7d7d10768d RM-3906: set maxProcessedRecords to batchsize value if it is not set 
from the request
 2016-09-14 10:32:42 +03:00
Silviu Dinuta
cc78febd0c RM-3906: added short description for url parameters 2016-09-14 05:19:15 +03:00
Silviu Dinuta
9b5e311936 RM-3960: did most of the review mentioned improvements 2016-09-13 21:12:15 +03:00
Silviu Dinuta
280a3656be RM-3906: added max records parameter in webscript url as obtional and 
added aurthentication to admin
 2016-09-13 18:04:39 +03:00
Silviu Dinuta
194e075cc6 RM-3906: Implemented webscript 2016-09-13 15:58:43 +03:00
Tom Page
70ec0ebc4f Merge release/V2.1 into release/V2.2. 2016-09-12 08:28:00 +01:00
Tom Page
700d47c5c7 Merge release/V2.0 into release/V2.1. 2016-09-12 08:27:30 +01:00