Jean-Pierre Huynh
91e21c3bd6
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119068 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117351 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117258 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114531 adavis: Merged BCRYPT to 5.0.2-CLOUD
114416 gjames: Added debug on startup MNT-14892
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:01:09 +00:00
Jean-Pierre Huynh
5d17b7e9f3
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119066 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117349 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117256 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114527 adavis: Merged BCRYPT to 5.0.2-CLOUD
114255 gjames: createUser with a password that has already been hashed MNT-14892,RA-601
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:58 +00:00
Jean-Pierre Huynh
cb6e5c77c0
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119065 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117348 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117255 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114526 adavis: Merged BCRYPT to 5.0.2-CLOUD
114254 gjames: Making sure md4 doesn't use a salt MNT-14892
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:52 +00:00
Jean-Pierre Huynh
7e58e926d0
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119064 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117347 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117254 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114524 adavis: Merged BCRYPT to 5.0.2-CLOUD
114104 gjames: Added trace debugging MNT-14892
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119903 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:44 +00:00
Jean-Pierre Huynh
9b89c2c4c4
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119063 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117346 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117253 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114523 adavis: Merged BCRYPT to 5.0.2-CLOUD
114045 gcornwell: MNT-14892: Enabled the UpgradePasswordHashJob (it won't run until 2099 though due to the default cron experssion) and tweaked log statements.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:34 +00:00
Jean-Pierre Huynh
ae043651cb
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119059 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117341 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117249 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114518 adavis: Merged BCRYPT to 5.0.2-CLOUD
114018 gcornwell: MNT-14892: Fixed tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119898 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:09 +00:00
Jean-Pierre Huynh
47373d2dc0
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119058 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117340 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117248 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114517 adavis: Merged BCRYPT to 5.0.2-CLOUD
114012 gcornwell: MNT-14892: Updates to upgrade password hash job and test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:59 +00:00
Jean-Pierre Huynh
1670fcce1e
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119057 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117339 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117247 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114516 adavis: Merged BCRYPT to 5.0.2-CLOUD
114004 gjames: Added a hashUserPassword method, and working on UpgradePasswordHashTest MNT-14892
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:53 +00:00
Jean-Pierre Huynh
05375c63fc
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119056 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117338 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117246 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114515 adavis: Merged BCRYPT to 5.0.2-CLOUD
113961 gcornwell: MNT-14892: Added UpgradePasswordHashWorker job and skeleton test class
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:44 +00:00
Jean-Pierre Huynh
f7631e37b8
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119055 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117337 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117245 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114514 adavis: Merged BCRYPT to 5.0.2-CLOUD
113819 gcornwell: MNT-14892: Final test fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:15 +00:00
Jean-Pierre Huynh
5cd45df966
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119054 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117336 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117244 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114513 adavis: Merged BCRYPT to 5.0.2-CLOUD
113804 gcornwell: MNT-14892: More test fixes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:09 +00:00
Jean-Pierre Huynh
eda3bd18fc
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119053 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117335 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117243 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114512 adavis: Merged BCRYPT to 5.0.2-CLOUD (PARTIAL MERGE)
113778 gcornwell: MNT-14892: Fixed tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119891 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:04 +00:00
Jean-Pierre Huynh
133c8bf8ca
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119052 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117334 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117242 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114511 adavis: Merged BCRYPT to 5.0.2-CLOUD
113774 gjames: Better updateUser and test MNT-14892
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119890 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:59 +00:00
Jean-Pierre Huynh
fc74df4ab8
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119051 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117333 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117241 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114510 adavis: Merged BCRYPT to 5.0.2-CLOUD
113765 gcornwell: MNT-14892: Users password now gets re-hashed when they login if it is not using the preferred encoding (removes old MD4 and SHA encoded passwords)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:31 +00:00
Jean-Pierre Huynh
cdb95db67c
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119050 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117332 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117240 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114509 adavis: Merged BCRYPT to 5.0.2-CLOUD
113728 gjames: Changed updateUser to use a List MNT-14892
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119888 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:23 +00:00
Jean-Pierre Huynh
d97bed0aaa
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119045 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117327 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117235 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114504 adavis: Merged BCRYPT to 5.0.2-CLOUD (PARTIAL MERGE)
113666 gjames: Initial integration of CompositePasswordEncoder for MNT-14892
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:57:42 +00:00
Jean-Pierre Huynh
01ffcc2511
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119044 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117325 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117234 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114503 adavis: Merged BCRYPT to 5.0.2-CLOUD
113532 gjames: Adding a CompositePasswordEncoder for MNT-14892
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:57:28 +00:00
Jean-Pierre Huynh
0f0037ae10
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
...
119029 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
116130 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
115965 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
115823 arebegea: MNT-14887 : Rework ChainingUserRegistrySynchronizer's methods that uses RetryingTransaction with 'requiresNew=true'.
- removed the code that deleted the older property value that may have been present when updating a value.
- fixed the tests from RepoUsageComponentTest.java
- updated the authorised-users jar with the version that uses the attributeService again.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:50:23 +00:00
Gethin James
e9c42fa4f3
ACE-4855: Added @AlfrescoPublicApi to AbstractModuleComponent and ImporterModuleComponent
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-09 16:18:25 +00:00
Mihai Cozma
deb2813191
ACE-4715 Severe degradation of performance when opening a semi virtual folder root
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 16:59:08 +00:00
Mihai Cozma
bff78831dd
ACE-4715 Severe degradation of performance when opening a semi virtual folder root
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 16:52:22 +00:00
Bogdan Horje
5f472d0b2a
ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 16:10:44 +00:00
Silviu Dinuta
71d9df71be
ACE-4795: Adding as favorite a folder/file in virtual context doesn't work as expected
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 15:28:30 +00:00
Bogdan Horje
3961569456
ACE-4804 forced read permission on allowed for read-only (due to missing filing path) virtual nodes
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 14:55:42 +00:00
Bogdan Horje
4028bb28a2
ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-04 14:36:11 +00:00
Mihai Cozma
6f16b07e61
Merged BRANCHES/DEV/VF_REP_INT_51 to HEAD
...
ACE-4716 Can't rename a document in a virtual context from CMIS
ACE-4752 Type virtualization method does not work
ACE-4717 Document name is renamed when making "Check in" for a document edited in Google Docs
ACE-4700 Can't upload to a virtual folder when filename starts with a number and includes dashes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-02 14:27:31 +00:00
Mihai Cozma
acb6e2db75
ACE-4726 Max number of open files reached when browsing virtual folders (Linux OS)
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 08:45:19 +00:00
Silviu Dinuta
2ecad935cf
ACE-4699: Document preview is changed to the physical location after "Edit Offline \ Cancel Editing" action
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-20 17:46:04 +00:00
Alex Mukha
c0c2a9c1d1
Merged DEV (5.1) to HEAD (5.1)
...
117318: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
117293: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
- Changed the ClassBehaviourIndex#find as the main logic is handled by BehaviourFilterImpl#isEnabled
- Updated the BehaviourFilter interface accordingly.,
115822: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
- Reworked the solution to use only one new method: disable(QName className, boolean includeSubClasses)
- Modified the isEnabled(QName className) to correspond with the new logic
- Modified the JUnit tests.,
115078: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
115071: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
- Added new API for disabling behaviours.
- Added JUnit tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-18 17:13:08 +00:00
Andrew Hind
3d4f9a07c0
Fix for ACE-4575 SOLR 4 - Sharded - Backup should fail gracefully
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-18 10:54:15 +00:00
Bogdan Horje
cb38dc5f7b
CM-690 reverted AMD DAO trait extension
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-16 07:14:29 +00:00
Bogdan Horje
0c5b943360
CM-690 reverted AMD DAO trait extension
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-13 15:12:55 +00:00
Bogdan Horje
005c9543f5
CM-690 extensions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:32:24 +00:00
Bogdan Horje
37602b45e5
CM-690 extensions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:31:44 +00:00
Bogdan Horje
22e4acd68e
CM-690 extensions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117487 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:30:17 +00:00
Bogdan Horje
de57b9220f
CM-690 extensions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117486 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:27:41 +00:00
Bogdan Horje
19d7327617
CM-690 extensions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:27:30 +00:00
Bogdan Horje
cf14e353a5
CM-690 extensions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:26:36 +00:00
Bogdan Horje
efb91d31a0
CM-690 extensions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:25:49 +00:00
Bogdan Horje
99cd45d810
CM-690 extensions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:23:33 +00:00
Bogdan Horje
1151a782f4
CM-690 extensions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:19:53 +00:00
Bogdan Horje
4ed133e259
CM-690 virtualization
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:08:08 +00:00
Derek Hulley
bcf40c1b72
Fix leaked 'MLPropertyInterceptor.setMLAware' in data load API implementation (ACE-4552)
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-10 10:39:07 +00:00
Ahmed Owian
5bcbdef83c
Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
...
116654 aowian: ACE-4500: Updating links to the help from within Alfresco
- Code formatting according to Alfresco standards. No functionality changes.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-10 06:03:28 +00:00
Ahmed Owian
3adb8621ac
Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
...
116550 aowian: ACE-4500: Updating links to the help from within Alfresco
- Updated error message to include correct version of the docs.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-10 06:03:09 +00:00
Alex Mukha
cdefbd2bf1
Merged 5.1.N (5.1.1) to HEAD (5.1)
...
116289 amukha: ACE-4513: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
116284 amukha: MNT-15091: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
116280 amukha: MNT-15090: Merged DEV to V4.2-BUG-FIX (4.2.6)
115799: MNT-15075 : [Pentest 121015] ZIP extraction code execution
Fix and test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-09 11:51:52 +00:00
Andrew Hind
b745f8464f
Fix for ACE-4038 SOLR 4 - Sharded - Suggestor fails
...
- sharded and unsharded suggestion behave the same
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116423 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-06 14:32:27 +00:00
Alan Davis
80118cac2d
Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
...
115580 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
115535 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
115533 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.N (5.0.3)
115531 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
115517 abozianu: Merged DEV to 5.0.2-PLUS (5.0.2-PLUS)
115450 abozianu: MNT-15064 : [Cloud Upgrade] Errors apear in alfresco.log after Stop & Start upgrade Alfresco Cloud 39.6.5 to 40 on DP
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:19:46 +00:00
Alan Davis
9fe8315e16
Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
...
115578 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
115292 adragoi: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
115032 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.N (5.0.3)
115030 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
114982 gcornwell: RA-608: Cloud repo fails to startup following successful bootstrap
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:19:32 +00:00
Alan Davis
aaa621c981
Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
...
115572 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
114988 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
114790 amorarasu: MNT-15007: CLONE - String values when migrating from MySQL to other DBs
Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114311 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
114245 tvalkevych: Merged V4.1.9 (4.1.9.13) to V4.1-BUG-FIX (4.1.11)
113717 dhulley: MNT-14911: String values when migrating from MySQL to other DBs
- Add a new job that allows node string values to be re-persisted according to the current 'system.maximumStringLength' value
- Job is unscheduled by default
- Set the 'system.maximumStringLength' and the 'system.maximumStringLength.jobCronExpression'
- Various touched code format fixes, method naming fixes, etc
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:18:31 +00:00