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
1,840 Commits 324 Branches 2,170 Tags
adda202a88a00d374f26bbebffcb80541c2d89ce
Commit Graph

1840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
adda202a88 Record-only merge release/V2.3.1.x into release/V2.3. 2017-04-18 08:13:23 +01: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
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
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
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
Ana Bozianu
3d7a93e3ce 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)
 2017-04-12 13:02:10 +01:00
David Webster
336d120ceb Merge remote-tracking branch 'origin/release/V2.2' into release/V2.3 2017-03-13 16:11:04 +00:00
David Webster
8e2f53ac09 Merge remote-tracking branch 'origin/release/V2.2.1.x' into release/V2.2 2017-03-13 16:09:24 +00:00
David Webster
0512d6a308 MNT-17550: Remove unnecessary file changes (should have been a record only merge from V2.3.0.x) 2017-03-10 16:00:23 +00:00
David Webster
4f355ad10d Merge branch 'release/V2.3.0.x' into release/V2.3 2017-03-10 15:53:13 +00:00
David Webster
3e3349a919 Merge branch 'release/V2.2' into release/V2.3 2017-03-10 15:51:22 +00:00
Samuel Langlois
ff00888ac4 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:57:15 +00:00
David Webster
9950f4868c MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:57:15 +00:00
Samuel Langlois
407e1f1e65 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:55:38 +00:00
David Webster
7dce59e4c8 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:55:38 +00:00
David Webster
5960df0286 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2017-03-10 14:52:23 +00:00
David Webster
50bb522a3e Update versions following release of 2.2.0.3 2017-03-10 14:48:11 +00:00
David Webster
b19235004d MNT-17550: Release 2.2.0.3 2017-03-09 17:02:39 +00:00
David Webster
52d46bef65 Merge branch 'hotfix-2.2/MNT-17550' into 'release/V2.2.0.x' 
MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up.

See merge request !114
 2017-03-09 13:16:14 +00:00
Samuel Langlois
c6a698ad55 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-09 11:37:13 +00:00
David Webster
a29ac3e653 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-09 10:55:37 +00:00
David Webster
57b4de11b2 MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up. 2017-03-08 16:05:00 +00:00
Tuna Aksoy
4090a7e66f Merge branch 'release/V2.3.0.x' into release/V2.3 2017-01-04 13:58:14 +00:00
Tuna Aksoy
373bac00e3 Updated version number to 2.3.0.10-SNAPSHOT 2017-01-04 13:54:12 +00:00
Tuna Aksoy
f4c344b54f Release RM 2.3.0.9 2017-01-04 12:40:14 +00:00
Tuna Aksoy
868766c586 Merge branch 'release/V2.3.0.x' into release/V2.3 2016-12-27 20:38:30 +00:00
Tuna Aksoy
e7133bd5c6 Copied the ui-automation code from release/v2.3 2016-12-20 11:04:18 +00:00
Tuna Aksoy
b9c4defdb9 Fixed Alfresco installer download config 2016-12-19 21:24:29 +00:00
Tuna Aksoy
ee2455d7c6 Set renditionService property for filePlanComponent bean definition 2016-12-19 20:41:11 +00:00
Tuna Aksoy
9c7ee3acd2 Added a check to see if the aspect hasn't been removed in the same 
transaction.
 2016-12-19 18:45:17 +00:00
Tuna Aksoy
2fd7720db5 MNT-17241 (Access denied exception thrown during preview of certain content by non-admin/non-site member users) 2016-12-19 13:45:52 +00:00
Oana Nechiforescu
1dbf09f994 Merge branch 'merge-2.3/Merge231ReleaseIn23' into 'release/V2.3' 
Merge 2.3/merge231 release in23

Merging 2.3.1 in 2.3

See merge request !623
 2016-11-11 15:45:18 +00:00
Tom Page
26e245b3f2 Merge release/V2.3.1.x into merge-2.3/Merge231ReleaseIn23. 2016-11-11 15:40:47 +00:00
Tom Page
46230c1181 Remove spurious temp file. 2016-11-11 15:39:37 +00:00
Oana Nechiforescu
071e1b3214 Merge commit 'c03c6da96' into merge-2.3/Merge231ReleaseIn23 
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-server/pom.xml
#	rm-share/pom.xml
 2016-11-11 14:40:57 +02:00
Tom Page
1476e389d6 Update version to 2.3.1.1-SNAPSHOT. 2016-11-09 13:48:25 +00:00
Tom Page
0a423f1660 Update version to 2.3.1. 2016-11-09 13:17:00 +00:00
roxana
8dd2e277cf Merge commit RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.3 2016-11-08 15:02:01 +02:00
Oana Nechiforescu
2eca420b59 Merge branch 'feature-2.3/RM-4313_UpdateDispositionNextActionDateWhenCurrentDateIsInThePast' into 'release/V2.3.1.x' 
Feature 2.3/rm 4313 update disposition next action date when current date is in the past

Update record disposition action as of date if it changed.

See merge request !598
 2016-11-07 21:12:53 +00:00
Tom Page
49e2754d55 Merge branch 'feature-2.3/RM-4247_UpdateDispositionProperty' into 'release/V2.3' 
Feature 2.3/rm 4247 update disposition property

RM-4247 Recalculate the "disposition as of" date if the period property changes.

See merge request !564
 2016-11-07 16:10:16 +00:00
Tom Page
6cf3411fe2 RM-4247 Fix typo. 2016-11-07 16:09:35 +00:00
Tom Page
ff27c94e25 Merge branch 'feature-2.3/RM-4307_AuditFix' into 'release/V2.3.1.x' 
Feature 2.3/rm 4307 audit fix

RM-4307 Cherry-pick fix from master.

See merge request !600
 2016-11-07 12:30:45 +00:00
Ana Bozianu
4d511bd0af fixed audit unit tests 
(cherry picked from commit e686da88de)
 2016-11-04 15:38:24 +00:00
roxana
71917d6d17 Revert changes and removed cache check. 2016-11-04 17:08:09 +02:00
Tom Page
683892ceb6 RM-4247 Merge release/V2.3 into feature-2.3/RM-4247_UpdateDispositionProperty. 2016-11-04 11:09:17 +00:00
Ana Bozianu
5200597182 RM-4249 - workaround : replaced maxEntries with a positive value 
(cherry picked from commit 995448081e)
 2016-11-04 10:51:27 +00:00