Commit Graph

13212 Commits

Author SHA1 Message Date
Simon Welsh
cbbce430e1 Merge pull request #2297 from colymba/htmleditorconfig-mode-fix
HtmlEditorConfig default TinyMCE mode is now none
2014-03-17 08:22:14 +13:00
colymba
9b5e5e812e HtmlEditorConfig default TinyMCE mode is now none 2014-03-16 13:48:01 +02:00
Simon Welsh
7feb225e7b Merge pull request #2959 from Zauberfisch/patch-4
Improvements on GridField customisation docs
2014-03-16 21:43:55 +13:00
Zauberfisch
62537c5886 more docs for GridField & ModelAdmin customization 2014-03-16 08:40:50 +00:00
Simon Welsh
26f805fbb3 Merge remote-tracking branch 'origin/3.1' 2014-03-16 13:51:34 +13:00
Simon Welsh
7d24f0ed40 Merge pull request #2957 from camspiers/ssviewer-from-string-cache
Cache templates created from string SSViewer_FromString
2014-03-16 13:23:31 +13:00
Cam Spiers
145d78edca Cache templates created from string SSViewer_FromString 2014-03-16 13:16:24 +13:00
Simon Welsh
16fe87e4aa Merge pull request #2677 from chillu/pulls/zend-aggregate
Skip tags in Zend_Cache for Aggregate if not available, better docs
2014-03-16 12:39:33 +13:00
Ingo Schommer
78f74737b6 Improved SS_Cache docs, moved to /docs
We keep having trouble with extended PHPDoc formatting,
and have similar topics covered in Markdown already.
Moved docs, added some details about timeouts and
the theory of caching backends.
2014-03-16 11:55:55 +13:00
Ingo Schommer
cc51e0a889 Skip tags in Zend_Cache for Aggregate if not available
Allows usage of one consistent Zend_Cache backend
for all SilverStripe core storage, greatly simplifying
its configuration. This means a call to Aggregate::flushCache()
will indeed flush all caches if the backend doesn't support tags,
including any custom caches defined through SS_Cache.
Given caches are regarded transient that's an acceptable limitation.
2014-03-16 11:54:00 +13:00
Ingo Schommer
6b53368814 QA pointers in docs 2014-03-16 11:41:21 +13:00
Simon Welsh
dbf64399b8 Update expected ID value 2014-03-16 09:52:37 +13:00
Simon Welsh
8f31352039 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
2014-03-16 09:36:48 +13:00
Simon Welsh
69fa6649ff Merge pull request #2955 from kinglozzer/pulls/default-error-handler
Make default PHP error handler fatal
2014-03-16 09:05:52 +13:00
Simon Welsh
509c1f798a Merge pull request #2759 from kinglozzer/fieldlist-argument-ordering
FieldList->insertBefore/After now accept arguments in either order (fixes #2737)
2014-03-16 09:04:44 +13:00
Loz Calver
454412905c Make default PHP error handler fatal 2014-03-15 11:52:01 +00:00
Loz Calver
a73c3574e2 FieldList->insertBefore/After now accept arguments in either order (fixes #2737) 2014-03-15 11:32:51 +00:00
Simon Welsh
10e184fd31 Merge pull request #2954 from jordanmkoncz/patch-2
Minor fix for note about lack of news-file icon
2014-03-15 21:57:18 +13:00
Simon Welsh
d28a323fbd Merge pull request #2941 from torleif/patch-3
Updated find_or_make() documentation
2014-03-15 21:55:06 +13:00
Simon Welsh
6e7195bac5 Merge pull request #2923 from IgorNadj/patch-1
updating comments for HTTPRequest - immutability
2014-03-15 21:48:20 +13:00
Simon Welsh
90ba514cda Merge pull request #2917 from tractorcow/pulls/fix-lazyload-queryparams
BUG Fix DataObject / Versioned publishing issues
2014-03-15 21:45:42 +13:00
Simon Welsh
ccaca9a6aa Merge pull request #2916 from tractorcow/pulls/fix-classname-generation
BUG Prevent unnecessary reconstruction of ClassName field
2014-03-15 21:44:29 +13:00
Simon Welsh
3e57cc069e Merge pull request #2907 from dhensby/patch-1
FIX Log out current member when forgotten password
2014-03-15 21:42:41 +13:00
Simon Welsh
bc8d2d638e Merge pull request #2875 from kinglozzer/2361-gridfield-column-header-css
FIX: Ensure valid CSS classes for GridField header (fixes #2361)
2014-03-15 21:39:42 +13:00
Simon Welsh
b145e96d27 Merge pull request #2818 from tractorcow/pulls/gridstate_data-error-test
BUG GridState_Data doesn't hold falsey values - Fixes #2813
2014-03-15 21:29:56 +13:00
Simon Welsh
3b330a065b Merge pull request #2800 from phptek/issue/2795
BUG Ensure TreeMultiSelectField doesn't populate menus with "unchanged".
2014-03-15 21:27:33 +13:00
Simon Welsh
cc9ce325bd Merge branch 'mrsmuneton-RssFeedArgumentsDocNote' into 3.1
Closes #2798
2014-03-15 21:26:21 +13:00
Ray
7669c5b869 Noting two more arguments in the list RSSFeed 2014-03-15 21:25:28 +13:00
Daniel Black
7c0d47eba0 Update install.php5
Defaulting to MySQL here is really dumb. There is an explicit type as an argument so falling back to mysql could result in "I couldn't write to path ....db" despite the real error that the include of the sqlite3/code/SQLiteDatabaseConfigurationHelper.php failed for some reason.

Other uses of getDatabaseConfigurationHelper also need a similar error handler.
2014-03-15 21:23:16 +13:00
madmatt
648d1a0cf4 Allow GridFields without titles to be found. 2014-03-15 21:23:16 +13:00
Simon Welsh
7ee70cec0b Merge pull request #2778 from grooverdan/patch-1
Update install.php5 - error handling on getDatabaseConfigurationHelper
2014-03-15 21:17:30 +13:00
Simon Welsh
66b60cb486 Merge pull request #2754 from madmatt/pulls/behat-profile
Allow GridFields without titles to be found.
2014-03-15 21:13:06 +13:00
Simon Welsh
310e90d412 Merge pull request #2751 from axyr/patch-1
formHtmlContent() uses missing FormEncType() call
2014-03-15 21:12:44 +13:00
Simon Welsh
279b927df1 Merge pull request #2903 from tractorcow/pulls/fix-fileupload-fileexists
BUG Fix issues with uploading to /assets
2014-03-15 21:02:36 +13:00
Simon Welsh
bdd936d078 Set the response to 403 on error 2014-03-15 20:58:47 +13:00
Simon Welsh
5beaebc43a Merge pull request #2718 from silverstripe-rebelalliance/2503
BUG: Fixes performReadonlyTransformation for OptionSetField

Closes #2503
2014-03-15 20:45:04 +13:00
Simon Welsh
5b2215308e Merge pull request #2482 from ajshort/pull-2
Fix Versioned::augmentSQL() when the data query was null.
2014-03-15 20:40:45 +13:00
Simon Welsh
42c90aebb9 Merge pull request #2344 from colymba/uploadfield-upload-validation
FIX UploadField server validation error display
2014-03-15 20:24:58 +13:00
Simon Erkelens
6676787176 ENHANCEMENT: Allow nested grouping of GroupedList 2014-03-15 19:20:28 +13:00
Simon Welsh
dbb6ba82f8 Handle special characters in error messages when html_errors is Off
Fixes #1538
2014-03-15 14:38:54 +13:00
Simon Welsh
99d6498467 Correct backend name so that Zend_Cache can find it
Closes #1425
2014-03-15 11:02:49 +13:00
Jordan Koncz
34b2145fcd Minor fix for note about lack of news-file icon
Minor fix for note about the lack of a news-file icon to improve clarity.
2014-03-15 07:48:52 +11:00
Simon Welsh
d1befdd37c Merge pull request #2901 from dhensby/director-test
Making Director::test() ignore URL Anchors
2014-03-15 00:09:06 +13:00
Simon Welsh
7f704cfc97 Merge pull request #2953 from jordanmkoncz/patch-1
Fixed inconsistencies and out of date information
2014-03-14 23:45:45 +13:00
Jordan Koncz
faf36ba713 Fixed inconsistencies and out of date information 2014-03-14 20:49:26 +11:00
Simon Welsh
eca35c473c Add PHP 5.6 to Travis 2014-03-13 20:47:52 +13:00
Ingo Schommer
1dac8ab103 Added min stability for composer
Required for scrutinizer runs
2014-03-13 10:17:35 +13:00
Andrew Short
366ac6baa4 Merge pull request #2944 from howardgrigg/Docs-patch
DOCS Added info about adjusting Image quality using new config
2014-03-12 15:18:50 +11:00
Howard Grigg
8ee6359e44 DOCS Added info about adjusting Image quality using new config 2014-03-12 10:44:47 +10:00
torleif
76e689b8c0 Updated find_or_make() documentation
See: https://github.com/silverstripe/silverstripe-framework/pull/2903#issuecomment-37252948
2014-03-11 14:26:08 +13:00