tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
12,647 Commits 31 Branches 527 Tags 162 MiB
90ba514cda
Commit Graph

12647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Will Rossiter
60bcce9921 Merge pull request #2938 from oddnoc/2935-empty-enum-value 
Revert "Tidy up enum matching where classname is missing"
 2014-03-11 08:21:53 +13:00
Fred Condo
ff1a040a51 Revert "Tidy up enum matching where classname is missing" 
This reverts commit 20e082d00e.
Resolves #2935
 2014-03-10 09:44:36 -07:00
Simon Welsh
0e0597f8cd Merge branch '3.0' into 3.1 
Conflicts:
	control/Director.php
	dev/Backtrace.php
	docs/en/installation/nginx.md
	model/HTMLValue.php
	tests/model/SQLQueryTest.php
 2014-03-10 22:56:27 +13:00
Simon Welsh
21f462a77b Update nginx.md 
Provides a nginx.conf that follows nginx good practices and duplicates the functionality of
the .htaccess files in framework, cms and installer.
 2014-03-10 22:48:22 +13:00
Damian Mooyman
6b4864eabf Merge pull request #2934 from timsnadden/patch-2 
Update composer.md
 2014-03-10 11:22:59 +13:00
Tim Snadden
07ca70fce4 Update composer.md 2014-03-10 11:13:19 +13:00
Damian Mooyman
cad863204c Merge pull request #2871 from feejin/urlsegment-trailing-space 
BUG Trim URLSegment before applying replacements in filter
 2014-03-06 08:16:31 +13:00
Damian Mooyman
c61c9e7ac2 Merge pull request #2922 from JayDevlin/2904-upload-loadintofile 
BUG Upload: loadIntoFile() duplicates files if replaceFile=true
 2014-03-05 16:43:45 +13:00
Sean Harvey
c94c26faef Merge pull request #2924 from tractorcow/pulls/3.0-remove-error-suppression 
Rewrote usages of error suppression operator (3.0 version)
 2014-03-05 16:21:39 +13:00
Sean Harvey
11432d1d75 Merge pull request #2925 from tractorcow/pulls/3.1-remove-error-suppression 
Rewrote usages of error suppression operator (3.1 version)
 2014-03-05 16:19:38 +13:00
Damian Mooyman
0cbad41d3b Rewrote usages of error suppression operator 2014-03-05 15:48:55 +13:00
Damian Mooyman
6d5d3d8cb7 Rewrote usages of error suppression operator 2014-03-05 14:22:19 +13:00
Devlin
3c1e82b42c Upload: retrieve existing File if an object without an ID is given and replaceFile=true 2014-03-04 18:02:33 +01:00
Damian Mooyman
23f5f08eda BUG Fix DataObject::loadLazyFields discarding original query parameters 
BUG Fix Versioned::writeToStage failing to write object with unchanged fields
 2014-03-04 16:12:07 +13:00
Damian Mooyman
1cc366fe23 Merge pull request #2850 from kinglozzer/2827-member-extend 
FIX: Rewrite Member getCMSFields to ensure updateCMSFields is only run once (fixes #2827)
 2014-03-04 13:42:17 +13:00
Damian Mooyman
53b5adbcd9 BUG Prevent unnecessary reconstruction of ClassName field after default records are generated 2014-03-04 12:03:45 +13:00
Simon Welsh
ccb791995e Merge pull request #2894 from wilr/3.1-manymanyyaml 
Add support for many_many_extraField in YAML
 2014-03-04 11:35:58 +13:00
Simon Welsh
4f0ee925d1 Merge pull request #2911 from silverstripe-iterators/pulls/reset-failedlogincount 
Reset FailedLoginCount on successful password reset
 2014-03-04 11:35:18 +13:00
Simon Welsh
697a010e5a Merge pull request #2915 from torleif/patch-2 
Update preview.md
 2014-03-04 11:34:22 +13:00
torleif
c3994f4ce7 Update preview.md 
The JavaScript entwine example contains an extra jQuery wrapper
 2014-03-04 11:32:45 +13:00
Colin Richardson
7b13041449 Remove trailing dashes from URLSegment 2014-03-03 22:22:03 +00:00
Andrew Short
78678acdad Merge pull request #2912 from sanjaymundhra/patch-5 
Update 1-building-site
 2014-03-03 20:54:55 +11:00
sanjay
fb0fe3e689 Update 1-building-site 
Possessive pronoun "your" was misspelled as "you"...so the required change performed.
 2014-03-03 15:24:10 +05:30
Will Rossiter
fb0d349cee Merge pull request #2910 from mullerivan/patch-1 
Update css.md
 2014-03-03 17:54:30 +13:00
Ingo Schommer
c047a7b990 Reset FailedLoginCount on successful password reset 2014-03-03 17:47:16 +13:00