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
1,720 Commits 330 Branches 2,178 Tags
cc2046f31a260beaa48f59f66ce87761008eb20c
Commit Graph

1720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roy Wetherall
8dd1f0ff25 Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/RM-3114-2.3Merge 2016-06-24 15:26:22 +10:00
Tom Page
89a2d71e27 Merge branch 'feature-2.2/RM-3114_Merge' into 'release/V2.2' 
Feature 2.2/rm 3114 merge

RM-3114 Merge from release/V2.2.1.x to release/V2.2.

See merge request !251
 2016-06-21 08:42:00 +01:00
Tom Page
ae1e200920 Merge release/V2.2.1.x into release/V2.2. 
Conflicts:
	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
	rm-ui-tests/pom.xml
 2016-06-20 10:31:36 +01:00
Roxana Lucanu
094f64b3bb Updated version to 2.2.1.6-SNAPSHOT 2016-05-16 17:25:39 +03:00
Ana Bozianu
60e218c43b Merge release/V2.3.0.x into release/V2.3 2016-05-10 19:54:52 +03:00
Ana Bozianu
35ac5629e4 Update version to 2.3.0.6-SNAPSHOT 2016-05-10 19:54:29 +03:00
Ana Bozianu
4bc1869724 Update version to 2.3.0.5 2016-05-10 18:39:31 +03:00
Ana Bozianu
871df1d9b7 Merge release/V2.3.0.x into release/V2.3 2016-05-10 16:46:32 +03:00
Ana Bozianu
fb645153b6 Update version to 2.3.0.5-SNAPSHOT 2016-05-10 16:45:27 +03:00
Ana Bozianu
7afd921692 Revert "Update version to 2.3.0.5-SNAPSHOT" 
This reverts commit 6b1c6aeb46.
 2016-05-10 15:18:33 +03:00
Ana Bozianu
6b1c6aeb46 Update version to 2.3.0.5-SNAPSHOT 2016-05-10 15:17:33 +03:00
Ana Bozianu
0d15dfce21 Update version to 2.3.0.4 2016-05-10 15:09:57 +03:00
Tom Page
f02538d3bd Merge release/V2.3.0.x into V2.3. 2016-04-13 10:10:10 +01:00
Tom Page
a3cd0fe62f Update version to 2.3.0.4-SNAPSHOT. 2016-04-13 09:07:57 +01:00
Tom Page
b6e5311243 Update version to 2.3.0.3. 2016-04-13 09:06:16 +01:00
Roy Wetherall
2a2fa5e22d Merge branch 'hotfix/RM-3114-PatchFails' into 'release/V2.2.1.x' 
Hotfix/rm 3114 patch fails

- Update release version to 2.2.1.5
- make admin service a listener, ordered to execute last
- protect service behaviours from execution until custom map is loaded
- integration tests

@abozianu and @onechiforescu please take a look at this too.

See merge request !86
 2016-04-12 14:28:50 +01:00
Roy Wetherall
7af0399cbd RM-3114 - update version in POMs 2016-04-12 09:26:01 -04:00
Roy Wetherall
0585ea0a6b RM-3114 - review comments 2016-04-12 09:21:45 -04:00
Roy Wetherall
d3662ae95f RM-3114 - Integration tests 2016-03-30 09:32:28 +11:00
Roy Wetherall
08e2ae4042 RM-3114: Prevent access to custom map before it is ready 
- remove public init method from AdministrationService
- make admin service impl ordered listener, always goes last
- protect execution of service behaviours until custom map init'ed
 2016-03-29 13:09:56 +11:00
Roy Wetherall
69db6fc3dd Update release version to 2.2.1.5 2016-03-24 18:30:52 +11:00
Tom Page
358555c332 Merge release/V2.3.0.x into V2.3. 2016-02-18 08:25:03 +00:00
Tom Page
9fb2189bea Update version to 2.3.0.3-SNAPSHOT. 2016-02-18 08:16:49 +00:00
Tom Page
0f2347e8ba Update version to 2.3.0.2. 2016-02-18 07:35:28 +00:00
Tom Page
8384ec47cf Merge branch 'feature-2.3/RM-2968_CutoffQuery' into 'release/V2.3.0.x' 
Feature 2.3/rm 2968 cutoff query

