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

174 Commits

Author SHA1 Message Date
Rodica Sutu
297af07a32 Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/FixesFrom2.5 
# Conflicts:
#	rm-automation/pom.xml
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/DataPrepHelper.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CreateRMSite.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/SecurityMarksOnContent.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/SearchClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/apiTesting/BaseApi.java
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
#	rm-enterprise/pom.xml
 2018-02-24 21:48:16 +02:00
Elena Hardon
8ad2f373b7 MNT-19114 - Made review changes 2018-02-19 13:40:52 +02:00
Elena Hardon
d8612fe1fd MNT-19114: Removed unused comments 2018-02-16 16:08:18 +02:00
Elena Hardon
6a3e742c5a MNT-19114 - Added integration test which shows that wiki pages can now be created as immediate folder type children under RM site 2018-02-16 16:07:18 +02:00
Tom Page
98765ca22c Updating license header to 2018 2018-01-16 12:31:06 +00:00
Tom Page
1cda9176a5 Updating license header to 2018 2018-01-16 12:21:10 +00:00
Ana Bozianu
8d376c5c30 RM-5617 - added integration test and fixed small issues discovered in the process 2017-10-24 17:30:39 +03:00
Ramona Popa
cbcc7c9ec7 RM-5647 - one more integration test + some fix & refactor 2017-10-03 17:21:34 +03:00
Ramona Popa
d54086e843 Merge branch 'feature/RM-5639_PreventClassificationBeyondParent_JavaAPI' into feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi 2017-10-03 16:02:21 +03:00
Ramona Popa
1c19e19598 RM-5647 - added java api functionality and some integration tests 2017-10-03 12:13:16 +03:00
Ana Bozianu
63be351b34 RM-5655 - moved the query in community 2017-09-28 09:17:56 +03:00
Ross Gale
105d43659e RM-5612 Changing versions and fixing failing tests 2017-09-07 10:33:56 +01:00
Tom Page
3bdbee6a01 RM-5309 Merge release/V2.5 into master. 2017-07-24 18:49:10 +01:00
Ramona Popa
c3a3136fb4 RM-5309 - added behaviour bean for qshare:shared aspect and integration test 2017-07-20 11:48:10 +03:00
Sara Aspery
c4342a2a03 fixing IDE whitespaces 2017-06-24 22:49:27 +01:00
Sara Aspery
7fee3f4323 Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-06-23 16:40:00 +01:00
Tuna Aksoy
651554b49b Merge branch 'feature-2.5/RM-5309_SharedFilesCannotBeClasified' into merge/20170620_RM25 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
 2017-06-20 16:07:26 +01:00
Sara Aspery
953d7b32f4 include_declare_record_refactoring_in_Rest 2017-06-20 11:12:22 +01:00
Sara Aspery
997ddd49b4 Revert "Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI" 
This reverts commit 8762162552, reversing
changes made to e9ba89f7bf.
 2017-06-20 08:27:09 +01:00
Ramona Popa
4e38904e6e RM-5309 - Added integration test for the case: when a record is declared, the shared link is removed 2017-06-19 17:46:34 +03:00
Tuna Aksoy
6e223c1f96 Move the code for completing a record from DeclareRecordAction to RecordServiceImpl 2017-06-14 19:38:45 +01:00
Tuna Aksoy
0a83b44d98 Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into 'release/V2.5' 
Feature 2.5/rm 5175 complete record missing metadata

See merge request !324
 2017-06-12 21:42:17 +01:00
Tuna Aksoy
96fdd50b39 Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into merge/RM_25 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
 2017-06-12 20:42:51 +01:00
Sara Aspery
d57ac09c1d RM-5175_Complete_record_with_missing_metadata changes after review 2017-06-12 16:42:05 +01:00
Tuna Aksoy
b1f84e86c5 RM-4689 (Can delete all RM site content through Repository browser) 
Manually backported following changes:

RM-4293
135c4e04e0

RM-4326
fce705ff72
0836e9682b
 2017-06-12 16:17:24 +01:00
Sara Aspery
bc0a9431ce RM-5175_Complete_record_with_missing_metadata 2017-06-10 23:50:15 +01:00
Sara Aspery
662e805f55 RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:21:49 +01:00
Ana Bozianu
60fb7d2051 Merge RM-5180 from 2.5 into master 2017-05-29 13:10:48 +03:00
Ana Bozianu
fa0ae148c3 RM-5180 - record rejection implementation and integration test 2017-05-25 18:53:15 +03:00
Ana Bozianu
c8e47639a3 RM-5012 - fix unit tests and cleanedup merge request 2017-05-17 16:04:54 +03:00
Ana Bozianu
097ebc28a5 RM-5012 - make record on first event and add identifier on commit or on record complete 2017-05-17 12:58:50 +03:00
Ana Bozianu
d662719915 RM-5012 - fix write records created in current transaction 2017-05-16 15:53:29 +03:00
Ana Bozianu
d726c682fa RM-5012 - fix integration test 2017-05-15 23:57:05 +03:00
Ana Bozianu
24e7370f40 RM-5012 - fix record folder children - 2 2017-05-15 23:31:42 +03:00
Ana Bozianu
35310e452f RM-5012 - fix some tests 2017-05-15 22:34:09 +03:00
Ana Bozianu
974397cff0 RM-5012 - fixed custom identifier issue 2017-05-12 18:54:31 +03:00
Ana Bozianu
ec580a1db4 RM-5012 - fixed tests 2017-04-29 12:57:29 +03:00
Ana Bozianu
aef81630b6 Revert "Merge branch 'feature/RM-4572_CreateRecordResponseContainsWrongName' into 'master' " 
This reverts commit a0710a379a, reversing
changes made to 7c4ead5bdf.
 2017-04-28 16:57:03 +03:00
Ramona Popa
dba85373ab RM-4926 - added onRemoveAspect policy for RecordAspect 2017-04-28 13:07:22 +01:00
Ramona Popa
f5decace91 Merge branch 'release/V2.5' 2017-04-25 11:25:04 +03:00
Ramona Popa
3ea1cad6dd RM-4611 - missed some formatting 2017-04-21 11:51:57 +03:00
Ramona Popa
cec0f84cce RM-4611 - removed some debug infos 2017-04-21 11:41:41 +03:00
Ramona Popa
7d23f57a60 RM-4611 - modified integration test after review 2017-04-21 11:33:12 +03:00
Ramona Popa
c43f014845 RM-4611 - Add policy notification implementation and integration test 2017-04-13 17:18:08 +03:00
Tuna Aksoy
11ac1451c0 Merge branch 'release/V2.5' into merge/Merge_2332_2396 
Conflicts:
	rm-automation/src/test/resources/module.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
 2017-03-15 22:17:52 +00:00
Tuna Aksoy
c1103ffbf5 Merge branch 'release/V2.4' into merge-2.5/Merge_2332_2396 2017-03-15 16:38:37 +00:00
Tuna Aksoy
e6ba677cfe Excluded system test from the test suite. 2017-03-15 16:35:22 +00:00
Ana Bozianu
343648614a Merge release/V2.5 into master 2017-03-15 17:59:21 +02:00
Tuna Aksoy
c9b6227036 RM-4804_Transfer_Completed_Records 2017-03-15 13:17:38 +00:00
Ana Bozianu
19ff92a4c1 Merge merge-2.5 into master 2017-03-15 13:17:37 +02:00