Commit Graph

13381 Commits

Author SHA1 Message Date
Simon Welsh
c14d58f585 Merge branch '3.1'
Conflicts:
	.travis.yml
	model/ManyManyList.php
	model/fieldtypes/DBField.php
2014-07-16 21:24:02 +10:00
Simon Welsh
8a3eebf289 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	i18n/i18n.php
2014-07-16 21:18:07 +10:00
Simon Welsh
cc9603d6a2 Fatal errors should always return false
This allows PHP to set the exit code on fatals.
2014-07-16 21:03:55 +10:00
Simon Welsh
1a63fa5b17 Merge pull request #2859 from kinglozzer/gd-resize-crash-mast
API: Prevent large images from repeatedly crashing PHP on resize
2014-07-16 20:15:45 +10:00
Loz Calver
791ee7171b API: Prevent large images from repeatedly crashing PHP on resize 2014-07-16 09:18:51 +01:00
Damian Mooyman
80270c521d Merge pull request #3293 from marijnkampf/patch-2
Removed trailing : from yml example causing error
2014-07-16 07:24:26 +12:00
Marijn Kampf
3fc371b24a Removed trailing : from yml example causing error
[Warning] Illegal offset type

Line 597 in \framework\view\Requirements.php
2014-07-15 09:59:43 +01:00
Damian Mooyman
50a2816c69 Merge pull request #3283 from halkyon/static_fix
Fixing function that should be declared as static.
2014-07-11 15:59:35 +12:00
Sean Harvey
3c0967efc0 Fixing function that should be declared as static. 2014-07-11 15:23:44 +12:00
Simon Welsh
28d9b16325 Correct source of Travis status image 2014-07-11 10:36:41 +10:00
Simon Welsh
ece95d3580 Merge pull request #1360 from tractorcow/3.2-pdo-connector
API New Parameterised Database ORM for Silverstripe 3.2. Ticket #7429
2014-07-09 16:21:37 +10:00
Damian Mooyman
d8e9af8af8 API New Database abstraction layer. Ticket #7429
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
2014-07-09 18:04:05 +12:00
Hamish Friedlander
eed2293f31 Merge pull request #3275 from silverstripe/revert-3272-config_fix
Revert "BUG Config::merge_array_low_into_high() ignores falsey values"
2014-07-09 10:53:33 +12:00
Damian Mooyman
c26df0b3c6 Revert "BUG Config::merge_array_low_into_high() ignores falsey values" 2014-07-09 09:57:25 +12:00
Sean Harvey
50214abf7f Merge pull request #2998 from torleif/patch-4
Fix: WYSIWYG now returns valid HTML in tables
2014-07-08 19:56:16 +12:00
Damian Mooyman
ae7d7516f6 Merge pull request #3272 from halkyon/config_fix
BUG Config::merge_array_low_into_high() ignores falsey values
2014-07-08 15:59:22 +12:00
Sean Harvey
16e546300f BUG Config::merge_array_low_into_high() ignores falsey values
Specific case: LeftAndMain::$session_keepalive_ping = true cannot be
set to false in config.yml for some cases because the value is ignored
when merge_array_low_into_high() is processing the config arrays.
2014-07-08 15:18:26 +12:00
Sean Harvey
d1d295056b Merge pull request #3265 from stevie-mayhew/images-force-resample
FEATURE allow force resampling on images
2014-07-07 11:27:16 +12:00
Sean Harvey
2f188fecc5 Merge pull request #3269 from tractorcow/pulls/3.1/convert-js-enhancements
Better encoding of javascript
2014-07-07 09:22:49 +12:00
Damian Mooyman
c30111eee3 Better encoding of javascript
Fixes #2988
2014-07-07 09:01:53 +12:00
Damian Mooyman
66b3d1cae7 Upgrading TinyMCE dependency from 3.5.8 to 3.5.11 2014-07-05 15:06:26 +12:00
Sean Harvey
7e45980530 Merge pull request #3266 from tractorcow/pulls/3.1/debug-view
API Debug::dump in CLI no longer generates HTML. Uses colours.
2014-07-05 14:48:00 +12:00
Damian Mooyman
3c5e51a9f1 API Debug::dump in CLI no longer generates HTML. Uses colours.
API Column size is configurable in DebugView
2014-07-05 14:37:06 +12:00
Sam Minnée
14faf95f35 Fixed wrong variable name in modeladmin docs 2014-07-05 14:34:42 +12:00
Sam Minnée
ac9a6cbc62 Merge pull request #3169 from JorisDebonnet/patch-3
Update modeladmin.md
2014-07-05 14:33:49 +12:00
Stevie Mayhew
1d86fe4f52 FEATURE allow force resampling on images 2014-07-05 14:29:01 +12:00
Sam Minnée
2a3eebf6df Merge pull request #3261 from oceanmountain/patch-1
Update templates.md
2014-07-05 14:23:20 +12:00
Hamish Friedlander
c5f41a7d20 Merge pull request #3246 from tractorcow/pulls/3.1/remove-basicauth-isdev
BUG using isDev query string no longer triggers basic auth
2014-07-05 12:57:12 +12:00
kay
f3f6f8a8be Update templates.md
Changed Fragment links to Anchor links, however it's is slighty confusing what the right name for the thing is.
According to w3.org: "Some URIs refer to a location within a resource. This kind of URI ends with "#" followed by an anchor identifier (called the fragment identifier)." - http://www.w3.org/TR/html401/intro/intro.html#fragment-uri

