Commit Graph

60 Commits

Author SHA1 Message Date
alfresco-build
f5fb1323e3 [maven-release-plugin] prepare for next development iteration 2016-11-03 16:34:58 +00:00
alfresco-build
db6e36cc91 [maven-release-plugin] prepare release 6.5 2016-11-03 16:34:55 +00:00
Stefan Kopf
4117eb8cdb Merge branch 'REPO-1259' into 'master'
Repo 1259

Part of fix for Repo1259.

* remove commented out code
* fix code formatting (CMISAbstractDictionaryService)
* fix up how the CMIS dictionary is refreshed after a dictionary refresh: dictionaryListener.afterDictionaryInit() is called _after_ the dictionary is made live (including changes to CompiledModelsCache to achieve this).

See merge request !3
2016-11-03 16:14:02 +00:00
Stefan Kopf
22310ffc32 Upgrade to a released version of alfresco-core 2016-11-03 16:49:41 +01:00
Stefan Kopf
5f2a42b672 Merge remote-tracking branch 'origin/master' into REPO-1259 2016-11-03 16:45:00 +01:00
Stefan Kopf
4a8705dac8 Merge branch 'REPO-1219' into 'master'
Repo 1219

Updated docs to include references to the new url providers

See merge request !2
2016-11-03 15:14:35 +00:00
alfresco-build
0b01be3062 [maven-release-plugin] prepare for next development iteration 2016-11-02 20:21:52 +00:00
alfresco-build
5bab9d4f83 [maven-release-plugin] prepare release 6.4-RC2 2016-11-02 20:21:50 +00:00
Steven Glover
1a64e23032 MNT-16541: "Cache update for custom workflow model fails" no need to refresh the cache in destroy. Reset will refresh the cache in getDictionaryRegistry anyway 2016-11-02 20:08:49 +00:00
alfresco-build
0a2d597224 [maven-release-plugin] prepare for next development iteration 2016-11-02 13:49:03 +00:00
alfresco-build
5eda85c86c [maven-release-plugin] prepare release 6.4-RC1 2016-11-02 13:49:01 +00:00
Steven Glover
0b7d5b1a74 MNT-16541: "Cache update for custom workflow model fails" update alfresco-core dependency 2016-11-02 13:10:43 +00:00
Steven Glover
d95cabd728 Revert "MNT-16541: "Cache update for custom workflow model fails" create RC1 for testing"
This reverts commit d39abecf81.
2016-11-02 13:08:22 +00:00
Steven Glover
d39abecf81 MNT-16541: "Cache update for custom workflow model fails" create RC1 for testing 2016-11-02 12:41:32 +00:00
Steven Glover
a7378ac0fc MNT-16541: "Cache update for custom workflow model fails" 2016-11-02 12:41:13 +00:00
alfresco-build
572c81635d [maven-release-plugin] prepare for next development iteration 2016-11-01 16:16:51 +00:00
alfresco-build
d9c7727cfa [maven-release-plugin] prepare release 6.4 2016-11-01 16:16:49 +00:00
aleahu
a5d2742ac8 REPO-1219: Allow file content URLs to be generated by a provider
- merge implementation from ACE-5093
2016-11-01 11:32:26 +02:00
Steven Glover
4b3930e124 MNT-16541 "Cache update for custom workflow model fails" remove CMISDictionaryReload workaround, fix formatting, remove commented out code, fix write locks (locks were too wide) 2016-10-31 18:22:36 +00:00
Gethin James
5d4e9d3634 SEARCH-224: Removed unused enum values 2016-10-31 14:15:07 +01:00
alfresco-build
cd7bf82f1c [maven-release-plugin] prepare for next development iteration 2016-10-26 09:14:18 +01:00
alfresco-build
29fc692e6f [maven-release-plugin] prepare release 6.3 2016-10-26 09:14:16 +01:00
ahind
ca2ac3aad0 Fix for SEARCH-222 SOLR 6 - Improved indexing for categories
- add supporting fields
2016-10-25 17:42:51 +01:00
alfresco-build
acab711533 [maven-release-plugin] prepare for next development iteration 2016-10-25 10:26:15 +01:00
alfresco-build
faa9f30c7c [maven-release-plugin] prepare release 6.2 2016-10-25 10:26:12 +01:00
Gethin James
2caebf9cda SEARCH-188: Added the enum for property based sharding 2016-10-25 09:58:35 +02:00
alfresco-build
48d9a171ab [maven-release-plugin] prepare for next development iteration 2016-10-13 18:51:58 +01:00
alfresco-build
e6af8c7d5e [maven-release-plugin] prepare release 6.1 2016-10-13 18:51:56 +01:00
Ancuta Morarasu
f6cd3c7d2e Revert "[maven-release-plugin] prepare release 6.1"
This reverts commit ac30960458.
2016-10-13 20:36:09 +03:00
Ancuta Morarasu
bb940a8bfe Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 611d22ea88.
2016-10-13 20:33:31 +03:00
alfresco-build
611d22ea88 [maven-release-plugin] prepare for next development iteration 2016-10-13 18:19:54 +01:00
alfresco-build
ac30960458 [maven-release-plugin] prepare release 6.1 2016-10-13 18:19:52 +01:00
Ancuta Morarasu
da594699c9 Revert "[maven-release-plugin] prepare release 6.1"
This reverts commit d14b998c37.
2016-10-13 20:12:19 +03:00
alfresco-build
d14b998c37 [maven-release-plugin] prepare release 6.1 2016-10-13 17:59:39 +01:00
Ancuta Morarasu
ce4e7def6d Revert "[maven-release-plugin] prepare release 6.1"
This reverts commit 0463997b8f.
2016-10-13 19:50:44 +03:00
Ancuta Morarasu
cde85b9d14 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit f075122301.
2016-10-13 19:50:07 +03:00
alfresco-build
f075122301 [maven-release-plugin] prepare for next development iteration 2016-10-13 16:58:44 +01:00
alfresco-build
0463997b8f [maven-release-plugin] prepare release 6.1 2016-10-13 16:58:41 +01:00
Ancuta Morarasu
6842ae394e REPO-843 / REPO-1334: Upgrade to Servlet API 3.0.1 2016-10-13 12:21:53 +03:00
Alan Davis
3c3ff260e1 REPO-480 Platform XXE protection implements OWASP recommendations
- Switch to using the same version of alfresco-xmlfactory (1.2.1) as the platform in 5.2.N
2016-10-12 11:05:14 +01:00
Gethin James
6020ae3de2 SEARCH-106: Fix highlighting typo 2016-10-11 11:59:53 +02:00
Gethin James
b75b604799 Merge branch 'feature/SEARCH-106-highlighting' into 'master'
Feature/search 106 highlighting

