Commit Graph

16493 Commits

Author SHA1 Message Date
Daniel Hensby
6b198336a8 Merge pull request #44 from silverstripe-security/patch/3.5/authenticator-fix
FIX Authenticators are more resilient to incomplete configuration
2017-09-20 11:38:38 +01:00
Daniel Hensby
f0262a8fd9
[SS-2017-005] User enumeration via timing attack mitigated 2017-09-20 11:33:22 +01:00
Daniel Hensby
fc79a76718
Added 3.6.2-beta1 changelog 2017-09-19 16:51:57 +00:00
Daniel Hensby
1f256cf2d2
Added 3.5.5-beta1 changelog 2017-09-19 15:25:41 +00:00
Matthias Schelling
eacfe280c1
TreeDropdownField: replace onadd by onmatch
Makes TreeDropdownField work in situations where it's moved around in the DOM (e.g. when inside a drag'n'drop container)
2017-09-15 12:02:18 +01:00
Daniel Hensby
091d99f599
FIX Authenticators are more resilient to incomplete configuration 2017-09-12 15:57:03 +01:00
Daniel Hensby
7d90df38e5
Merge branch '3.5' into 3.6 2017-08-29 16:46:58 +01:00
Damian Mooyman
c0003bca3d Merge pull request #7319 from open-sausages/pulls/3.5/no-combining-requirements
Fix add combinedFiles to clear logic - ss3
2017-08-29 13:47:52 +12:00
Christopher Joe
7b200a2a64 Fix add combinedFiles to clear logic 2017-08-29 12:57:41 +12:00
Daniel Hensby
9d2503c3da Merge pull request #7274 from PapaBearNZ/patch-1
Fix Truncate Error Issue when using views in a Unittest.
2017-08-25 11:51:36 +01:00
Damian Mooyman
52eb0bf214 Merge pull request #7306 from patricknelson/issue-7305-template-manifest-injector
NEW: Ability to override SS_TemplateManifest via Injector (fixes #7305)
2017-08-24 13:41:08 +12:00
Patrick Nelson
fdd501182e NEW: Ability to override SS_TemplateManifest via Injector (fixes #7305) 2017-08-23 17:34:07 -07:00
Daniel Hensby
921f615e19
Merge branch '3.5' into 3.6 2017-08-17 14:14:31 +01:00
Damian Mooyman
7ad081a20b Merge pull request #7288 from dhensby/pulls/3.5/write-no-change-edit
FIX Don't update LastEdited on skipped writes
2017-08-17 15:09:03 +12:00
Daniel Hensby
eb80a5f9e8
FIX LastEdited no longer updated on skipped writes 2017-08-16 23:39:22 +01:00
Daniel Hensby
1ae07ac2a3
TEST Prove LastEdited is updated when no changes are made 2017-08-16 22:26:47 +01:00
Daniel Hensby
a3b72c500d
Merge branch '3.5' into 3.6 2017-08-14 12:55:09 +01:00
James Pluck
b04a1ab41c Fix Truncate Error Issue when using views in a Unittest.
When using a view in a SilverStripe project, whenever the tear down scripts for the Unittests are run the following error occurs:

Couldn't run query:
TRUNCATE "ActivityPoints_view"
Table 'ss_tmpdb2391727.ActivityPoints_view' doesn't exist

This was due to the MySQLSchemaManager::tableList() function assuming that all records in the TABLES were actual tables containing data.

This small tweak fixes the issue by modifying the SQL to filter out views from the list before truncating.
2017-08-14 15:22:19 +12:00
Damian Mooyman
9ea09376eb Merge pull request #7250 from phptek/issue/7181
FIX: Fixes #7181 Use config system for userland config of node_threshold_total
2017-08-09 14:18:50 +12:00
Russell Michell
59b28f7d5b FIX: Fixes #7181 to config system for userland config of node display limits. 2017-08-07 10:55:38 +12:00
Damian Mooyman
69451790d6 Merge pull request #7224 from dhensby/pulls/3.5/spyc-composer
Move spyc dependency to composer
2017-08-02 16:19:00 +12:00
Daniel Hensby
6494bc820c
Move spyc dependency to composer 2017-07-28 13:35:30 +01:00
Damian Mooyman
9b378d8c08 Merge pull request #7213 from dhensby/pulls/3.5/fix-small-htmlfield
FIX Avoid JS errors for HTMLEditorFields in small holders
2017-07-28 13:25:31 +12:00
Daniel Hensby
2e34730d3d Merge pull request #7211 from kinglozzer/migrate-legacy-hashes-config
Fix: Use Config API for MemberAuthenticator::$migrate_legacy_hashes (fixes #7208)
2017-07-26 11:21:51 +01:00
Daniel Hensby
31c5eebda0
FIX Avoid JS errors for HTMLEditorFields in small holders 2017-07-26 11:20:00 +01:00
Loz Calver
82c0632f46
Fix: Use Config API for MemberAuthenticator::$migrate_legacy_hashes (fixes #7208) 2017-07-26 09:54:29 +01:00
Daniel Hensby
fc35eff13f
Merge branch '3.5' into 3.6 2017-07-25 16:02:56 +01:00
Daniel Hensby
ba8c149b78
Stay on travis precise dist for now 2017-07-25 16:02:02 +01:00
Chris Joe
3e8b636dc9 Merge pull request #6942 from open-sausages/pulls/3.4/fix-gridfield-state
BUG Ensure GridState_Component is added to GridField config
2017-07-21 10:54:07 +12:00
Klemen Dolinsek
3dd3036792 BUG Ensure GridState_Component is added to GridField config even if we set config with GridField::setConfig
Fixes #6886
2017-07-21 10:32:13 +12:00
Daniel Hensby
90be7e806d
Merge branch '3.5' into 3.6 2017-07-19 15:40:01 +01:00
Loz Calver
0c6851e597 Merge pull request #7190 from silverstripe/revert-7035-3.5
Revert "TreeDropDown performance boost."
2017-07-19 15:37:28 +01:00
Daniel Hensby
7b6aad8a65 Revert "TreeDropDown performance boost." 2017-07-19 12:44:43 +01:00
Daniel Hensby
292aaf6530
FIX Cache IDs grouped by site first 2017-07-19 11:29:01 +01:00
Damian Mooyman
d053c9aaac Merge pull request #7186 from dhensby/pulls/3.5/cache-prefix
FIX Add unique prefix to cache stores to prevent cache leak
2017-07-19 11:54:49 +12:00
Daniel Hensby
b77274c1a3
FIX Add unique prefix to cache stores to prevent cache leak 2017-07-18 23:43:08 +01:00
Daniel Hensby
7e732da709
Merge branch '3.5' into 3.6 2017-07-18 12:00:04 +01:00
Daniel Hensby
fa8f0cc955 Merge pull request #7141 from bummzack/fix-7132-utf8
Fix OS X issue with some string methods.
2017-07-18 11:59:16 +01:00
Daniel Hensby
a34be33c56
Merge branch '3.5' into 3.6 2017-07-14 14:51:05 +01:00
Damian Mooyman
10fd7813ed Merge pull request #7153 from kinglozzer/file-ini2bytes
Fix: Make File::ini2bytes() compliant with binary prefixes (fixes #7145)
2017-07-11 11:29:05 +12:00
Loz Calver
960a0f8343
Fix: Make File::ini2bytes() compliant with binary prefixes (fixes #7145) 2017-07-10 09:41:36 +01:00
Roman Schmid
a6db16b229 Fix OS X issue with Convert::html2raw, HTMLText::FirstSentence, HTMLText::Summary and Text::FirstSentence.
Use unicode modifier for regular expressions that deal with whitespace.
Added unit-tests to ensure no invalud utf-8 gets generated by these methods.
2017-07-10 09:49:55 +02:00
Daniel Hensby
f769d9a13f Merge pull request #7059 from mfendeksilverstripe/3.5
Html editor selection is now properly stored while the dialog is open
2017-07-05 15:03:18 +01:00
Daniel Hensby
5f17c7fb58
Merge branch '3.5' into 3.6 2017-07-03 16:44:06 +01:00
Daniel Hensby
3a7261ac6e Merge pull request #7093 from dhensby/pulls/3.5/lam-getchildasul-call
FIX add missing $rootCall param from LeftAndMain
2017-07-02 00:28:48 +01:00
Daniel Hensby
79a7b1016e
FIX add missing $rootCall param from LeftAndMain 2017-06-29 11:24:09 +01:00
Daniel Hensby
d94182702c
Merge branch '3.5' into 3.6 2017-06-28 11:10:43 +01:00
Damian Mooyman
2b8eb202db Merge pull request #6687 from hailwood/patch-6
Do not default to locale if hasEmptyDefault is true
2017-06-28 12:12:16 +12:00
Daniel Hensby
1e5592a3d9
Merge branch '3.5' into 3.6 2017-06-27 13:14:39 +01:00
Daniel Hensby
29b9311634
Merge tag '3.6.1' into 3.6
Release 3.6.1
2017-06-27 12:53:55 +01:00