After doing some research in the most common used name for the #some-link identifier I came to the conclusion that most of the time (about 70% on StackOverflow/BlogArticles/Interwebz) Anchor-link was the term used to describe the identifier. Imho, Anchor is the prefered term for the identifier.

Is it acceptable to change fragment to anchor, since it seems more used?
2014-07-04 13:40:26 +02:00
Sean Harvey
ceb1e6db38 Merge pull request #3256 from tylerkidd/htmlEditorField_Field_fix
Updated HtmlEditorField Field()
2014-07-04 11:59:24 +12:00
Tyler Kidd
16f5ef147e Updated HtmlEditorField Field()
I had a need to use onBeforeRender on a DataExtension of
HtmlEditorField and noticed it wasn't there. Added return
parent::Field($properties) use FormField::Field which utilizes
onBeforeRender.
2014-07-03 08:54:37 -05:00
Stig Lindqvist
e1da0867d0 Merge pull request #3255 from tractorcow/pulls/3.1/fix-i8n-locale
BUG: Fix incorrect common_languages config
2014-07-03 18:01:11 +12:00
Damian Mooyman
c329f07023 BUG: Fix incorrect common_languages config 2014-07-03 17:52:52 +12:00
Damian Mooyman
d3c7e41419 BUG using isDev or isTest query string no longer triggers basic auth 2014-07-02 11:51:51 +12:00
Simon Welsh
6874e44179 Remove PHP 5.6 from allowed failures
PHP5.6 is due for release rather soon, so we should be ready for it
2014-06-28 08:57:24 +10:00
Will Rossiter
2c741fec0c FIX Add support for compositedbfield within many_many_extraFields
Previously selectFromTable would simply try to select the composite field name. This expands the extraField name to include the children field names and uses CompositeDBField::writeToManipulation to generate the correct SQL for the queries.
2014-06-28 10:54:48 +12:00
Cam Findlay
1fee81acef DOCS Document that you can set the global allow extensions via YAML.
Fixes #3233
2014-06-27 08:50:42 +12:00
Damian Mooyman
a6f244faff Merge pull request #3231 from tscole/patch-2
Update i18n.php
2014-06-24 09:14:17 +12:00
Damian Mooyman
15c03bcb46 Merge pull request #3230 from tscole/patch-1
Update i18n.php
2014-06-24 09:12:29 +12:00
tscole
32c2028368 Update i18n.php
Norwegian should use 'nb' and not 'no' in common languages array
2014-06-23 14:52:08 +01:00
tscole
f329f3b313 Update i18n.php
Correct common_languages for Norwegian to use 'nb' and not 'no'
2014-06-23 14:50:36 +01:00
Damian Mooyman
6ff1d3ccbc Merge pull request #3225 from halkyon/log_constants
Adding some more commonly used SS_Log priority constants.
2014-06-23 13:15:45 +12:00
Sean Harvey
9c2ddd4850 Adding some more commonly used SS_Log priority constants. 2014-06-23 11:50:05 +12:00
Mateusz U
32ae468454 Merge pull request #3216 from halkyon/session_inst
Better support for overloading start and destroy methods in Session
2014-06-23 10:15:15 +12:00
Damian Mooyman
ecb0caf1a1 Merge pull request #3228 from daslicht/patch-1
Update javascript.md
2014-06-23 08:45:17 +12:00
daslicht
e0c4a70a8d Update javascript.md
Replaced deprecated jQuery live() with on(), updated link to documentation.
2014-06-22 10:59:59 +02:00
Sean Harvey
0ee3a683a5 Better support for overloading start and destroy methods in Session
Move functionality from static start and destroy functions into instance
methods, allowing these to be overloaded. This works the same way as
calling Session::set() which then in turn calls inst_set()

Additionally use Injector to create the default Session instance to
allow the class to be swapped out.
2014-06-20 10:35:53 +12:00
Will Rossiter
f48cf98921 Merge pull request #3223 from camfindlay/patch-6
Fixes to the :::ss parsing tutorial 1.
2014-06-20 10:20:05 +12:00
Cam Findlay
3e91900cc1 Fixes to the :::ss parsing - extra tabs were breaking it. 2014-06-20 10:13:07 +12:00
Stig Lindqvist
86e91b57bf Merge pull request #3219 from AntonyThorpe/patch-1
Update forms.md with additional example code in MyForm.ss
2014-06-19 15:43:11 +12:00