Commit Graph

2578 Commits

Author SHA1 Message Date
Oana Nechiforescu
3f38931f12 Updated test to use Cut Off as action label. 2016-08-09 17:53:39 +03:00
Andy Healey
464f6c72e2 Merge branch 'feature/UI_copy_full_review' into 'master'
Feature/ui copy full review

Full review of all strings to make compliant with the Alfresco writing guidelines.

See merge request !416
2016-08-09 10:21:38 +01:00
Tom Page
13dab42c3e Merge master into feature/UI_copy_full_review.
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/caveat-groups.get.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/renderers/i18n/CaveatGroup.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/CaveatService.properties
2016-08-09 09:10:00 +01:00
Andy Healey
f2c12293d7 DOCS-2292 2016-08-08 15:20:59 +01:00
Andy Healey
72ba618767 DOCS-2292 2016-08-08 14:22:53 +01:00
Andy Healey
0473df5bc7 DOCS-2292 2016-08-08 11:55:57 +01:00
Tom Page
19135093ff Merge branch 'feature/RM-2578_MergeToMaster' into 'master'
Feature/rm 2578 merge to master

See merge request !411
2016-08-08 11:24:46 +01:00
Tom Page
b137f998ab Merge release/V2.4 into master. 2016-08-08 11:21:50 +01:00
Tom Page
def4ed38fa Merge release/V2.3 into release/V2.4. 2016-08-08 11:20:21 +01:00
Tom Page
d59cd7e398 Merge release/V2.3.0.x into release/V2.3.
Conflicts:
	pom.xml
	rm-automation/pom.xml
	rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
	rm-server/pom.xml
	rm-share/config/alfresco/module/org_alfresco_module_rm_share/module.properties
	rm-share/pom.xml
2016-08-08 11:19:35 +01:00
Tom Page
0ea9fa7360 Update version to 2.3.0.7-SNAPSHOT. 2016-08-08 11:15:39 +01:00
Tom Page
222af4d651 Update version to 2.3.0.6. 2016-08-08 10:11:07 +01:00
Andy Healey
eaf23f9117 DOCS-2292 2016-08-04 16:09:22 +01:00
Roy Wetherall
92789b6ab3 Merge branch 'feature/outlook-integration' into 'master'
Feature/outlook integration

Added a profile that can be used to automatically download and install the repo and share outlook integration AMPs.

When used with a start-* profile it allows us to run OI and RM on our development environment.

For example: mvn install -f ./rm-enterprise/rm-enterprise-repo -Pstart-repo,outlook-integration.

See merge request !394
2016-08-03 23:46:30 +01:00
Roy Wetherall
d988e95066 Add information to README file about outlook integration profile 2016-08-04 08:15:30 +10:00
Andy Healey
e942de32f5 DOCS-2292 2016-08-03 15:26:15 +01:00
Andy Healey
feff07ccd4 DOCS-2292 2016-08-03 15:21:27 +01:00
Silviu Dinuta
e3154e1a1a Merge branch 'feature/RM-3643_PatchForUpdatingExistingUsersAndGroups_alternativeSolution' into 'master'
Feature/rm 3643 patch for updating existing users and groups alternative solution

Alternative solution for the adding the new aspect to authorities that have marks (patch from 2.5-EA1 to later versions)

See merge request !345
2016-08-03 10:13:49 +01:00
Silviu Dinuta
6fb21050d0 Merge remote-tracking branch master into
feature/RM-3643_PatchForUpdatingExistingUsersAndGroups_alternativeSolution
2016-08-03 11:36:03 +03:00
Ana Bozianu
5b1b95e71b Merge branch 'feature/RM-3708_LDAP_startup_error' into 'master'
Feature/rm 3708 ldap startup error

RM-3708 - [LDAP] Exception "NodeRef may not be null for calls to NodeService" is thrown in logs

The error is thrown when the application tries to run the disposition jobs as "$\{audit.rm.runas\}". When the value is not present in any property file the value is not interpreted.

This only reproduces when using some authentication chains because the authentication service is not reliable to check if a person exists. Some implementations of it just return true (AuthenticationServiceImpl) and some of them, in the best case scenario, reach person service to make the check.

As a fix I replaced authentication service with person service.

