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
2,431 Commits 324 Branches 2,170 Tags
1d69a20a66cc8985c955fb65c6455dc2ad9c6563
Commit Graph

2431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
1d69a20a66 Fixed line endings 2016-07-01 23:03:43 +01:00
Tuna Aksoy
522c6b7a0c Fixed audit log issue 2016-07-01 22:56:45 +01:00
Tom Page
8fe79fb6ba Merge release/V2.5-EA1 into master. 2016-06-29 14:13:45 +01:00
Roxana Lucanu-Ghetu
1de53bd52b Merge branch 'feature/RM-3286' into 'master' 
Feature/rm 3286

Merge into master

See merge request !281
 2016-06-28 21:28:59 +01:00
Roxana Lucanu-Ghetu
28340b9285 Merge branch 'feature/RM-3060_mergeToMaster' into 'master' 
Feature/rm 3060 merge to master

Merge fix for record with multiple dispositions.

See merge request !280
 2016-06-28 21:26:58 +01:00
alfresco-build
604975fed9 [maven-release-plugin] prepare for next development iteration 2016-06-28 17:59:26 +01:00
alfresco-build
4c958e5a1a [maven-release-plugin] prepare release V2.5-EA1 ags-2.5-EA1 2016-06-28 17:59:23 +01:00
Samuel Langlois
3c906f6e90 Remove alfresco.rm.version property and use project.version instead, so the maven-release-plugin works 2016-06-28 16:56:29 +01:00
Samuel Langlois
d62d0bbcdd [maven-release-plugin] rollback the release of V2.5-EA1 2016-06-28 16:28:20 +01:00
Samuel Langlois
3cd7eb7bc1 Put alfresco.rm.version back in top-level only 2016-06-28 16:28:00 +01:00
Samuel Langlois
259ed57063 Get rid od alfresco.rm.version 2016-06-28 16:20:18 +01:00
Roxana Lucanu-Ghetu
3e715433f1 Merge RM-3286 2016-06-28 14:52:30 +03:00
Roxana Lucanu-Ghetu
ad3dac0874 Merge RM-3060 into master 2016-06-28 11:49:36 +03:00
Roxana Lucanu-Ghetu
6cbe022956 Merge branch 'feature/RM-3300_mergeToMaster' into 'master' 
Feature/rm 3300 merge to master

Merge RM-3300 into master

See merge request !264
 2016-06-28 09:45:59 +01:00
Roxana Lucanu-Ghetu
5fad0d2592 Merge commit '07db0973c4d4c718de5bf52c8dbcb4450c2f3d72' into feature/RM-3300_mergeToMaster 2016-06-28 11:39:49 +03:00
Roxana Lucanu-Ghetu
906cb992e1 Merge branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-3300_mergeToMaster 2016-06-27 16:58:24 +03:00
Tom Page
334a4f6e49 Record-only merge of commit '306c6f' into master. 2016-06-27 14:25:49 +01:00
Tom Page
d053b699bc Merge feature/RM-3341_MergeToMaster into Everything. 2016-06-24 17:25:38 +01:00
Roxana Lucanu-Ghetu
07db0973c4 no message 2016-06-24 17:43:52 +03:00
Mihai Cozma
4c511cd396 Merge commit 'af7fe8' into RM-3341_MergeToMaster 2016-06-24 17:03:11 +03:00
Mihai Cozma
03119d88f3 Merge commit '4d7581' into RM-3426_MergeToMaster 2016-06-24 16:54:11 +03:00
Roxana Lucanu-Ghetu
490bf686b9 Merge commit '019e9d637527b5592e8ee1854b6d2169a74d2fa4' into RM-3300_mergeToMaster 
RM-3300
 2016-06-24 13:47:15 +03:00
Roxana Lucanu-Ghetu
c8a05ad8f2 Merge commit 'd2b348b9d08465f9c202a9e0b1e9f211c3ccdf6c' into RM-3300_mergeToMaster 
RM-3300
 2016-06-24 13:45:50 +03:00
Roxana Lucanu-Ghetu
7a4d7d5b03 Merge commit 'cc5b9ee32d006f3e8c02010332411eadac101017' into RM-3300_mergeToMaster 
RM-3300
 2016-06-24 13:41:08 +03:00
Roxana Lucanu-Ghetu
d711ae1c1d Run the code as system, as some users may not have the rights to add the aspect. 2016-06-24 12:08:41 +03:00
Tom Page
4d7fcae9b9 RM-3566 Update security controls API. 
Create a Java API to allow adding and removing specified security controls
without affecting other marks on the node.
 2016-06-23 15:05:15 +01:00
