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
7,607 Commits 324 Branches 2,170 Tags
c5db115320a612d26759cf86a27ffd53fae23f37
Commit Graph

35 Commits

Author SHA1 Message Date
Sara Aspery
841340c1e8 Merge branch 'release/V2.7' into release/V3.0 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/apiTesting/SearchClassifiedContent.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkChecker.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/DocumentSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/RecordSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/SavedSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkCheckerUnitTest.java
 2020-01-02 16:15:49 +00:00
Sara Aspery
943dc45a10 Update license headers 2020-01-02 13:57:59 +00:00
Ross Gale
02093eac33 RM-6836 adding the severe and serious sonar fixes 
(cherry picked from commit 9f2336d487)
 2019-06-21 16:04:47 +03:00
Ross Gale
44cbc77aee RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
cabc902203 RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
Tom Page
0268299006 Updating license header to 2018 2018-01-16 12:31:06 +00:00
Ana Manolache
f908442af2 update headers to 2018 2018-01-03 12:01:00 +02:00
Tom Page
cb31194cb1 RM-5420 Code review fixes including move toIndentedString into a helper method. 2017-07-24 15:53:35 +01:00
Tom Page
45c4a83b87 RM-4942 Ensure the API sorting is case insensitive. 
Take notice of the locale of the server when performing the sort. Also
fix the security group and mark comparators to use the same system.
 2017-03-23 14:22:19 +00:00
Tuna Aksoy
3d7661746c Updated license headers 2017-01-01 11:52:56 +00:00
Tom Page
483bb55a13 Let git handle line endings for us. 2016-09-23 14:36:49 +01:00
Ana Bozianu
83fa0fec11 RM-2890 - updated json structure 2016-07-05 17:58:31 +03:00
Tom Page
fbc9c79ca2 Refactor WebScriptUtils to have consistent capitalisation of JSON. 
Also fix capitalisation in putValuetoJSONObject (so that it's now
putValueToJSONObject).
 2016-06-06 14:55:56 +01:00
Tuna Aksoy
54ad44883c RM-3276 (Edit and Application of Marks to a Single User) 2016-04-27 13:37:18 +01:00
Tom Page
0659402f13 RM-2812 Mark public API methods with @AlfrescoPublicAPI. 2016-04-19 16:24:46 +01:00
Tuna Aksoy
99de1973f4 RM-3132 (Update license headers) 2016-03-16 10:40:33 +00:00
Tuna Aksoy
78bcf02aa7 Merge branch 'release/V2.4' 2016-03-16 10:32:35 +00:00
Tuna Aksoy
8b9734d873 RM-3132 (Update license headers) 2016-03-16 10:26:58 +00:00
Tuna Aksoy
1882c86a38 Merge branch 'release/V2.4' 
Conflicts:
	rm-automation/src/main/java/org/alfresco/po/rm/rules/fileplan/CreateFilePlanRulePage.java
	rm-community/.editorConfig
	rm-community/.jshintrc
	rm-community/pom.xml
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java
	rm-enterprise/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/caveat-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/context/webscript-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/log4j.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/caveat-model.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/model/caveatModel.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/module-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroups.get.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ClearanceForAdminBootstrapComponent.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatException.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOCache.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrap.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOInterface.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/model/CaveatModel.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatAccessUtility.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroup.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatMark.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatUtils.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManager.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessor.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGet.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecorator.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/quickshare/ExtendedQuickShareServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/properties/local/alfresco-global.properties
	rm-enterprise/rm-enterprise-repo/src/main/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/caveat/CaveatsBootstrapTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassifyTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ClassificationRestApiTest.java
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImplUnitTestBase.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_NodeRefUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_UserUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/TestOnlyCaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrapUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManagerUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceServiceImplUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessorUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGetUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecoratorUnitTest.java
	rm-enterprise/rm-enterprise-share/.jshintrc
	rm-enterprise/rm-enterprise-share/pom.xml
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/renderers/ClassificationLabel.js
 2016-03-15 12:10:53 +00:00
Tuna Aksoy
80839e161e RM-3132 (Update license headers) 2016-03-14 16:17:53 +00:00
Tuna Aksoy
8237b6df2a RM-3132 (Update license headers) 2016-03-14 16:07:46 +00:00
Tuna Aksoy
ba3b6d337e RM-3132 (Update license headers) 2016-03-14 16:05:44 +00:00
Tuna Aksoy
b11ddb49e3 Reverted all license header related changes 2016-03-13 21:48:44 +00:00
Tuna Aksoy
cf287b5d62 RM-3132 (Update license headers) 2016-03-11 17:28:49 +00:00
Tuna Aksoy
2649d94a4a RM-3132 (Update license headers) 2016-03-11 17:05:12 +00:00
Tuna Aksoy
c68713ad5d RM-3132 (Update license headers) 2016-03-11 16:50:48 +00:00
Tuna Aksoy
a2d696d4a5 RM-3132 (Update license headers) 2016-03-11 16:44:23 +00:00
Roy Wetherall
f1ac097a2b Add missing headers 2016-03-08 12:17:01 +11:00
Roy Wetherall
e1e630a93e Merge remote-tracking branch 'origin/release/V2.4' 2016-03-08 11:44:25 +11:00
Roy Wetherall
d165a43353 Refresh license headers to include changes to community license and module description 2016-03-03 10:38:37 +11:00
Roy Wetherall
412353c044 Add managed license headers to community projects for java, js and ftl source files. 2016-03-01 13:06:00 +11:00
Roy Wetherall
2bbdd7cd48 Remove old license headers 2016-03-01 12:53:30 +11:00
Tom Page
9b755000e0 RM-2776 Move SortDirection to rm-community. 
This is a general-use enum, and so it should be somewhere fairly accessible.
 2016-02-15 14:24:46 +00:00
Tuna Aksoy
adf7e9630c RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise) 2016-01-31 20:11:15 +00:00
Tuna Aksoy
75a8ddff22 RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise) 2016-01-31 17:04:39 +00:00