inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,212 Commits 330 Branches 2,178 Tags
f49cd946e188a8421fc999346717a3323cb1538b
Commit Graph

3212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
5be1ed731d Merge release/V2.3.1.x into merge-2.3/Merge231ReleaseIn23. 2016-11-11 15:40:47 +00:00
Tom Page
bea04479ad Remove spurious temp file. 2016-11-11 15:39:37 +00:00
Mihai Cozma
5cec2cd59a Merge branch 'release/V2.5' of gitlab.alfresco.com:records-management/records-management into release/V2.5 2016-11-11 14:46:24 +02:00
Oana Nechiforescu
0caedb4589 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
Ana Bozianu
9e5ab0b6ed read only merge release/V2.5.0.x into release/V2.5. 
2.5.0.x changes have been commited in 10b64c0
 2016-11-11 12:32:10 +02:00
Mihai Cozma
375c7e1b13 Merge branch 'feature/RM-4329_Alfreco_Search_in_colaboration_site_doesn't_work' into 'master' 
Feature/rm 4329 alfreco search in colaboration site doesn't work

See merge request !616
 2016-11-11 09:50:21 +02:00
Tom Page
dff54658ab Merge branch 'merge-2.5/RM-4264_RelationshipDialog' into 'release/V2.5' 
Merge 2.5/rm 4264 relationship dialog

RM-2526, RM-4264 Merge release/V2.4 into release/V2.5.

See merge request !620
 2016-11-10 13:58:09 +00:00
Tom Page
a75f2d4a1d RM-2526, RM-4264 Merge release/V2.4 into release/V2.5. 2016-11-10 10:52:59 +00:00
Tom Page
9ab1024c7b RM-2526, RM-4264 Merge changes from release/V2.3 to release/V2.4. 2016-11-10 08:17:12 +00:00
Tom Page
d376ae50c3 Update version to 2.3.1.1-SNAPSHOT. 2016-11-09 13:48:25 +00:00
Tom Page
3b75d70ba7 Update version to 2.3.1. 2016-11-09 13:17:00 +00:00
Ana Bozianu
10b64c082c Merge merge-2.5/2.5.0.x_to_2.5 into release/V2.5 2016-11-09 14:41:13 +02:00
Tom Page
64f7132913 Merge branch 'merge-2.5/RM-4247_UpdateDispositionProperty' into 'release/V2.5' 
Merge 2.5/rm 4247 update disposition property

RM-4247 Ensure that changes to the disposition property cause the "as of" date to be recalculated.

See merge request !609
 2016-11-09 08:09:45 +00:00
Roxana Lucanu-Ghetu
ac8c7388d2 Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/RM-2526 2016-11-08 17:35:25 +02:00
Tom Page
81e1ece309 RM-4247 Merge release/V2.4 into release/V2.5. 2016-11-08 13:25:45 +00:00
Tom Page
11abb8960f Merge branch 'merge-2.4/RM-4247_UpdateDispositionProperty' into 'release/V2.4' 
Merge 2.4/rm 4247 update disposition property

RM-4247 Ensure that changes to the disposition property cause the "as of" date to be recalculated.

See merge request !606
 2016-11-08 13:21:55 +00:00
roxana
0282e1af68 Merge commit RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.3 2016-11-08 15:02:01 +02:00
Oana Nechiforescu
884947b0e6 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
f70bee356f RM-4247 Merge release/V2.3 into release/V2.4. 2016-11-07 16:12:20 +00:00
Tom Page
efbe7ab8c1 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
2e48e3207f RM-4247 Fix typo. 2016-11-07 16:09:35 +00:00
Ana Bozianu
5ad8cbde8d Merge release/V2.5.0.x to release/V2.5 2016-11-07 17:18:23 +02:00
alfresco-build
d3c03b9f76 [maven-release-plugin] prepare for next development iteration 2016-11-07 12:46:02 +00:00
alfresco-build
20e505e50b [maven-release-plugin] prepare release V2.5.0.1 2016-11-07 12:45:59 +00:00
Tom Page
dcdef19025 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
f19ece3538 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