Kristijan Conkas
41fe57f81a Merge branch 'feature/RM-3471_Fix_Latest_Aikau_Tests' into 'master' 
Feature/rm 3471 fix latest aikau tests

- Fixes tests to cater for Aikau 1.0.71.1.
- Bumps up Aikau to 1.0.71.1.
- Fixes some tests that were failing sporadically.

See merge request !246
 2016-06-17 10:17:20 +01:00
Roxana Lucanu-Ghetu
a431e84f8e Created a property for AlfrescoRuntimeException instead ot the message. 2016-06-17 12:05:19 +03:00
Roxana Lucanu-Ghetu
85b965dea9 Changed the test a bit and uncommented intial fix, as we agree it's an workaround for the moment. 2016-06-16 15:50:35 +03:00
Roxana Lucanu-Ghetu
019e9d6375 Changed to BehaviourDrivenTest to be more obvious the steps and what is checked. 2016-06-15 12:01:47 +03:00
Kristijan Conkas
4e56a1ae2f Merge remote-tracking branch 'origin/master' into feature/RM-3471_Fix_Latest_Aikau_Tests 2016-06-14 09:52:15 +01:00
David Webster
8275ce6a51 Merge remote-tracking branch 'origin/feature/RM-3134_caveat_package_rename' 2016-06-10 22:28:49 +01:00
Kristijan Conkas
0b40650694 RM-3471: Fix for ClassifyContentDialog + HtmlElements bump-up 2016-06-10 10:04:42 +01:00
Roy Wetherall
563cae7555 Changes to integration to better reflect the scenario to be tested 2016-06-09 13:53:07 +10:00
David Webster
1e187d8f36 RM-3134: Fix community build - delete files not deleted by previous revert 2016-06-08 19:36:13 +01:00
Tom Page
1ea82ae380 Merge branch 'feature/WebScriptUtilsCapitalisation' into 'master' 
Feature/web script utils capitalisation

Fix capitalisation in a few method names in WebScriptUtils.

This also provides an opportunity to test whether the mirroring script works, as this includes changes to community files.

See merge request !218
 2016-06-08 17:16:57 +01:00
Mihai Cozma
c838cb2aaf Merge branch 'feature-2.4/RM-3341_Emails_can_be_added_to_the_HoldsTransfers' into 'release/V2.4' 
Feature 2.4/rm 3341 emails can be added to the holds transfers

See merge request !217
 2016-06-08 12:34:11 +01:00
David Webster
bdeae2912a RM-3134: Revert change to rm-community caveat code as legacy feature isn't being renamed 2016-06-08 10:05:02 +01:00
David Webster
5411d5ea12 RM-3134: Rename caveat package securitymarks 2016-06-07 15:46:50 +01: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
Mihai Cozma
a5b59b4356 RM-3341 - Outlook Integrations:Emails can be added to the Holds 
/Transfers from Outlook Integration
 2016-06-06 11:21:51 +03:00
Roxana Lucanu-Ghetu
3d74c81abc Moved check for content to be done on commit. 2016-06-06 10:25:46 +03:00
Roxana Lucanu-Ghetu
c6c9edf306 Added check to allow creating only records inside a record folder. 2016-06-03 11:10:18 +03:00
Roxana Lucanu-Ghetu
e9bb18f9f5 Changed test class and commented initial fix. 2016-06-01 17:41:36 +03:00
Mihai Cozma
ac0a7e7016 Create Hold and Transfer container exception 2016-05-31 18:16:32 +03:00
Roxana Lucanu-Ghetu
f4ac24d41f Added integration test. 2016-05-31 14:50:27 +03:00
Tuna Aksoy
5b8a4b02ca RM-3426 (Number of artifacts for the RM Enterprise project - Update configuration) 2016-05-23 12:03:00 +01:00
Mihai Cozma
2f08a32d53 Merge remote-tracking branch 'origin/master' into feature/Merge2.4ToMaster 2016-05-20 17:19:49 +03:00
Mihai Cozma
d11451c434 Merge commit '33f978' into feature/Merge2.4ToMaster 2016-05-20 15:33:55 +03:00
Tom Page
8634250b78 Merge release/V2.4 into Merge2.4ToMaster. 
Conflicts:
	rm-community/rm-community-repo/pom.xml
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
 2016-05-20 11:53:58 +01:00