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
15,743 Commits 31 Branches 527 Tags 162 MiB
390b1fc6c4
Commit Graph

3126 Commits

Author SHA1 Message Date
Daniel Hensby
390b1fc6c4
Merge branch '3.4' into 3 2016-06-29 11:43:02 +01:00
Daniel Hensby
2ab0dcf618
Merge branch '3.3' into 3.4 2016-06-29 11:42:05 +01:00
Daniel Hensby
da0b62f853
Merge branch '3.2' into 3.3 2016-06-29 11:40:58 +01:00
Daniel Hensby
3fe8d30c2c
Merge branch '3.1' into 3.2 2016-06-29 11:40:27 +01:00
Daniel Hensby
c11ac5d248 Merge pull request #4162 from kinglozzer/pulls/object-parse-class-spec 
FIX: Object::parse_class_spec failed to parse associative arrays
 2016-06-28 16:07:12 +01:00
Loz Calver
0ad64387c7
Refactor duplicate code in Object 2016-06-07 16:17:58 +01:00
Loz Calver
429ce55756
FIX: ViewableData::setFailover() didn't remove cached methods 2016-06-07 16:17:49 +01:00
Loz Calver
6811f0969b
Improve performance of TokenisedRegularExpression 2016-05-24 10:30:10 +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
118af06c3f
Efficiency improvement to class manifest 2016-05-19 12:47:29 +01: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
Damian Mooyman
62bd26d11a BUG Fix suppression of display_errors in ErrorControlChain 2016-05-18 13:36:54 +12:00
Daniel Hensby
8673ac15bc
MINOR Empty YAML config causes invalid argument error 2016-04-26 12:58:27 +01:00
Daniel Hensby
679185514d
Merge 3.3 into 3 
Conflicts:
	admin/css/screen.css.map
 2016-04-26 00:24:59 +01:00
Daniel Hensby
745faebd81
Merge 3.2 into 3.3 
Conflicts:
	.travis.yml
 2016-04-26 00:17:09 +01:00
Daniel Hensby
a0812f987a
Merge 3.1 into 3.2 
Conflicts:
	admin/javascript/LeftAndMain.js
	control/HTTPRequest.php
	docs/en/00_Getting_Started/00_Server_Requirements.md
 2016-04-26 00:09:33 +01:00
Damian Mooyman
6ec2656201 BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false 
Fixes #5250
 2016-04-01 11:04:06 +13:00
Simon Erkelens
debe8ba2a3 Improvement: Set the owner on an extension, before getting all the available method names. 
This enhances the extensions to enable certain features like adding wrapper methods instead of having to have them on the object itself.
 2016-03-21 02:36:34 +01:00
Daniel Hensby
add2ecdf8b FIX Parameter tokens now redirect to correct url if mod_rewrite is off 2016-03-18 15:56:39 +00:00
Damian Mooyman
2b26511faa Merge branch '3.3' into 3 2016-02-27 21:20:15 +13:00
Daniel Hensby
b7b1aba3fb FIX undeclared constant issue 2016-02-27 21:01:57 +13:00
Daniel Hensby
c2a0e8945f FIX undeclared constant issue 2016-02-27 21:00:45 +13:00
Daniel Hensby
3d2fcf9087 Fixing undeclared constant issue 2016-02-26 14:45:07 +00:00
Damian Mooyman
9fed5561f4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	core/Constants.php
#	dev/DevelopmentAdmin.php
 2016-02-24 17:39:04 +13:00
Ingo Schommer
37059eb6b3 [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-24 11:47:16 +13:00
Ingo Schommer
faa94d51d5 [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-24 11:33:54 +13:00
Ingo Schommer
893e49703d [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-18 17:28:54 +13:00
Patrick Nelson
a34f17f839 FIX for #5028: Ensure empty YML configs don't break when merging them in (i.e. make sure it's traversable before foreach'ing over it). 2016-02-12 00:25:01 -05:00
Silbinary Wolf
073e73a2f4 Replaced filterByCallback for 'Children' to just create a new array as function calls are exponentially expensive in PHP (the more functions that exist, the slower a function call becomes) and replaced 'array_key_exists' with op-code equivalent for speed. The best increase isn't really noticeable but we should work towards optimizing the core as much as possible. 2016-01-25 13:22:51 +00:00
Daniel Hensby
119bd2f873 Merge pull request #4845 from tractorcow/pulls/3/extension-hook-byref 
API before/afterExtend now support parameters passed by reference
 2016-01-22 16:08:20 +00:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:15:54 +13:00
Damian Mooyman
62f183d037 API before/afterExtend now support parameters passed by reference 
Closes #4810
 2015-12-14 10:10:45 +13:00
Silbinary Wolf
63dddacba7 Optimization: Swapped is_array for faster casting compare, shaved ~4s off flushing on 3.2ghz i5 dual core system 2015-12-05 19:39:37 +11:00
Damian Mooyman
c4dc10b255 Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	forms/DropdownField.php
	tests/model/ImageTest.php
 2015-11-03 13:06:39 +13:00
Damian Mooyman
e07f80014c Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	lang/cs.yml
	lang/sk.yml
 2015-11-03 11:10:46 +13:00
Damian Mooyman
2813f94124 BUG Ensure that filters on any fixed field are scoped to the base data table 
Fixes #4700
 2015-10-30 16:26:14 +13:00
Marco Kernler
5c04dc5d67 ENHANCEMENT - Added new method to display the number of total items in a paginated list within templates 2015-09-25 09:03:04 +02:00
Nicola Fontana
c39cf2d55f Do not hang on nested parameters in search context 2015-09-23 09:12:02 +02:00
Peter Thaleikis
4c19c183fe improve readibility 2015-09-20 20:18:48 +12:00
Damian Mooyman
e64d73c1f7 BUG Fix ClassInfo::table_for_object_field 2015-09-17 18:31:46 +12:00
Hamish Friedlander
a59a90c6b5 Merge pull request #4609 from tractorcow/pulls/3.1/fix-classinfo-breakage 
BUG Fix ClassInfo::table_for_object_field
 2015-09-17 14:45:17 +12:00
Damian Mooyman
c9ba6e5d00 BUG Fix ClassInfo::table_for_object_field 2015-09-17 13:39:42 +12:00
Damian Mooyman
f10785350e Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
 2015-09-09 14:50:47 +12:00
Damian Mooyman
843e54509a Merge pull request #4475 from JeroenDeDauw/rm-unused-vars 
Remove unused local vars
 2015-09-01 11:42:16 +12:00
Damian Mooyman
4a011303b9 Add missing packages 2015-08-24 16:15:38 +12:00