See merge request !378
2016-08-02 15:38:21 +01:00
Ana Bozianu
ade55de992 RM-3708 - replaced authentication service with person service 2016-07-28 10:20:24 +03:00
Andy Healey
6aeedc258e DOCS-2292 2016-07-27 11:32:12 +01:00
Andy Healey
3672d27c44 DOCS-2292 2016-07-27 11:03:59 +01:00
Andy Healey
2f7392e87f DOCS-2292 2016-07-27 10:58:17 +01:00
Andy Healey
42bbff9de1 DOCS-2292 2016-07-27 10:51:09 +01:00
Andy Healey
20a0141591 DOCS-2292 2016-07-27 10:11:38 +01:00
Andy Healey
bc4afa3dcf DOCS-2292 2016-07-27 10:10:11 +01:00
Andy Healey
3b6cd3d3a9 DOCS-2292 2016-07-27 09:53:21 +01:00
Roy Wetherall
8a2553c082 RM-3649: missing changes 2016-07-27 11:26:21 +10:00
Andy Healey
7564f21783 DOCS-2292 2016-07-26 17:01:56 +01:00
Andy Healey
51ddf8fc63 DOCS-2292 2016-07-26 16:45:10 +01:00
Andy Healey
7eaafc6502 DOCS-2292 2016-07-26 15:08:01 +01:00
Andy Healey
95e85f43c3 DOCS-2292 2016-07-26 14:49:21 +01:00
Andy Healey
1f4fb230ba DOCS-2292 2016-07-26 10:28:39 +01:00
Roy Wetherall
47149bdb57 RM-3649: missed hard coded error messages 2016-07-26 13:07:21 +10:00
Jean-Pierre
427e6e9ec8 Merge branch 'feature/BDE-743_Elastic' into 'master'
Change installer download logic for rm-automation

It changes from SCP to ANT get so Elastic Bamboo agents can download the installers.

This requires a change in the bamboo build plan for the {{installer.path}} variable

See merge request !362
2016-07-21 13:42:09 +01:00
Jean-Pierre
dda93bca24 BDE-743: Switch installer download to ANT get instead of SCP 2016-07-21 15:36:02 +03:00
Tuna Aksoy
832dfa90fc Merge branch 'feature/RM_2_5_with_Alfresco_5_1_1' into 'master'
Feature/rm 2 5 with alfresco 5 1 1

DO NOT MERGE THIS!!!

I will regularly merge master onto this branch and keep an eye on the builds. The results are looking good

See merge request !299
2016-07-21 08:44:04 +01:00
Tuna Aksoy
61357018d3 Removed H2 script workaround 2016-07-20 19:09:22 +01:00
Tuna Aksoy
71911afff9 Removed the staging repository 2016-07-20 17:48:50 +01:00
Tuna Aksoy
2423279e67 Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-20 17:35:04 +01:00
Roy Wetherall
32ff763fac Merge branch 'feature/RM-3558-recently-modified-marks' into 'master'
Feature/rm 3558 recently modified marks

@Tom can you take a look at this and let me know what you think.

The interesting changes are in the security mark content model.  I've run the builds and they were green with the exception of a couple of seemingly unrelated tests (rerunning that build now to see if it makes any difference)

See merge request !341
2016-07-20 05:58:28 +01:00
Roy Wetherall
d67a132b1f Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/RM-3558-recently-modified-marks 2016-07-20 09:14:59 +10:00
Tuna Aksoy
7876852e6a Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-19 19:52:56 +01:00
Andy Healey
4938968d9f Merge branch 'feature/RM-3649-rename-disposition' into 'master'
Feature/rm 3649 rename disposition

@ahealey can you take a look and see if you are happy with these changes please.

See merge request !352
2016-07-19 10:14:03 +01:00
Oana Nechiforescu
c480d3076b Merge branch 'feature/RM-3561_BreadcrumbTests' into 'master'
Feature/rm 3561 breadcrumb tests

Tests for RM-3561 and changes for the edit classification title.

See merge request !342
2016-07-19 09:30:23 +01:00
Roy Wetherall
77b5c99bb4 RM-3649: rename disposition to retention 2016-07-19 15:04:29 +10:00
Tuna Aksoy
f48bdba3dc Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-15 22:49:01 +01:00
Silviu Dinuta
8b0b4679b3 Merge master into
feature/RM-3643_PatchForUpdatingExistingUsersAndGroups_alternativeSolution
2016-07-15 19:31:38 +03:00
Tom Page
81f7c09d8b Merge release/V2.4 into master. 2016-07-15 08:19:20 +01:00