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
0a084b2f60
Merge release/2.5 into master
2016-09-21 15:12:01 +03:00
Ana Bozianu
4d2fc69747
Merge release/V2.4 into release/V2.5
2016-09-21 14:33:23 +03:00
Ana Bozianu
a4030ba15d
Merge release/V2.3 into release/2.4
2016-09-21 11:58:40 +03:00
Tuna Aksoy
27fa6bd373
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
27fb481469
Merge branch 'release/V2.5'
2016-09-21 00:00:24 +01:00
Tuna Aksoy
74d9a2dec0
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
c604b4930b
Merge branch 'release/V2.5.a' into release/V2.5
2016-09-20 23:51:11 +01:00
Tuna Aksoy
a234bab816
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
b11503ba2b
[maven-release-plugin] prepare for next development iteration
2016-09-20 21:41:49 +01:00
alfresco-build
5d2dad22ab
[maven-release-plugin] prepare release V2.5.a
ags-2.5.a
2016-09-20 21:41:46 +01:00
Tuna Aksoy
2f2ea5a2ff
Create RM 2.5.a
2016-09-20 20:55:08 +01:00
Tuna Aksoy
a39ef7e8d5
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
fa74649d2f
RM-3902 (RM 2.5 Community Release)
2016-09-20 16:05:40 +01: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
Roxana Lucanu-Ghetu
dac54f9484
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
bfc0319684
RM-3993: fixed integration test
2016-09-20 11:41:20 +03:00
Mihai Cozma
f377f4a0c4
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
a442fa9303
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
b8adf5b254
RM-3993 (Exceptions thrown when concurrently creating identical folder structure)
2016-09-20 00:54:14 +01:00
Silviu Dinuta
c8c4676e30
RM-3993: added integration test
2016-09-19 16:45:22 +03:00
Mihai Cozma
f6c63e480f
Fix audit issue
2016-09-19 15:06:13 +03:00
Mihai Cozma
d7cf26c236
Revert "Fix audit issue"
...
This reverts commit 189e3626e8
.
2016-09-19 14:48:14 +03:00
Mihai Cozma
189e3626e8
Fix audit issue
2016-09-19 14:46:42 +03:00
Mihai Cozma
f42cbeccfa
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
2e9e8e7227
Fix audit issue
2016-09-19 09:18:09 +03:00
Tom Page
0539a3e68d
Merge release/V2.4 into release/V2.5.
2016-09-16 16:06:40 +01:00
Tom Page
43b7256a19
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
02e90a1853
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
569c047258
RM-3030 - renamed variable and changed comment
...
(cherry picked from commit 8de82a81df
)
2016-09-15 16:12:55 +03:00
Roxana Lucanu
3aa5a00e3d
RM-3030 - added filePlan aspect for every thumbnail from renditions
...
(cherry picked from commit e6d1757a3a
)
2016-09-15 15:45:34 +03:00
Tuna Aksoy
f11950e60b
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
c2342bf3fe
RM-3996: added unit tests
2016-09-15 14:05:31 +03:00
Silviu Dinuta
cf8e81265d
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
6006c67cae
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
03d943ed7e
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
84331993a0
RM-3906: added short description for url parameters
2016-09-14 05:19:15 +03:00
Silviu Dinuta
dddcfcf525
RM-3960: did most of the review mentioned improvements
2016-09-13 21:12:15 +03:00
Silviu Dinuta
dd027ffa35
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
4eef7d1363
RM-3906: Implemented webscript
2016-09-13 15:58:43 +03:00