Commit Graph

14613 Commits

Author SHA1 Message Date
Damian Mooyman
fab44dce75 Added 3.1.10-rc2 changelog 2015-02-17 18:05:16 +13:00
Damian Mooyman
4b7a91569c Merge pull request #3910 from Zauberfisch/patch-5
Fixed infinity loop when searching _ss_environment
2015-02-17 17:39:25 +13:00
Zauberfisch
aa77e126c7 Fixed infinity loop when searching _ss_environment 2015-02-17 04:33:40 +00:00
Damian Mooyman
0d3b55645a Merge pull request #3906 from phillprice/patch-8
Update InlineFormAction.php
2015-02-17 09:23:53 +13:00
Phill Price
9971de6eff Update InlineFormAction.php
typo fix
2015-02-16 20:19:53 +00:00
Daniel Hensby
e26d518c33 DOCS Removing redundant PHP syntax declaration 2015-02-16 14:00:22 +00:00
Daniel Hensby
3573075de0 DOCS Removing redundant PHP syntax declaration 2015-02-16 13:59:49 +00:00
Daniel Hensby
5d35650cbb DOCS Removing redundant PHP syntax declaration 2015-02-16 13:58:57 +00:00
Loz Calver
998c055676 FIX: Misleading error message in SSViewer
Better error message if theme is disabled