Adds Search highlighting to the SearchParameters Java Object and ResultSetSPI response. Also depends on Jackson annotations for the object constructor.

//cc @jvonka

See merge request !1
2016-10-11 08:07:20 +01:00
Gethin James
cc8ec6dc85 SEARCH-106: Add hightlighting to the toString() method 2016-10-10 12:26:01 +02:00
Gethin James
5ac30a195e SEARCH-106: Add hightlighting to the ResultSet 2016-10-07 14:23:02 +02:00
Gethin James
c4cade2ade SEARCH-106: Add jackson as a dependency so it can create classes using the annotations 2016-10-07 12:55:15 +02:00
Gethin James
9652aa1bb0 SEARCH-106: Adding Highlight parameters to SearchParameters api 2016-10-07 12:55:15 +02:00
dhulley
6d536478a2 Fixed MNT-14690: DictionaryService.getModel() has incorrect javadoc
- Added note that null is not returned and add @exception
 - Some other minor javadoc clean up
2016-10-06 19:37:59 +01:00
dhulley
3c1c46dda8 Remove deprecated ContentStore.getUrls methods and related ContentUrlHandler 2016-10-06 19:08:58 +01:00
Alan Davis
4f7a1d0d38 REPO-480 Platform XXE protection implements OWASP recommendations
- switch to using alfresco-xmlfactory 1.2
2016-10-04 15:59:01 +01:00
janv
a8906227b2 REPO-1258: Update data-model (master) to use xmlfactory 1.1
- same code as previous, simply released via gitlab (https://gitlab.alfresco.com/platform/alfresco-xml-factory)
2016-09-27 09:35:09 +01:00