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
4,525 Commits 324 Branches 2,170 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

350 Commits

Author SHA1 Message Date
Ana Bozianu
ba795912e3 RM-4012 - added specific types, deleted duplicated code and use a core node 2016-10-10 23:44:49 +03:00
Tuna Aksoy
d25b0423fb Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
#	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
#	rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
#	rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
 2016-10-10 20:49:13 +01:00
Tuna Aksoy
89513a7316 Merge branch 'master' into feature/RM-4012_Category_REST_API 
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
	rm-enterprise/rm-enterprise-repo/pom.xml
 2016-10-09 16:21:15 +01:00
Tuna Aksoy
cba239d488 Merged V2.4 to V2.5 2016-10-07 14:42:43 +01:00
Tuna Aksoy
f0a83e23d1 Fixed failing integration and UI tests 2016-10-06 16:26:39 +01:00
Ana Bozianu
19e02d402c RM-4012 - moved the rest api to org.alfresco.rest.api package and extended nodes service 2016-10-06 16:34:01 +03:00
Tuna Aksoy
ffc926b37b Merged branch for v2.5 -> master 2016-10-05 22:05:30 +01:00
Tuna Aksoy
524ec7ba84 Merge branch 'release/V2.5' into merge/MergeV25ToMaster 2016-10-05 21:56:11 +01:00
Tuna Aksoy
0614914beb Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25 
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
 2016-10-05 15:20:19 +01:00
Ana Bozianu
62952a9306 Revert "Extracted RM Community REST API code to a separate project" 
This reverts commit 165c08749b.
 2016-10-05 16:16:52 +03:00
Tuna Aksoy
2db9730702 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
 2016-10-04 22:56:45 +01:00
Tuna Aksoy
165c08749b Extracted RM Community REST API code to a separate project 2016-10-04 12:28:39 +01:00
Ana Bozianu
85d5a80620 RM-4012 - rebamed to fileplan components and used nodes service 2016-10-04 13:01:19 +03:00
Ana Bozianu
3b284fbea9 RM-4012 - added the ig rest api 2016-10-03 14:35:20 +03:00
Tuna Aksoy
3465af3fab RM-4082 (Extend POM dependencies to include API Explorer) 2016-10-01 23:42:31 +01:00
Tuna Aksoy
9b4727ba5f Temp fix to mitigate different Alfresco versions in RM Community (5.2) and RM Enterprise (5.1) 2016-09-29 08:31:15 +01:00
Tom Page
eacfd00e0c Let git handle line endings for us. 2016-09-23 14:36:49 +01:00
Tom Page
cf26f9b207 Let git handle line endings for us. 2016-09-23 10:38:16 +01:00
Tom Page
b3b2585e99 Let git handle line endings for us. 2016-09-23 10:34:36 +01:00
Tom Page
014e9662bc Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Tom Page
cb2457641f Let git handle line endings for us. 2016-09-21 14:53:15 +01:00
Ana Bozianu
85db34ff48 Merge release/V2.4 into release/V2.5 2016-09-21 14:33:23 +03:00
Ana Bozianu
935d6319e1 Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Roy Wetherall
9aa85d22a0 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-19 10:20:28 +01:00
gbroadbent
790adce309 JAPANESE: Updated bundle based on EN-rev2016-08-16 2016-08-18 14:02:28 +01:00
gbroadbent
c4c6f2ef8c FRENCH: Updated bundle based on EN-rev2016-08-16 2016-08-18 11:31:08 +01:00
Roy Wetherall
73124cb633 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-17 10:54:02 +10:00
gbroadbent
4e03c1cdcd DUTCH: Updated Bundles based on EN-rev2016-08-09 2016-08-16 23:26:22 +01:00
gbroadbent
09cbc71d5b BRAZILIAN PORTUGUESE: Updated Bundles based on EN-rev2016-08-09 2016-08-16 23:03:06 +01:00
gbroadbent
054fcc6880 SIMPLIFIED CHINESE: Updated Bundles based on EN-rev2016-08-09 2016-08-16 22:06:42 +01:00
gbroadbent
3cc5f62fdb RUSSIAN: Updated Bundles based on EN-rev2016-08-09 2016-08-16 21:48:43 +01:00
gbroadbent
92526a5091 NORWEGIAN BOKMAL: Updated Bundles based on EN-rev2016-08-09 2016-08-16 21:20:34 +01:00
gbroadbent
d71123581e ITALIAN: Updated Bundles based on EN-rev2016-08-09 2016-08-16 13:06:58 +01:00
gbroadbent
09543f827c GERMAN: Updated Bundles based on EN-rev2016-08-09 2016-08-16 12:33:15 +01:00
gbroadbent
cf75ea0d78 SPANISH: Updated Bundles based on EN-rev2016-08-09 2016-08-16 11:35:52 +01:00
gbroadbent
bd5e2ac510 SPANISH: Updated Bundles based on EN-rev2016-08-09 (reverted from commit 4f8488aa52) 2016-08-16 11:28:00 +01:00
gbroadbent
4f8488aa52 SPANISH: Updated Bundles based on EN-rev2016-08-09 2016-08-16 11:26:20 +01:00
Roy Wetherall
a5f1540bd2 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-16 11:23:49 +10:00
gbroadbent
6e23c1fe9c FRENCH: Updated Bundles based on EN-rev2016-08-09 2016-08-15 12:43:22 +01:00
Roy Wetherall
9de6c32046 RM-3074: Integration tests 
* including fix for ghosted records being visible in collab sites
 2016-08-15 13:14:53 +10:00
Roy Wetherall
0c0abb4bb4 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-11 10:20:31 +10:00
Tom Page
4306c34f8e 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
Roy Wetherall
e93bd3b74a RM-3074: place common logic to get readers and writers of a node in one place 
* added getReadersAndWriters method to extended permission service
* refactored calling services, consolidating code into one location
* extended unit test

Note: getFullAuthenticatedUser has been removed from writers list as it
makes no logical sense since you must be a writer in order to perform
these operations in the first place.
 2016-08-09 11:20:50 +10:00
Andy Healey
1f848a87b2 DOCS-2292 2016-08-08 15:20:59 +01:00
Andy Healey
a88bdff642 DOCS-2292 2016-08-08 14:22:53 +01:00
Andy Healey
b2a117bb24 DOCS-2292 2016-08-08 11:55:57 +01:00
Andy Healey
b55c9362a4 DOCS-2292 2016-08-04 16:09:22 +01:00
Roxana Lucanu-Ghetu
a5ba1b3804 Created a property for AlfrescoRuntimeException instead ot the message. 2016-08-04 11:09:15 +10:00
Andy Healey
d619960d97 DOCS-2292 2016-08-03 15:26:15 +01:00
Andy Healey
e2cf96cc81 DOCS-2292 2016-08-03 15:21:27 +01:00