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
16,468 Commits 31 Branches 527 Tags 162 MiB
ac101790d7
Commit Graph

16468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
ac101790d7 Merge pull request #5552 from mrb/update_codeclimate_yml 
Add some excludes to codeclimate.yml
 2016-05-24 09:48:09 +12:00
Daniel Hensby
65ba709271 Giving composer more responsibility over autoloading (#5572) 2016-05-24 08:40:05 +12:00
Damian Mooyman
ecc9d6be01 Merge pull request #3926 from dhensby/pulls/handle-request-cleanup 
Cleaning up Controller::handleRequest
 2016-05-23 13:14:22 +12:00
Daniel Hensby
75d9f6e589
Upgrading docs 2016-05-23 00:21:04 +01:00
Daniel Hensby
e5f1ca3bbe
Cleaning up Controller::handleRequest 
1. Separated responsibility of handleAction so that it no longer bootstraps the controller and cleans up after the request is handled.
2. NEW beforeHandleRequest to take responsibility of bootstrapping the controller
3. NEW afterHandleRequest to take responsibility of cleanup for the controller
4. NEW calling init on controllers deprecated in favour of callInit() which takes responsibility of enforcing that "base init" is called and the before and after hooks
5. NEW Added prepareResponse to Controller for dealing with responses from controllers
6. NEW setResponse added to controller for setting response objects on the controller
 2016-05-23 00:21:04 +01:00
Daniel Hensby
cbd26052da
Merge branch '3' 2016-05-22 11:21:17 +01:00
Daniel Hensby
2e0a5245f8
Merge branch '3.4' into 3 2016-05-22 11:18:42 +01:00
Daniel Hensby
706be1210f
Merge branch '3.3' into 3.4 2016-05-22 11:17:28 +01:00
Daniel Hensby
2ae2675a47
Merge branch '3.2' into 3.3 2016-05-22 11:16:04 +01:00
Daniel Hensby
f3cf55074f
Merge branch '3.1' into 3.2 2016-05-22 11:10:37 +01:00
Daniel Hensby
221fc88d84 Merge pull request #5574 from silverstripe/add-helpful-robot-badge 
Added Helpful Robot badge
 2016-05-21 07:58:23 +01:00
Christopher Pitt
971fd4291d Added Helpful Robot badge 2016-05-21 16:58:04 +12:00
Loz Calver
4e6d0b3982 Merge pull request #5573 from dhensby/pulls/3.1/fix-no-db-tests 
FIX #5557 Tests with no DB requirements wont create test DB
 2016-05-20 16:43:33 +01:00
Daniel Hensby
8382685034
FIX #5557 Tests with no DB requirements wont create test DB 2016-05-20 15:37:52 +01:00
Daniel Hensby
cdb0b07345
Merge branch '3' 2016-05-20 14:20:33 +01:00
Daniel Hensby
e6f9e3a370
Merge branch '3.4' into 3 2016-05-20 12:35:58 +01:00
Daniel Hensby
016d39c81e
Merge branch '3.3' into 3.4 2016-05-20 12:34:10 +01:00
Daniel Hensby
4307aa36c8
Merge branch '3.2' into 3.3 2016-05-20 12:25:20 +01:00
Daniel Hensby
0c3d30e621
Merge branch '3.1' into 3.2 2016-05-20 12:24:47 +01:00
Will Rossiter
0a67052d6c Merge pull request #5564 from dhensby/pulls/3.1/manifest-optimisation 
Efficiency improvement to class manifest
 2016-05-20 14:32:43 +12:00
Daniel Hensby
4c4154115f Merge pull request #5569 from silverstripe-terraformers/fixes/field-diff 
Switched Diff to the escaped variable created
 2016-05-20 01:26:41 +01:00
Christopher Joe
b4ac3ba141 Switched Diff to the escaped variable created 2016-05-20 10:51:59 +12:00
Daniel Hensby
3a9bb642d2 Merge pull request #5566 from stevie-mayhew/bugfix/uid 
BUGFIX: check token and UID before member autologin
 2016-05-19 23:46:09 +01:00
Stevie Mayhew
b1df9dcb1d BUGFIX: check that we have a token and a UID before attempting a member auto login 2016-05-20 09:19:08 +12:00
Daniel Hensby
118af06c3f
Efficiency improvement to class manifest 2016-05-19 12:47:29 +01:00
Michael van Schaik
3a277f3a5e Update ClassInfo to return arrays where expected (#5563) 
These methods are expected to return an array instead of null (if $class doesnt exist);
- getValidSubClasses
- dataClassesFor
- subclassesFor
- ancestry

Fixes: #5562
Also see: https://github.com/silverstripe/silverstripe-framework/issues/5171
 2016-05-19 12:28:35 +01:00
Daniel Hensby
be7e0db26e
Merge pull request #3835 from dnadesign/hideFromHierachy3 2016-05-19 11:52:47 +01:00
Ingo Schommer
de13e10787 Removed branch alias which should only apply to latest release branch (#5561) 
See 070ae2555b
for similar commit when going from 3.1 to 3.2.
 2016-05-19 09:54:30 +01:00
Damian Mooyman
0ccd33f9f1 Alias 3 as 3.5 2016-05-19 16:08:47 +12:00
Damian Mooyman
9c021c45b8 Merge 3.4.0 into 3 2016-05-19 15:48:06 +12:00
Damian Mooyman
0d356d078d Add release notes to changelog 2016-05-19 15:27:07 +12:00
Damian Mooyman
b4e8c595f5 Added 3.4.0-rc1 changelog 2016-05-19 15:08:09 +12:00
Damian Mooyman
d125d4e304 Update translations 2016-05-19 14:48:39 +12:00
Damian Mooyman
d8f6d94d30 Merge pull request #4974 from patricknelson/issue-4909-rss-via-injector 
FIX for #4909: Ensure RSSFeed_Entry is instantiated using the injector.
 2016-05-19 14:31:59 +12:00
Damian Mooyman
b634b1a67d Merge pull request #5537 from IgorNadj/patch-niceformats 
ENH: moving hardcoded nice date/time formats to config
 2016-05-19 14:12:22 +12:00
Damian Mooyman
6035be7e57 Merge pull request #5548 from kinglozzer/4661-extrafields-casting 
FIX: castingHelper failed to find many_many_extraFields data (fixes #4661)
 2016-05-19 14:10:37 +12:00
Damian Mooyman
5df9cb05f3 Merge pull request #5551 from AntonyThorpe/patch-1 
Updated 01_Data_Model_and_ORM.md for byID
 2016-05-19 14:08:45 +12:00
Loz Calver
12f6bdcd1b Merge pull request #5559 from dhensby/pulls/3/retina-icons-pick 
FIX Remove old logout icon on retina screens
 2016-05-18 16:55:29 +01:00
scott1702
f373632d98
Remove old logout icon on retina screens 
Remove background rules for old preview icons
 2016-05-18 16:28:05 +01:00
Michael James
3870c499d6 DOCS Adding comma to array declaration (#5558) 2016-05-18 15:07:45 +01:00
Damian Mooyman
574bc6038b Merge 3 into master 
# Conflicts:
#	CONTRIBUTING.md
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/javascript/LeftAndMain.EditForm.js
#	admin/javascript/LeftAndMain.js
#	admin/scss/_forms.scss
#	dev/Debug.php
#	docs/en/05_Contributing/01_Code.md
#	forms/DropdownField.php
#	model/DataObject.php
#	model/Versioned.php
#	model/fieldtypes/DBLocale.php
#	tests/forms/gridfield/GridFieldExportButtonTest.yml
#	tests/model/MoneyTest.php
#	tests/model/MoneyTest.yml
#	tests/model/SQLQueryTest.php
 2016-05-18 18:36:10 +12:00
Damian Mooyman
66ef857cdf Manual merge of #5412 into master 2016-05-18 17:42:13 +12:00
Damian Mooyman
303f695751 Merge 3.3 into 3 
# Conflicts:
#	admin/javascript/LeftAndMain.EditForm.js
 2016-05-18 17:29:30 +12:00
Damian Mooyman
dad7981332 Merge 3.2 into 3.3 2016-05-18 17:27:28 +12:00
Damian Mooyman
8dfeeb0eb6 Merge 3.1 into 3.2 2016-05-18 17:25:42 +12:00
Hamish Friedlander
d350aa4153 Merge pull request #5555 from open-sausages/pulls/3.1/fix-display-errors 
BUG Fix suppression of display_errors in ErrorControlChain
 2016-05-18 16:04:57 +12:00
Hamish Friedlander
0dd1cc09d0 Merge pull request #5556 from open-sausages/pulls/3/errors-http-response 
API Enable Debug.friendly_error_httpcode to correctly set HTTP status code for errors
 2016-05-18 15:37:36 +12:00
Damian Mooyman
757cfae90c API Enable Debug.friendly_error_httpcode to correctly set HTTP status code for errors 2016-05-18 14:27:45 +12:00
Damian Mooyman
62bd26d11a BUG Fix suppression of display_errors in ErrorControlChain 2016-05-18 13:36:54 +12:00
Damian Mooyman
8ed25ae482 BUG Fix DataObject::isChanged() detecting non saveable changes (#5545) 2016-05-18 09:00:04 +10:00