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
4,087 Commits 330 Branches 2,178 Tags
fb215876b82053e06907b5e8b10a3ce75db2bf5c
Commit Graph

4087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristijan Conkas
0ce70b50da RM-4615: TAS version bump-up. 2017-01-27 11:16:56 +00:00
Kristijan Conkas
d2e6dac35c Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler 2017-01-27 09:29:09 +00:00
Tuna Aksoy
385d6fca1d RM-4617 (Update Repo/Share dependency for RM Community) 2017-01-26 23:01:37 +00:00
Oana Nechiforescu
eef879a140 Merge branch 'merge/Merge25ToMasterRM-4520' into 'master' 
Merge/merge25 to master rm 4520

See merge request !35
 2017-01-26 16:17:44 +00:00
Rodica Sutu
ed800f4ced Merge branch 'feature/RM-4568CreateElecWithRelativePath' into 'master' 
RM-4658

See merge request !36
 2017-01-26 16:00:07 +00:00
Rodica Sutu
4cd4501efa fix the test failure 2017-01-26 17:54:23 +02:00
Rodica Sutu
3e66cb5974 Merge branch 'feature/RM-4568CreateElecWithRelativePath' into 'master' 
Feature/rm 4568 create elec with relative path

See merge request !31
 2017-01-26 15:51:49 +00:00
Rodica Sutu
e0f29cfaa2 try to fix diff indentation 2017-01-26 17:50:47 +02:00
Rodica Sutu
aea517f0f7 formatting updates 2017-01-26 16:48:57 +02:00
Oana Nechiforescu
a6a8da3506 Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge25ToMasterRM-4520 
# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/page/SharePage.java
#	rm-automation/src/test/java/org/alfresco/test/enterprise/level2/audit/AuditAccessOnClassifiedContent.java
 2017-01-26 14:38:34 +02:00
Ana Bozianu
df919acfc7 RM-4619 - fixed unit tests 2017-01-26 12:16:54 +02:00
Ana Bozianu
f1d6e5a7b6 RM-4619 - moved the conversion to the specific types before the type check 2017-01-26 12:05:17 +02:00
Kristijan Conkas
c62789af8e Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler 2017-01-26 09:42:04 +00:00
Rodica Sutu
3d93d4e55d Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-4568CreateElecWithRelativePath 2017-01-26 11:17:43 +02:00
Tuna Aksoy
e604d2baa9 RM-4617: Removed workaround 2017-01-25 17:35:00 +00:00
Oana Nechiforescu
8203748823 Merge branch 'release/V2.4' of https://git.alfresco.com/records-management/records-management into merge-2.5/Merge24To25RM-4520 2017-01-25 18:18:17 +02:00
Kristijan Conkas
b4f43e2eee Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler 2017-01-25 15:17:51 +00:00
Tom Page
3ac2ffc1ae Merge branch 'feature/MNT-16881_PermissionHierarchyCheck' into 'master' 
MNT-16881 Check permission hierarchy using PermissionModel.

See merge request !28
 2017-01-25 15:17:34 +00:00
Kristijan Conkas
3e947a89c8 RM-4615: get record content implementation 2017-01-25 15:14:59 +00:00
Tuna Aksoy
eec77c5a49 RM-4617: Temporary solution to fix an issue on Bamboo 2017-01-25 14:59:47 +00:00
Kristijan Conkas
031ceb6010 RM-4615: javadoc tidy-up 2017-01-25 14:45:28 +00:00
Rodica Sutu
6003e223ff minor updates 2017-01-25 16:26:57 +02:00
Rodica Sutu
1ac49eed78 -remove properties block 2017-01-25 16:19:44 +02:00
Rodica Sutu
81bc3bae94 -add tests for the issue RM-4568 2017-01-25 16:16:33 +02:00
Tuna Aksoy
827da44cb3 Merge branch 'feature/RM-4576_Completed_records_can_be_modified' into 'master' 
RM-4576 (Completed records can be modified)

See merge request !5
 2017-01-25 13:42:00 +00:00
