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
3,890 Commits 324 Branches 2,170 Tags
858224064def46b51ccc23a2b17d9f74b5a003b9
Commit Graph

3890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ramona Popa
858224064d Merge branch 'feature/RM-4926_RMRelatedAspectsCanBeRemoved' into 'master' 
RM-4926 - added onRemoveAspect policy for RecordAspect

See merge request !237
 2017-04-28 13:07:22 +01:00
Ramona Popa
da6fcfc1b5 RM-4926 - added onRemoveAspect policy for RecordAspect 2017-04-28 13:07:22 +01:00
Ramona Popa
d52f479bc5 Merge branch 'release/V2.5' 2017-04-25 11:25:04 +03:00
Tom Page
3e7f89a40d Merge release/V2.5 into master. 
Merge of localisation changes from V2.5.
 2017-04-25 07:56:19 +01:00
Tom Page
b255247659 Record-only merge release/V2.5 into master. 2017-04-25 07:54:50 +01:00
Oana Nechiforescu
5422c8eee9 Merge branch 'feature/RM-4950Tests' into 'master' 
Feature/rm 4950 tests

See merge request !231
 2017-04-24 09:38:08 +01:00
Tom Page
2118319134 Merge branch 'feature/RM-4952_ReadOnlyParams' into 'master' 
Feature/rm 4952 read only params

See merge request !226
 2017-04-21 13:24:09 +01:00
Ramona Popa
dee2610acb Merge branch 'release/V2.5' into feature-2.5/RM-4985_AddPolicyNotificationRecordDeclaration 2017-04-21 11:57:02 +03:00
Ramona Popa
5b6b6e6b43 RM-4611 - missed some formatting 2017-04-21 11:51:57 +03:00
Ramona Popa
fff3b68f39 RM-4611 - removed some debug infos 2017-04-21 11:41:41 +03:00
Ramona Popa
c58a74a27b RM-4611 - modified integration test after review 2017-04-21 11:33:12 +03:00
gbroadbent
6e284bb3de FRENCH: Updated bundles based on EN rev2017-04-11. Fix for RM-4839 2017-04-21 09:26:13 +01:00
Tom Page
14932dfcc4 Increase travis_wait to thirty minutes. 
Our community build takes around about twenty minutes, and so was failing
occasionally with a time out.

Mirrored from community commit 3db1cda372c5824ca172002810b030f8fdc12860
 2017-04-21 07:52:12 +01:00
Tom Page
fa19f48bb6 RM-4952 Merge master into RM-4952_ReadOnlyParams. 2017-04-20 15:06:05 +01:00
Oana Nechiforescu
74d14d277c Merge remote-tracking branch 'origin/master' into feature/RM-4950Tests 2017-04-18 16:37:31 +03:00
Tom Page
fd91e8442f Record-only merge release/V2.4 into release/V2.5. 2017-04-18 10:26:40 +01:00
Tom Page
928235c72e Record-only merge release/V2.4.0.x into release/V2.4. 2017-04-18 10:25:35 +01:00
Tom Page
2d0775a588 Record-only merge release/V2.3 into release/V2.4. 2017-04-18 10:25:04 +01:00
Tom Page
a73d7d461b 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
adda202a88 Record-only merge release/V2.3.1.x into release/V2.3. 2017-04-18 08:13:23 +01:00
Tuna Aksoy
f105bd66c1 Merge branch 'release/V2.5' 2017-04-17 22:22:25 +01:00
Tuna Aksoy
a12f4af083 (Record only) Merge branch 'release/V2.4' into release/V2.5 2017-04-17 22:21:23 +01:00
alfresco-build
1a47c4c44c [maven-release-plugin] prepare for next development iteration 2017-04-17 19:48:35 +01:00
alfresco-build
e4fb71bfdb [maven-release-plugin] prepare release V2.4.1 ags-2.4.1 2017-04-17 19:48:32 +01:00
Tuna Aksoy
84098315fc 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
4daf95adc7 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
4e03515e83 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
b7f360216e Merge branch 'release/V2.4' into release/V2.5 2017-04-13 17:38:59 +01:00
Tom Page
17ed06b4fd 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
d809cb7879 RM-4611 - Add policy notification implementation and integration test 2017-04-13 17:18:08 +03:00
Tom Page
c7d6bc4850 Update version to 2.3.1.2-SNAPSHOT. 2017-04-13 14:47:41 +01:00
Tom Page
03488378e8 Update version to 2.3.1.1. 2017-04-13 14:11:51 +01:00
Tom Page
07d5a3e33c RM-5020 Merge release/V2.3.0.x into release/V2.3. 2017-04-13 12:39:57 +01:00
Tom Page
1bf47b9864 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
cf94e23efd SIMPLIFIED CHINESE 2017-04-13 11:10:30 +01:00
gbroadbent
50b363178d BRAZILIAN PORTUGUESE: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:09:49 +01:00
gbroadbent
1e92de45e3 RUSSIAN: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:09:01 +01:00
gbroadbent
1451479eb8 DUTCH: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:08:23 +01:00
gbroadbent
720558f187 NORWEGIAN BOKMAL: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:07:48 +01:00
gbroadbent
89f87a87c6 JAPANESE: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:07:06 +01:00
gbroadbent
7789ce215b ITALIAN: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:06:22 +01:00
gbroadbent
62f431ca82 SPANISH: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:05:30 +01:00
gbroadbent
d07fbc9f86 GERMAN: Updated bundles based on EN rev2017-04-11. 2017-04-13 11:04:18 +01:00
Ana Bozianu
d1094ff52b 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 54d673c176)
(cherry picked from commit 3d7a93e3ce)
 2017-04-13 10:15:26 +01:00
Ana Bozianu
80a84870f1 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 54d673c176)
(cherry picked from commit 3d7a93e3ce)
 2017-04-13 10:05:58 +01:00
Tom Page
4a42e5e33a 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
2d3d5f2648 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
de7d573ada (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
e70803c3ba RM-5013 Merge release/V2.3.1.x into release/V2.3. 2017-04-12 16:19:51 +01:00
Tom Page
e0ccb06ee5 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