We also updated the automation tests

See merge request !602
 2016-11-04 16:40:30 +00:00
Ana Bozianu
c6810b33dd fixed audit unit tests 
(cherry picked from commit 7a33945dff)
 2016-11-04 15:38:24 +00:00
Ana Bozianu
d457a67cf6 Revert "updated tag for next development iteration" 
This reverts commit 8ce501035b.
 2016-11-04 17:26:32 +02:00
roxana
373439822c Revert changes and removed cache check. 2016-11-04 17:08:09 +02:00
Tom Page
43b8f3eba1 RM-4247 Merge release/V2.3 into feature-2.3/RM-4247_UpdateDispositionProperty. 2016-11-04 11:09:17 +00:00
Ana Bozianu
59c6fcca39 RM-4249 - workaround : replaced maxEntries with a positive value 
(cherry picked from commit 4b76fb838f)
 2016-11-04 10:51:27 +00:00
roxana
cb11d527d4 Update record disposition action as of date if it changed, to have the same value as next disposition action as of date. 2016-11-04 10:19:24 +02:00
Ana Bozianu
43287c1035 fixed audit unit tests 
(cherry picked from commit 7a33945dff)
 2016-11-04 09:46:29 +02:00
Ana Bozianu
23a3e9af5d RM-4249 - workaround : replaced maxEntries with a positive value 
(cherry picked from commit 4b76fb838f)
 2016-11-03 15:30:21 +02:00
Ana Bozianu
4a542c78a4 Revert "added classifier to amp atrtifacts" 
This reverts commit c27ac5cd6a.
 2016-11-02 16:42:05 +02:00
Ana Bozianu
49d5d9cb88 updated scp alfresco installer path 2016-11-02 16:21:55 +02:00
Ana Bozianu
c27ac5cd6a added classifier to amp atrtifacts 2016-11-02 15:50:21 +02:00
Ana Bozianu
8ce501035b updated tag for next development iteration 2016-11-02 15:12:49 +02:00
Roxana Lucanu-Ghetu
bcc462cab3 Merge branch 'feature-2.3/RM-4280_UpdateDispositionWhenLinking&Unlinking' into 'release/V2.3.1.x' 
Feature 2.3/rm 4280 update disposition when linking&unlinking

This should also fix RM-4292.

See merge request !589
 2016-11-02 12:36:46 +00:00
Ana Bozianu
25264220ef added original fetch amps back 2016-11-02 14:31:51 +02:00
Ana Bozianu
09963624d6 temporary removed fetch amps 2016-11-02 13:42:49 +02:00
Ana Bozianu
fb998a4b5f changed amp artifacts location 2016-11-02 12:28:19 +02:00
Ana Bozianu
3494f9b826 moved fetch-amps execution to maven-antrun-plugin 2016-11-02 11:06:18 +02:00
Ana Bozianu
19f16756b4 changed fetch-amps goal from copy to run 2016-11-02 10:59:43 +02:00
Ana Bozianu
e922bac36d get RM amps with scp 2016-11-02 10:54:18 +02:00
Ana Bozianu
0e8ba89905 get the alfresco installer with scp 2016-11-01 17:29:27 +02:00
Ana Bozianu
b1cf8bf93e changed bamboo user password to bamboo_auth.password 2016-11-01 15:38:36 +02:00
Ana Bozianu
ff574212d0 Revert "try placeholder bamboo_auth_ldap_password" 
This reverts commit 15fdde0009.
 2016-11-01 15:31:28 +02:00
roxana
8c69fd1399 Changed the test a bit to check a more complex case. 2016-11-01 15:25:04 +02:00
Ana Bozianu
15fdde0009 try placeholder bamboo_auth_ldap_password 2016-11-01 15:16:17 +02:00