Tuna Aksoy
2d0b08ab93 RM-4576 (Updated the expected status code for the case when someone tries to modify the meta data of a closed record) 2017-01-25 13:42:03 +00:00
Kristijan Conkas
5343bbd556 RM-4615: TAS implementation of FilePlanComponentAPI.createElectronicRecord() 2017-01-25 13:30:29 +00:00
Rodica Sutu
acb4570b75 -add tests for the issue RM-4568 2017-01-25 14:12:33 +02:00
Tuna Aksoy
9691885b92 RM-4576 (Addressed review comments) 2017-01-25 12:05:15 +00:00
Kristijan Conkas
dcffcf8c3e RM-4615: removed hardcoding 2017-01-25 11:32:12 +00:00
Tom Page
c7aaa7b2e9 RM-4159 Wrap the RestWrapper rather than extending it. 
Previously we were hitting an issue where there were three beans all of the
type RestWrapper. This meant that Spring could not determine which bean
should be used when autowiring.  By wrapping the RestWrapper we ensure there
is only one bean of that type, and so Spring knows which bean to use (in the
TAS code).  After some debate I decided against renaming the RMRestWrapper
as RestWrapperWrapper.
 2017-01-25 11:07:11 +00:00
Kristijan Conkas
931b8698b1 RM-4615: taking TestData out of API wrapper to avoid compile-time problems. 2017-01-25 10:26:53 +00:00
Tom Page
f62ad8768a RM-4159 Getting enterprise UI tests to run. 
There's still currently an issue because we have two @Autowired @Primary beans of the same type.
 2017-01-25 08:31:42 +00:00
Kristijan Conkas
c520b9001d RM-4615: TAS bump-up + corresponding api wrapper changes 2017-01-24 18:15:41 +00:00
Tom Page
43f7864d70 MNT-16881 Fix typo in unit test. 
Due to the lack of ordering in hash sets, this was passing locally but
failing on Bamboo with a NPE.
 2017-01-24 11:45:39 +00:00
Tom Page
e26ba87906 MNT-16881 Fix unit test and write an additional one. 2017-01-24 11:30:26 +00:00
Tom Page
32e9282534 MNT-16881 Check permission hierarchy using PermissionModel. 
Use the permission group hierarchy to determine whether the configured
permissions imply the queried permission or not.
 2017-01-24 11:30:26 +00:00
Tom Page
dc1292833d MNT-16881 Add CreateChild permission to the write group. 
Note that the RM permission code in RecordsManagementPermissionPostProcessor
is not navigating the permission group hierarchy correctly. This is a simple
fix to solve the issue referenced, but the full fix will go into master.
 2017-01-24 11:21:35 +00:00
Tuna Aksoy
b9103bc8cd Updated Alfresco dependency for RM Community (Repo -> 5.2.e, Share -> 5.2.d) 2017-01-23 23:01:31 +00:00
Tuna Aksoy
bca4957b19 Merge branch 'master' into feature/RM-4576_Completed_records_can_be_modified 2017-01-21 22:07:22 +00:00
Tuna Aksoy
c3504f3590 RM-4576 (Completed records can be modified) 2017-01-20 22:58:43 +00:00
Tom Page
e1ce1f12b1 Merge branch 'merge/RM-3854_LockMethodSecurity' into 'master' 
Merge/rm 3854 lock method security

Merge fix to lock method security context and shortening of test name to master.

See merge request !18
 2017-01-20 15:01:10 +00:00
Silviu Dinuta
24f1a16650 Merge branch 'feature/RM-4568_relativePathForUploadRecords' into 'master' 
Feature/rm 4568 relative path for upload records

See merge request !21
 2017-01-20 10:49:32 +00:00
Silviu Dinuta
7823e020c4 RM-4568: removed some formating 2017-01-19 16:57:36 +02:00
Silviu Dinuta
6bb893f42e RM-4568: extended upload method to support relativePath creation and 
minor change in specification
 2017-01-19 16:53:19 +02:00
Tom Page
8b5f3cc0a3 RM-3854 Merge release/V2.5 into master. 2017-01-18 13:52:01 +00:00
Tom Page
d7a221270b Merge branch 'feature/RM-4262_ClassificationGuideJavaAPIInterface' into 'master' 
Feature/rm 4262 classification guide java api interface

RM-4262 Create Java public API interface for classification guide CRUD.

Also update the yaml file slightly.

See merge request !3
 2017-01-17 16:00:09 +00:00
Tom Page
fab097de01 RM-4262 Remove the ClassificationGuideQueryParams class. 
We can just use the generic QueryParams class instead.

Also rename SortField to QueryField, as it might later be used for
e.g. filtering too.
 2017-01-17 09:17:58 +00:00
David Webster
b00b6807eb Merge branch 'feature-2.5/RM-3854_Add_isLocked_security_context' into 'release/V2.5' 
RM-3854: Add access control mapping for LockService.isLocked method

Add mapping for LockService.isLocked method. JIRa refers to two new mapping required, but I've only added one as the other was added in RM-4259.

See merge request !10
 2017-01-16 15:31:16 +00:00
Tom Page
e3ce2dedad RM-4262 Refactor common code for making paged queries. 2017-01-16 14:24:51 +00:00