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
4,525 Commits 324 Branches 2,170 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

4525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
3f25832d50 Record-only merge release/V2.4.0.x into release/V2.4. 2017-04-18 10:25:35 +01:00
Tom Page
c4e81b2f46 Record-only merge release/V2.3 into release/V2.4. 2017-04-18 10:25:04 +01:00
Tom Page
0ad61203f8 RM-4952 Add automation test for this bug. 
Also remove setters from POJOs (and replace with builders where necessary).
 2017-04-18 09:46:45 +01:00
Tom Page
d231772e75 Record-only merge release/V2.3.1.x into release/V2.3. 2017-04-18 08:13:23 +01:00
Tuna Aksoy
2ff30a8f2d Merge branch 'release/V2.5' 2017-04-17 22:22:25 +01:00
Tuna Aksoy
622b8874fa (Record only) Merge branch 'release/V2.4' into release/V2.5 2017-04-17 22:21:23 +01:00
alfresco-build
b76769d2b4 [maven-release-plugin] prepare for next development iteration 2017-04-17 19:48:35 +01:00
alfresco-build
548e19e159 [maven-release-plugin] prepare release V2.4.1 2017-04-17 19:48:32 +01:00
Tuna Aksoy
9c817c9f92 Merge branch 'merge/merge_release_v25_14042017_2' into 'master' 
Merge/merge release v25 14042017 2

See merge request !225
 2017-04-15 19:58:49 +01:00
Tuna Aksoy
e8e24f40d2 Merge branch 'release/V2.5' into merge/merge_release_v25_14042017_2 
Conflicts:
	rm-automation/pom.xml
 2017-04-14 23:56:00 +01:00
Oana Nechiforescu
fede2c1b73 Merge branch 'feature/RM-4946MoveAPIs' into 'master' 
Feature/rm 4946 move apis

See merge request !204
 2017-04-14 07:40:48 +01:00
Tuna Aksoy
6a340b0651 Merge branch 'release/V2.4' into release/V2.5 2017-04-13 17:38:59 +01:00
Tom Page
5a67660ffc Merge branch 'feature-2.4/RM-5013_VitalRecordPreventsAccess' into 'release/V2.4.0.x' 
RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'"

See merge request !218
 2017-04-13 15:45:59 +01:00
Ramona Popa
c43f014845 RM-4611 - Add policy notification implementation and integration test 2017-04-13 17:18:08 +03:00
Tom Page
dfddbe840e Update version to 2.3.1.2-SNAPSHOT. 2017-04-13 14:47:41 +01:00
Tom Page
daffe519a0 Update version to 2.3.1.1. 2017-04-13 14:11:51 +01:00
Tom Page
8c275a8665 RM-5020 Merge release/V2.3.0.x into release/V2.3. 2017-04-13 12:39:57 +01:00
Tom Page
cff104726a Merge branch 'merge-2.3/RM-5013_VitalRecordPreventsAccess_230x' into 'release/V2.3.0.x' 
RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'"

See merge request !217
 2017-04-13 12:39:00 +01:00
gbroadbent
650525aaeb SIMPLIFIED CHINESE 2017-04-13 11:10:30 +01:00
gbroadbent
5dfe01fbb9 BRAZILIAN PORTUGUESE: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:09:49 +01:00
gbroadbent
afc42b8d2b RUSSIAN: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:09:01 +01:00
gbroadbent
4b9924bb47 DUTCH: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:08:23 +01:00
gbroadbent
8236624355 NORWEGIAN BOKMAL: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:07:48 +01:00
gbroadbent
8ed9f4bc89 JAPANESE: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:07:06 +01:00
gbroadbent
341cfb1d64 ITALIAN: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:06:22 +01:00
gbroadbent
34aaaa17d5 SPANISH: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:05:30 +01:00
gbroadbent
ae43bb0f14 GERMAN: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:04:18 +01:00
Ana Bozianu
8ca8fd1013 RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'" 
Hotfix 2.5/mnt 17007 solr query

2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue
MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed
RM-4249 - RM Audit doesn't work with alfresco 5.2

See merge request !602

Nb. This does not copy across the updates to the automation tests.

(cherry picked from commit f19ece3538)
(cherry picked from commit 1822c418f7)
 2017-04-13 10:15:26 +01:00
Ana Bozianu
2d6b9b964e RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'" 
Hotfix 2.5/mnt 17007 solr query

2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue
MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed
RM-4249 - RM Audit doesn't work with alfresco 5.2

See merge request !602

Nb. This does not copy across the updates to the automation tests.

