Commit Graph

3908 Commits

Author SHA1 Message Date
gbroadbent
d228d833f2 JAPANESE: Updated bundles based on EN rev2017-04-07 2017-04-07 12:06:12 +01:00
gbroadbent
c7b74c6a81 ITALIAN: Updated bundles based on EN rev2017-04-07 2017-04-07 12:05:46 +01:00
gbroadbent
dd242122f4 SPANISH: Updated bundles based on EN rev2017-04-07 2017-04-07 12:05:10 +01:00
gbroadbent
991d4d5046 GERMAN: Updated bundles based on EN rev2017-04-07 2017-04-07 12:03:20 +01:00
Kristijan Conkas
0b3667495a Merge branch 'feature/RM-4983_Update_readme_file' into 'master'
RM-4983: amended UI testing section

See merge request !196
2017-04-06 09:12:28 +01:00
Ana Bozianu
eef010c2cb Merge RM-2396 and RM-3727 to master 2017-04-06 10:52:25 +03:00
Ana Bozianu
4ea6723600 Merge 'release/V2.4' into 'release/V2.5' 2017-04-06 10:18:16 +03:00
Kristijan Conkas
50a33fc025 RM-4983: amended UI testing section 2017-04-05 15:07:58 +01:00
Ana Bozianu
b10c3f59a2 RM-3727 - reverted property removal from property files other than english 2017-04-05 17:06:18 +03:00
Ana Bozianu
31331d91bc Merge branch 'feature-2.4/RM-3727_VitalRecordsToReviewNotification' into 'release/V2.4'
Feature 2.4/rm 3727 vital records to review notification

See merge request !194
2017-04-05 14:41:04 +01:00
Ana Bozianu
e2bbfbd73c RM-3727 - reset cron expression to original one 2017-04-05 16:28:05 +03:00
Ana Bozianu
6a1b32a405 RM-3727 - fixed typo 2017-04-05 15:18:11 +03:00
Ana Bozianu
4e91c9b4ed RM-3727 - added unit test for reviewed action and removed notification issued property 2017-04-05 12:04:31 +03:00
Ana Bozianu
38a81d5934 RM-3727 - fixed query and exposed cron job expression in properties 2017-04-04 18:31:17 +03:00
Tuna Aksoy
610621c2cd RM-2396: Fixed method security config value 2017-04-04 16:25:03 +01:00
gbroadbent
fd6f413dc4 ITALIAN: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 17:05:31 +01:00
gbroadbent
b74227d23e SIMPLIFIED CHINESE: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:59:39 +01:00
gbroadbent
894fc75bef BRAZILIAN PORTUGUESE: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:58:43 +01:00
gbroadbent
a93f17fdbf RUSSIAN: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:57:52 +01:00
gbroadbent
4aca8c2b4c DUTCH: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:57:13 +01:00
gbroadbent
a49b1e6d9b NORWEGIAN Bokmal: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:56:33 +01:00
gbroadbent
464d84de09 JAPANESE: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:54:52 +01:00
gbroadbent
a4880c375e GERMAN: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 including recommendations in RM-4839 2017-04-03 16:53:42 +01:00
Richard Smith
77e1d30cda Merge branch 'feature/RM-4113-Navigate-Clasification-Guide' into 'master'
RM-4113 navigate clasification guide

See merge request !173
2017-04-03 15:01:45 +01:00
Tuna Aksoy
db492e568f RM-2396: Fixed failing integration tests 2017-04-03 12:05:24 +01:00
gbroadbent
72ea1c6a50 SPANISH: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-03-28 14:01:10 +01:00
gbroadbent
f4c7609325 FRENCH: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 including recommendations in RM-4839 2017-03-28 12:03:39 +01:00
Tuna Aksoy
b4a788be3d RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-28 07:23:39 +01:00
Richard Smith
5bdaf1a291 Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-27 16:48:28 +01:00
Ross Gale
d7895d3a34 Merge branch 'feature/RM-4745_SubtopicsApiTests' into 'master'
Feature/rm 4745 subtopics api tests

See merge request !162
2017-03-27 08:25:14 +01:00
Richard Smith
cfd2797cf5 Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-24 15:59:49 +00:00
Oana Nechiforescu
c4e80b3cfd Merge branch 'feature/RM-4339_RestTestsGuideTopicApi' into 'master'
Feature/rm 4339 rest tests guide topic api

See merge request !135
2017-03-24 15:24:24 +00:00
Richard Smith
f950c7894e Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-24 11:36:15 +00:00
Ross Gale
15c831eac5 rm-4745 merging file 2017-03-24 11:07:59 +00:00
Tom Page
f6aeea6687 RM-4942 Ensure the API sorting is case insensitive.
Take notice of the locale of the server when performing the sort. Also
fix the security group and mark comparators to use the same system.
2017-03-23 14:22:19 +00:00
Oana Nechiforescu
c898ba8c2e Merge branch 'feature/RM-4339_RestTestsGuideTopicApi' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 2017-03-22 10:21:18 +02:00
Oana Nechiforescu
0578a469a7 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 2017-03-21 23:07:16 +02:00
Ross Gale
02ecacc364 Merge remote-tracking branch 'remotes/origin/feature/RM-4339_RestTestsGuideTopicApi' into feature/RM-4745_SubtopicsApiTests 2017-03-21 14:11:40 +00:00
Richard Smith
fa2aa51142 Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-21 14:07:00 +00:00
Oana Nechiforescu
f9000d6d80 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi 2017-03-21 10:55:16 +02:00
Tuna Aksoy
0f3523a681 Merge branch 'release/V2.5' into merge/RM-3265_toMaster_2 2017-03-21 06:14:37 +00:00
Tuna Aksoy
8591b2cad4 Merge branch 'release/V2.4' into merge-2.5/RM-3265_to2.5_3
Conflicts:
	pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
2017-03-21 06:09:44 +00:00
Tuna Aksoy
2c295a35f4 RM-4760 (Update source control management info in the parent pom) 2017-03-20 18:42:01 +00:00
Tuna Aksoy
3b84d35ed0 Fixed typo 2017-03-20 10:19:25 +00:00
Tuna Aksoy
a336e942e7 RM-4808 (Update Record Folder: Reopen a close folder via PUT request throw Permission denied exception) 2017-03-19 00:16:37 +00:00
Oana Nechiforescu
034f7ebf84 Some additional tests, plus review changes and Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/rm-enterprise-public-rest-context.xml
2017-03-18 21:11:23 +02:00
Richard Smith
f2e0935965 Merge branch 'master' into feature/RM-4113-Navigate-Clasification-Guide 2017-03-16 16:40:41 +00:00
Tuna Aksoy
68f460035e Merge branch 'merge/Merge_2332_2396' into 'master'
Merge/merge 2332 2396

See merge request !140
2017-03-16 08:03:04 +00:00
Tuna Aksoy
11ac1451c0 Merge branch 'release/V2.5' into merge/Merge_2332_2396
Conflicts:
	rm-automation/src/test/resources/module.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
2017-03-15 22:17:52 +00:00
Tuna Aksoy
b49015a804 Merge branch 'merge-2.5/Merge_2332_2396' into 'release/V2.5'
Merge 2.5/merge 2332 2396

See merge request !139
2017-03-15 21:54:29 +00:00