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
|
426f3a60c9
|
Merge pull request #7191 from matmunn/patch-1
Update 01_Linux_Unix.md
|
2017-07-20 09:48:44 +01:00 |
|
Mat Munn
|
7abc57d4c6
|
Update 01_Linux_Unix.md
Fixed a typo
|
2017-07-20 14:30:54 +10:00 |
|
Daniel Hensby
|
016e0e657a
|
Merge branch '3.6' into 3
|
2017-07-19 15:45:56 +01: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
|
297755d323
|
Merge branch '3.6' into 3
|
2017-07-18 12:00:33 +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
|
36666eb348
|
Merge branch '3.6' into 3
|
2017-07-14 14:53:06 +01:00 |
|
Daniel Hensby
|
a34be33c56
|
Merge branch '3.5' into 3.6
|
2017-07-14 14:51:05 +01:00 |
|
Daniel Hensby
|
ddd1584e44
|
Merge pull request #7125 from robbieaverill/pulls/3.7/version-provider
NEW Add new SilverStripeVersionProvider to provider module versions
|
2017-07-14 12:03:15 +01:00 |
|
Robbie Averill
|
48d9088ab4
|
Separate composer.lock load method and add test mocking it
|
2017-07-11 12:22:25 +12: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
|
c472957bd2
|
Merge pull request #7126 from andrewandante/patch-1
FIX remove info div to fix formatting
|
2017-07-04 13:46:18 +01:00 |
|
Andrew Aitken-Fincham
|
7812f34a2d
|
remove info div to fix formatting
|
2017-07-04 12:50:57 +01:00 |
|
Robbie Averill
|
ee4d8b4d4e
|
NEW Add new SilverStripeVersionProvider to provider module versions
|
2017-07-04 23:29:29 +12:00 |
|
Daniel Hensby
|
41b8df0ec7
|
Merge branch '3.6' into 3
|
2017-07-03 16:44:20 +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
|
c6a6fdd784
|
Merge pull request #7079 from andrewandante/patch-1
Add $fixture_file to the fixtures docs
|
2017-06-30 15:45:46 +01:00 |
|
Andrew Aitken-Fincham
|
ef8e04a83e
|
Add $fixture_file to the fixtures docs
Currently no mention of it.
|
2017-06-29 13:58:37 +01:00 |
|
Daniel Hensby
|
79a7b1016e
|
FIX add missing $rootCall param from LeftAndMain
|
2017-06-29 11:24:09 +01:00 |
|
Daniel Hensby
|
eec8dfa7ad
|
Merge branch '3.6' into 3
|
2017-06-28 11:12:03 +01:00 |
|
Daniel Hensby
|
d94182702c
|
Merge branch '3.5' into 3.6
|
2017-06-28 11:10:43 +01:00 |
|
Damian Mooyman
|
a48628db20
|
Merge pull request #7030 from 3Dgoo/patch-1
Documentation link fixes
|
2017-06-28 12:15:42 +12: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
|
399c46579a
|
Merge branch '3.6' into 3
|
2017-06-27 13:15:14 +01: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 |
|
Daniel Hensby
|
ddff7c5dad
|
Added 3.6.1 changelog
|
2017-06-27 12:48:16 +01:00 |
|
Daniel Hensby
|
f62cba2cd8
|
Added 3.6.1-alpha2 changelog
|
2017-06-27 12:22:26 +01:00 |
|
Daniel Hensby
|
1d31987a9d
|
Merge pull request #7027 from open-sausages/pulls/3.6/revert-lang-update
|
2017-06-27 12:21:58 +01:00 |
|
Daniel Hensby
|
61fc53a556
|
Added 3.6.1-alpha1 changelog
|
2017-06-27 12:21:10 +01:00 |
|
Ingo Schommer
|
02e96bd6ef
|
Merge pull request #7031 from 3Dgoo/patch-2
_t function parameter documentation fix
|
2017-06-26 22:58:17 +12:00 |
|
Mojmir Fendek
|
b2d362beb9
|
Html editor selection is now properly stored while the dialog is open.
|
2017-06-26 12:55:05 +12:00 |
|
Daniel Hensby
|
9888cbc406
|
Merge pull request #7035 from mfendeksilverstripe/3.5
TreeDropDown performance boost.
|
2017-06-21 13:19:09 +01:00 |
|
Daniel Hensby
|
d666eea148
|
Merge pull request #7041 from creative-commoners/pulls/3.5/fix-gridfield-filter-header-colour
FIX Text colour in GridField filter headers for dropdown fields (SS 3.5)
|
2017-06-20 15:21:19 +01:00 |
|
Robbie Averill
|
e2116a70ef
|
FIX Text colour in GridField filter headers for dropdown fields
|
2017-06-20 16:21:59 +12:00 |
|
Mojmir Fendek
|
5b6a39e71a
|
TreeDropDown performance boost.
|
2017-06-19 15:10:23 +12:00 |
|