Robbie Averill
175b41683e
Merge pull request #7853 from DrMartinGonzo/patch-1
...
Removed bad quote in i18n doc
2018-02-11 10:30:30 +13:00
Martin Portevin
90f77a7134
Removed bad quote
2018-02-10 03:05:59 +01:00
Daniel Hensby
7ec5fa2c8d
Merge branch '4.0' into 4.1
2018-02-09 15:19:15 +00:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0
2018-02-09 14:32:58 +00:00
Daniel Hensby
48a8a82326
Merge branch '3.5' into 3.6
2018-02-09 13:20:38 +00:00
Chris Joe
95308e1af6
Merge pull request #7849 from open-sausages/pulls/4.0/fix-debug-string-class-cli
...
BUG Fix issue with CLIDebugView failing on class name of existing class
2018-02-09 15:41:18 +13:00
Daniel Hensby
d3278d5470
FIX Add Nested DB transaction support ( #7848 )
...
* TEST Prove nested transactions break
* Add nested transaction support
2018-02-09 10:28:32 +13:00
Damian Mooyman
0a486b8f57
BUG Fix issue with CLIDebugView failing on class name of existing class
...
Fixes #7827
2018-02-09 09:52:32 +13:00
Daniel Hensby
2a8d365aac
Merge pull request #6973 from steadlane/fix/csv-unescaped-values
...
Fix for badly escaped values in CSV export
2018-02-08 13:45:52 +00:00
JorisDebonnet
5df1ec7eee
Use fputcsv in GridFieldExportButton
2018-02-08 12:26:29 +00:00
Daniel Hensby
09f88c76cf
Merge pull request #7812 from oddnoc/configure-nginx-ss4
...
DOCS: Update nginx configuration for SilverStripe 4
2018-02-08 11:45:32 +00:00
Loz Calver
adc9f02390
Merge pull request #7846 from dhensby/pulls/4.0/test-cms
...
Actually run CMS tests
2018-02-08 11:14:19 +00:00
Fred Condo
6976d09bba
Correct location block for SS4
...
SS4 uses /index.php so the location block and documentation need to also
use that.
2018-02-08 10:40:25 +00:00
Daniel Hensby
03c91f232d
Actually run CMS tests
2018-02-08 10:32:56 +00:00
Damian Mooyman
dd3fbf2c73
BUG Fix installer checking wrong location for files
2018-02-08 10:50:27 +13:00
Damian Mooyman
93cc660474
Update 4 alias to 4.2
2018-02-07 17:46:57 +13:00
Damian Mooyman
7d1e3e1c72
Added 4.1.0-rc1 changelog
2018-02-07 16:07:32 +13:00
Damian Mooyman
21ffb270a5
Update translations
2018-02-07 16:07:27 +13:00
Chris Joe
aa7aae3900
Merge pull request #7841 from open-sausages/pulls/4/fix-nonpublic-root
...
BUG Fix incorrect BASE_URL when webroot is parent of public folder
2018-02-07 15:26:09 +13:00
Damian Mooyman
e5ff48b352
BUG Fix incorrect BASE_URL when webroot is parent of public folder
2018-02-07 14:28:06 +13:00
Damian Mooyman
2f1f5c0caa
Merge remote-tracking branch 'origin/4.0' into 4
2018-02-07 11:48:46 +13:00
Chris Joe
aac7bbd3b0
Merge pull request #7840 from open-sausages/pulls/4/fix-session-test-unset
...
BUG Fix Director::test() not persisting removed session keys on teardown
2018-02-07 11:44:55 +13:00
Damian Mooyman
2225cf4c95
BUG Fix Director::test() not persisting removed session keys on teardown
2018-02-07 11:03:32 +13:00
Damian Mooyman
0c65a878b9
Merge pull request #7836 from dhensby/pulls/4.0/default-admin-encryptor
...
FIX Issue where default admin has no password encryption
2018-02-07 10:14:35 +13:00
Daniel Hensby
660dfd34a8
FIX Issue where default admin has no password encryption
2018-02-06 20:18:32 +00:00
Daniel Hensby
62057befdb
Merge branch '4.0' into 4
2018-02-06 10:08:17 +00:00
Loz Calver
97ce336409
Merge pull request #7834 from dhensby/pulls/4.0/fix-nightly
...
FIX Regex range identifier correctly escaped
2018-02-05 17:07:56 +00:00
Daniel Hensby
28ca11dd7e
FIX Regex range identifier correctly escaped
2018-02-05 15:17:20 +00:00
Damian Mooyman
e359948eb3
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Core/CoreKernel.php
2018-02-05 17:52:38 +13:00
Chris Joe
21da1bc317
Merge pull request #7832 from open-sausages/pulls/4/fix-getter-regression
...
BUG Fix regression in has_one getters breaking DataDifferencer
2018-02-05 17:45:49 +13:00
Damian Mooyman
e967ab09a2
Added 4.0.3 changelog
2018-02-05 17:10:00 +13:00
Damian Mooyman
e111da2769
Update translations
2018-02-05 16:58:21 +13:00
Damian Mooyman
02ec0b8375
Merge pull request #7829 from Firesphere/patch-3
...
[bugfix] $request == null breaks
2018-02-05 16:43:40 +13:00
Damian Mooyman
d0f8f3ac53
Merge pull request #7831 from scott1702/patch-3
...
Add Robbie to core committers doc
2018-02-05 16:38:55 +13:00
Damian Mooyman
db9aa2c5c7
BUG Fix regression in has_one getters breaking DataDifferencer
2018-02-05 16:16:07 +13:00
Damian Mooyman
a805aabecd
Added 3.6.5 changelog
2018-02-05 15:19:24 +13:00
Damian Mooyman
96ec6e9181
Merge remote-tracking branch 'origin/3.5' into 3.6
2018-02-05 15:07:21 +13:00
Scott Hutchinson
496ca4457a
Update 09_Core_committers.md
2018-02-05 14:45:50 +13:00
Damian Mooyman
abbc4b72be
Added 3.5.7 changelog
2018-02-05 14:30:53 +13:00
Damian Mooyman
6fe5c37d6a
Merge pull request #7795 from kinglozzer/uploadfield-height
...
FIX: Fix UploadField cuts off “Save” button (closes #2862 )
2018-02-05 14:24:30 +13:00
Chris Joe
80072f01a7
Merge pull request #7819 from open-sausages/pulls/4/duplicates-is-easy
...
API Implement cascade_duplications
2018-02-05 14:22:26 +13:00
Damian Mooyman
fa44d22058
Merge pull request #6744 from d-rivera-c/dev/pharmac-fork
...
fixing val reference to url in https hotlink and allowes https hotlinking on TinyMCE
2018-02-05 14:22:08 +13:00
Damian Mooyman
aca1e16b8e
Merge pull request #6211 from jason-zz/patch-3
...
BUG Fix : relObject() should return null if one of the node is null
2018-02-05 14:18:44 +13:00
Damian Mooyman
98907b3ba4
Merge pull request #4096 from patricknelson/issue-4095-tinymce-embed
...
FIX for #4095 , TinyMCE not able to modify props of embed media (bug 1) and invalid HTML inserted (bug 2)
2018-02-05 14:14:44 +13:00
Simon Erkelens
a071672b48
[bugfix] $request == null breaks
...
The $request incoming as null was not properly detected by the if/elseif structure.
2018-02-05 13:02:07 +13:00
Robbie Averill
209635b467
Merge pull request #7828 from open-sausages/pulls/4.0/fix-debug-string-class
...
BUG Fix issue with DebugView failing on class name of existing class
2018-02-05 12:08:58 +13:00
Damian Mooyman
aa2c71424d
API Implement cascade_duplications
...
API Add DataObject::setComponent()
API Support unary components as getter and setter fields
API ManyManyList::add() now supports unsaved records
ENHANCEMENT Animal farm
2018-02-05 12:04:57 +13:00
Damian Mooyman
288aaf083c
BUG Fix issue with DebugView failing on class name of existing class
...
Fixes #7827
2018-02-05 10:45:49 +13:00
Chris Joe
b81ac41b5d
Merge pull request #7825 from open-sausages/pulls/4.0/fix-session-unsaved
...
BUG Fix critical issue with incorrectly saved session data
2018-02-02 16:14:26 +13:00
Damian Mooyman
740c3326e9
BUG Fix critical issue with incorrectly saved session data
2018-02-02 15:08:52 +13:00
