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,819 Commits 31 Branches 527 Tags 162 MiB
c3c3145d37
Commit Graph

12819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
023641e263 Merge pull request #2776 from ryanwachtl/fix-get-candidate-template 
FIX Overriding of theme templates in project folder
 2014-03-25 23:08:36 +13:00
Sean Harvey
7ecc563783 Merge pull request #2969 from mrsmuneton/3.1 
Issue 1603, rewrote first sentence - uses the php curl lib
 2014-03-20 16:13:22 +13:00
Ray
0b7d617875 Issue 1603, rewrote first sentence - uses the php curl lib 
Issue 1603, rewrote first sentence - uses the php curl library, enabling connections to remote web services
 2014-03-19 20:00:13 -07:00
Simon Welsh
ff9d40a60d FIX Escape the redirect URL before outputting 
Signed-off-by: Stephen Shkardoon <stephen@silverstripe.com>
 2014-03-19 21:34:49 +13:00
Will Rossiter
912cda9a1e Close the mysqli connection when deleting the class. 2014-03-17 21:46:47 +13:00
Will Rossiter
2beb1631a5 Allow DB::connect() to specify the connection name. 2014-03-17 21:46:40 +13:00
Simon Welsh
804b942e8a Merge pull request #2961 from phptek/cms-issue-965 
NEW Added FormatFromSettings(). Formats dates as per user preferences.
 2014-03-17 13:09:18 +13:00
Russell Michell
26f8341438 NEW Added FormatFromSettings(). Formats dates as per user preferences. 
- Required for silverstripe-cms/issue/965.
- Separate implementations for Date and SS_Datetime.
 2014-03-17 10:15:59 +13:00
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
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
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
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
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
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
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