(cherry picked from commit f19ece3538)
(cherry picked from commit 1822c418f7)
 2017-04-13 10:05:58 +01:00
Tom Page
c18ce6dccf RM-5013 Record-only merge release/V2.3 into release/V2.4. 
The issue has already been backported to all releases from V2.4.1 (not yet
released) onwards.
 2017-04-13 06:19:57 +01:00
Tom Page
9dc32c088b Merge branch 'merge-2.3/RM-5013_VitalRecordPreventsAccess' into 'release/V2.3' 
Merge 2.3/rm 5013 vital record prevents access

See merge request !214
 2017-04-13 06:16:54 +01:00
Tuna Aksoy
49992c529d (RECORD ONLY) Merge branch 'release/V2.4' into release/V2.5 
Conflicts:
	rm-automation/src/main/java/org/alfresco/po/rm/dialog/classification/ClassifyContentDialog.java
	rm-automation/src/main/java/org/alfresco/po/share/browse/ListItem.java
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-references.get_de.properties
	rm-community/rm-community-share/pom.xml
 2017-04-12 23:03:36 +01:00
Tom Page
619b0a1ea6 RM-5013 Merge release/V2.3.1.x into release/V2.3. 2017-04-12 16:19:51 +01:00
Tom Page
8c27c75c8c Merge branch 'feature-2.3/RM-5013_VitalRecordPreventsAccess' into 'release/V2.3.1.x' 
RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'"

See merge request !213
 2017-04-12 16:17:05 +01:00
Oana Nechiforescu
bd718bd680 Merge remote-tracking branch 'origin/feature/RM-4946MoveAPIs' into feature/RM-4950Tests 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
 2017-04-12 16:37:57 +03:00
Oana Nechiforescu
8491130d20 First changes for the instructions with marks tests. Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4950Tests 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
 2017-04-12 16:22:14 +03:00
Oana Nechiforescu
a24c4bb7df Additional re-factoring. 2017-04-12 16:07:42 +03:00
Oana Nechiforescu
8e6aefc2e9 Merge branch 'feature-2.5/RM-4946PomChangesFor25' into 'release/V2.5' 
The only pom changes needed for release 2.5.

See merge request !205
 2017-04-12 13:29:36 +01:00
Oana Nechiforescu
004af33cdc Review changes + records management service API methods moved to specific classes. Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4946MoveAPIs 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
 2017-04-12 15:22:16 +03:00
Ana Bozianu
1822c418f7 RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'" 
Hotfix 2.5/mnt 17007 solr query

2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue
MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed
RM-4249 - RM Audit doesn't work with alfresco 5.2

See merge request !602

Nb. This does not copy across the updates to the automation tests.

(cherry picked from commit f19ece3538)
 2017-04-12 13:02:10 +01:00
Ramona Popa
0406e15de7 Merge branch 'feature/RM-4639_REST_API_Refactoring_2' into 'master' 
Feature/rm 4639 rest api refactoring 2

See merge request !209
 2017-04-12 07:36:12 +01:00
Tuna Aksoy
62a01f103f Feature/rm 4639 rest api refactoring 2 2017-04-12 07:36:12 +01:00
gbroadbent
4efc36936c GERMAN: Amended files for the use of the term "Child" 2017-04-11 16:48:18 +01:00
Tom Page
a2a0a12bea Record-only merge of release/V2.5 into master. 2017-04-11 13:24:20 +01:00
Tom Page
09c319c926 Record-only merge of release/V2.4 into release/V2.5. 2017-04-11 13:22:56 +01:00
Tom Page
b8b5e4eabf Record-only merge of release/V2.4.0.x into release/V2.4. 
Both branches have been recently localised, so no changes need to be merged
across from release/V2.4.0.x.
 2017-04-11 13:20:50 +01:00
Tuna Aksoy
232c4f7e70 Merge branch 'merge/Merge_RM-4997' into 'master' 
Merge/merge rm 4997

See merge request !208
 2017-04-11 06:34:05 +01:00
Tuna Aksoy
5f8e88a396 Merge branch 'release/V2.5' into merge/Merge_RM-4997 
Conflicts:
	rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
	rm-automation/src/test/java/org/alfresco/test/community/level2/filePlan/DestroyRecordFolderActions.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
 2017-04-10 22:59:27 +01:00
Tuna Aksoy
2427034a1f Merge branch 'release/V2.4' into merge-2.5/Merge_RM-4997 2017-04-10 21:00:28 +01:00
Tuna Aksoy
32c8e0aaa2 Merge branch 'feature-2.4/RM-4997' into release/V2.4 2017-04-10 20:58:39 +01:00