DRY!
2015-02-16 09:24:58 +00:00
Daniel Hensby
9e600e9e0c Removing redundant var declaration 2015-02-16 07:56:04 +00:00
Damian Mooyman
9a97cbc255 Added 3.1.10-rc1 changelog 2015-02-16 16:39:01 +13:00
Damian Mooyman
1879b2ecf6 Merge pull request #3867 from Zauberfisch/patch-5
Fixed looking for _ss_environment.php in root dir
2015-02-16 16:09:22 +13:00
Damian Mooyman
49c462710d Merge pull request #3795 from uniun/patch-2
FIX. Summary fields can't be translated
2015-02-16 15:55:29 +13:00
Damian Mooyman
bf0104644b Update translations 2015-02-16 11:55:17 +13:00
Daniel Hensby
146aa06545 Merge pull request #3902 from camfindlay/patch-21
DOCS Reference to ensure contributors read over the Code of conduct
2015-02-15 21:49:25 +00:00
Cam Findlay
aa5c9ca246 DOCS Reference to ensure contributors read over the Code of conduct 2015-02-16 10:28:52 +13:00
Sean Harvey
cebc0d08c5 Merge pull request #3894 from tractorcow/pulls/3.1/encoding-fixes
BUG Lots of encoding fixes
2015-02-16 09:18:41 +13:00
David Craig
33930597c0 Improve styling on modal dialogs 2015-02-16 08:58:23 +13:00
zauberfisch
eb98b003b7 Fixed looking for _ss_environment.php in root dir and removed redundant code 2015-02-13 23:30:29 +00:00
Daniel Hensby
a304ee37f8 Merge pull request #3896 from Ben-Speakman/patch-1
Use double quotes to escape quotes in CSV export
2015-02-13 10:47:48 +00:00
Daniel Hensby
b3f859d1ad Merge pull request #3893 from LiamW/patch-1
DOCS Update 11_Scaffolding.md
2015-02-13 10:24:10 +00:00
Ben Speakman
f9a61a6802 Use double quotes to escape quotes in CSV export
Resolves #3895
2015-02-13 10:10:52 +00:00
Damian Mooyman
1db08bac88 BUG Fix FormAction title encoding
BUG Fix TreeMultiSelectField using the wrong label
BUG Fix encoding of selected title on TreeDropdownField
BUG Fix DataDifferencer trying to compare non-comparable fields (non-dbfield objects)
BUG: Fix issue with TreeMultiSelectField not saving
BUG: Fix issue with GridFieldPrintButton
ENHANCEMENT Instead of using multiple api calls to encode dbfield values, delegate this operation to the individual fields via forTemplate
Instead of using a new API to communicate html encoding to treeselect, just ensure all content is HTML encoded, and enable html_titles in jstree.
2015-02-13 15:50:45 +13:00
Ingo Schommer
c1e345bc25 Merge pull request #3008 from tractorcow/pulls/numeric-locale-fix
BUG Fixed handling of numbers in certain locales.
2015-02-13 12:08:06 +13:00
Daniel Hensby
89c14d079d Making TreeMultiSelectField consistent with parent class
NEW TreeDropdownField sanatiser helper added
Use config for default_cast of objects
FIX Determine if Diffed value should be escaped
Forcing casting for core DB fields
Fixing permissions labels
2015-02-13 11:12:30 +13:00
Damian Mooyman
518045257e BUG Fixed handling of numbers in certain locales.
Fixes #2161
2015-02-13 10:50:00 +13:00
LiamW
36dbd4f8a1 Update 11_Scaffolding.md
Noticed the call to the tab is wrong.
2015-02-12 14:16:05 -05:00
Daniel Hensby
0ca0bb55b0 Cleaning up Test DataObjects to ensure TestOnly is implemented 2015-02-12 15:22:29 +00:00
Stephan Bauer
96962a92cf Changed cache_dir to respect TEMP_FOLDER 2015-02-12 15:21:55 +01:00
Daniel Hensby
18683079bc Merge pull request #3887 from AdenFraser/Issue3880
Fixed "Removed DataObject::$allowed_actions #3880" on master
2015-02-12 12:00:42 +00:00
Uncle Cheese
c88ddef477 add new lessons 9, 10
remove tutorials from home page
2015-02-13 00:48:05 +13:00
Aden Fraser
83db2f2d30 Fixed "Removed DataObject::$allowed_actions #3880" on master 2015-02-12 08:57:51 +00:00
Damian Mooyman
e7dbb27498 Merge branch 'pr/3882' into 3.1 2015-02-12 17:30:56 +13:00
JorisDebonnet
047fe3a410 BUG Include php version in default cache folder name
Update CoreTest.php
2015-02-12 17:29:45 +13:00
Damian Mooyman
e0f907a254 Merge pull request #3886 from 3Dgoo/patch-1
Fixed typo in DataList API doc
2015-02-12 17:16:44 +13:00
Uncle Cheese
9218919437 Several changes to deprecate old tutorials 2015-02-12 17:15:53 +13:00
3Dgoo
0ec53d8fdd sort method comments fixed missing single quote 2015-02-12 14:39:54 +10:30
Daniel Hensby
f8fe4a9096 Merge pull request #3815 from kinglozzer/dev-build-subdir
FIX: dev/build not flushing manifests if site is in a subfolder
2015-02-11 22:45:46 +00:00
Loz Calver
eed709384d FIX: dev/build not flushing manifests if site is in a subfolder 2015-02-11 19:59:22 +00:00
Loz Calver
f3c3562fdc Merge pull request #3858 from dhensby/pulls/fix-empty-composite-fields
FIX issue where empty composite fields created a fieldlist with empty items
2015-02-11 17:18:33 +00:00
Aden Fraser
d555b5b26e Fixed JS error in lib.js (fixes #3481) 2015-02-11 16:59:53 +00:00
Loz Calver
3b5a7c22b3 Merge pull request #3879 from AdenFraser/Issue3477
Fixed "Image_Backend interface constructor needs updating (master) #3477"
2015-02-11 16:33:06 +00:00
Aden Fraser
0223b6164c Fixed " Image_Backend interface constructor needs updating (master) #3477 " on both the Image_Backend Model and Imagick_Backend filesystem class 2015-02-11 15:58:47 +00:00
Will Morgan
b48aea131b Merge pull request #3869 from dhensby/pulls/query-access
MINOR SS_Query properties now protected
2015-02-10 10:25:54 +00:00
Will Rossiter
ba9b739a04 Merge pull request #3873 from chillburn/patch-1
Update 00_Partial_Caching.md
2015-02-10 17:42:54 +13:00
gavin bruce
e96d40d391 Update 00_Partial_Caching.md
Spelling mistake fix.
2015-02-10 14:30:29 +10:00
Will Rossiter
774be55229 Merge pull request #3870 from assertchris/patch-1
DOC 404 Fix
2015-02-10 09:17:43 +13:00
Christopher Pitt
0a19d882d3 Update index.md
404 fix
2015-02-10 09:16:18 +13:00
Will Rossiter
93355e7f63 Merge pull request #3862 from dhensby/pulls/master-docs
DOCS Updating contributing version
2015-02-10 07:57:51 +13:00
Daniel Hensby
9fd57ea4f6 MINOR SS_Query properties now protected 2015-02-09 16:24:25 +00:00