See merge request !36
 2016-02-18 07:30:41 +00:00
Tom Page
ca46be936e RM-2968 Update disposition query used to find nodes to cutoff or retain. 2016-02-17 10:50:05 +00:00
Tom Page
f67c5fe319 Update version to 2.3.0.2-SNAPSHOT. 2016-02-17 10:36:53 +00:00
Tuna Aksoy
5ba5e74874 RM-2709 (The Add Relationship dialog is not displayed properly and is unusable on Alfresco 5.1) 2016-02-09 20:13:28 +00:00
Tom Page
4ebd2ee859 Merge V2.2 into V2.3. 2015-12-17 12:42:52 +00:00
Tom Page
3fa09f9eaf Merge V2.3.0.x into V2.3. 2015-12-17 12:42:27 +00:00
Tom Page
fb9363d662 RM-2871 Generate .gitignore file for V2.3.0.x. 2015-12-17 12:38:25 +00:00
Tom Page
0f8f1df9ad Merge V2.1 into V2.2. 2015-12-17 12:33:23 +00:00
Tom Page
8fdd591b99 Merge V2.2.1.x into V2.2. 2015-12-17 12:31:32 +00:00
Tom Page
f8827752b0 RM-2871 Generate .gitignore file for V2.2.1.x. 2015-12-17 12:30:04 +00:00
Tom Page
e97f12ebf1 Merge V2.0 into V2.1. 2015-12-17 12:20:10 +00:00
Tom Page
d7621d7b7d Merge branch V2.1.0.x into V2.1. 2015-12-17 12:17:26 +00:00
Tom Page
5e216fbfa2 RM-2871 Generate .gitignore file for V2.1.0.x. 2015-12-17 12:14:31 +00:00
Tom Page
70f01df2cf Merge V2.0.1.x into V2.0. 2015-12-17 12:09:46 +00:00
Tom Page
8d20c8d4c0 RM-2871 Generate .gitignore file for V2.0.1.x. 2015-12-17 12:08:16 +00:00
Tom Page
eeb678337d RM-2871 Generate .gitignore file for V2.0. 2015-12-17 12:03:18 +00:00
Tom Page
cfd89c6999 Merge branch 'feature/RM-2562_TestNameTypo' into 'V2.3' 
Feature/rm 2562 test name typo

Fix a typo in the test name and check if the merge request process works.

See merge request !3
 2015-12-17 08:51:56 +00:00
Tom Page
1fea2b7fd3 RM-2562 Fix typo in test name. 
Also testing merge review process, and merging between branches.
 2015-12-17 08:27:22 +00:00
Roy Wetherall
d422277f6e RM-2562: review feedback 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@120142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-14 22:29:02 +00:00
Roy Wetherall
cbbc25563f RM-2194: Review feedback 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@120140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-14 22:09:52 +00:00
Roy Wetherall
d8778ecf8f RM-2873: Browsing version history properties fails when version destroyed 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@120061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 22:09:07 +00:00
Roy Wetherall
f1b6a58137 RM-2194: Declare as Version Record Does Not Respect Specialized Type 
* RM-2856: Extend auto-version to trigger on type change
 * RM-2852: Integration tests

+review RM @tpage


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@119847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 00:22:38 +00:00
Roy Wetherall
bcb4287d3d Review RM-223 feedback 
* relates to RM-2562



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@119692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-06 23:36:29 +00:00
Roy Wetherall
a06b2299a9 RM-2562: Deleting record from versions produces inconsistent behaviour 
* Version history shows destroyed version despite meta-data shell of version record still being present (RM-2839)
 * Integration tests (RM-2842)

+review RM-223



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@119506 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-03 00:52:53 +00:00
Roy Wetherall
99142c2024 RM-2562: Deleting records from versions produces inconsistent behaviour 
* Versions are not deleted from collab version history, rather marked as destroyed (prevents inconsistencies since we don't support deleting versions well)
 * Share UI updated to acomadate above
 * Version relationship reorganised based on changes to version record history
 * Unit tests and integration tests for above
 * some unit tests relating to RM-2194
 * Hover message on version record icon in version history

+review RM



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@119284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-02 02:09:43 +00:00
Roy Wetherall
9bc668e8a6 RM-2194: unit tests used to demonstrate current behaviour 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@118277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-23 03:15:46 +00:00