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
13,325 Commits 31 Branches 527 Tags 162 MiB
1fee81acef
Commit Graph

13325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ef03dfdd5b Merge remote-tracking branch 'origin/3.1' 2014-06-17 18:17:24 +12:00
Damian Mooyman
11cc27f700 Merge pull request #2967 from halkyon/formfield_readonly 
Fixing FormField not setting readonly attribute on setReadonly(true)
 2014-06-17 14:48:56 +12:00
Sean Harvey
b4bfb75a0d Merge pull request #3207 from chillu/pulls/behat-gridfield 
Moved table-related feature steps to behat extension
 2014-06-17 13:43:33 +12:00
Damian Mooyman
91afa4ac61 Merge pull request #3211 from kinglozzer/pulls/3210-duplicate-classes 
FIX: ClassManifest errors if files contain duplicate class names (fixes #3210)
 2014-06-17 10:17:47 +12:00
Loz Calver
3d71a22a98 FIX: ClassManifest errors if files contain duplicate class names (fixes #3210) 2014-06-16 22:18:18 +01:00
Ingo Schommer
bb03f6ba2f Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	forms/HtmlEditorField.php
 2014-06-15 22:50:20 +12:00
Stig Lindqvist
1cd27ed972 Merge pull request #3105 from tractorcow/pulls/3.2-fix-fulltext-query-encoding 
Changelog note for CMS:#1013
 2014-06-14 17:15:14 +12:00
Stig Lindqvist
34304cf6e4 Merge pull request #3139 from tractorcow/pulls/3.1/fix-gridfield-sorting 
BUG Fix grid field showing search without search component added
 2014-06-14 17:10:17 +12:00
Stig Lindqvist
332c2c3db0 Merge pull request #3129 from dnadesign/formFieldContainerFieldList 
added in a containerFieldList getter
 2014-06-14 17:06:15 +12:00
Stig Lindqvist
c05030d513 Merge pull request #3188 from dhensby/patch-1 
DOCS Explicitly exclude dev deps for deployment
 2014-06-14 16:28:43 +12:00
Ingo Schommer
415ba11356 Merge pull request #3175 from tractorcow/pulls/3.1/mink-update 
Update for Mink 1.6 compatibility (DO NOT MERGE)
 2014-06-13 16:34:22 +12:00
Ingo Schommer
a433fa2ec4 Moved table-related feature steps to behat extension 
Reused for tables other than GridField.
See https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/51
 2014-06-13 15:10:16 +12:00
Damian Mooyman
3e29f6b29b Merge pull request #3203 from mateusz/remove-global-state 
Fetch the nearest Controller instead of relying on global state.
 2014-06-13 10:15:19 +12:00
Mateusz Uzdowski
741ab96418 Fetch the nearest Controller instead of relying on global state. 
Controller:curr() in this context are equivalent to calling
getToplevelController() which already solves the issue of nested
GridFields.
 2014-06-12 16:47:49 +12:00
Mateusz U
020b590f23 Merge pull request #3201 from tractorcow/pulls/3.1/di-fix 
BUG fix dependency injection stumbling over ViewableData's __isset
 2014-06-12 10:41:37 +12:00
Damian Mooyman
d516063db7 BUG fix dependency injection stumbling over ViewableData's __isset 2014-06-12 10:08:59 +12:00
Mateusz U
a584c8c83a Merge pull request #3198 from tractorcow/pulls/3.1/lazy-session 
Versioned no longer sets redundant session data
 2014-06-11 16:55:20 +12:00
Damian Mooyman
4c5de82625 Versioned no longer sets redundant session data 2014-06-11 16:42:22 +12:00
Damian Mooyman
8c10e12529 Merge pull request #3196 from mateusz/patch-html-editor-field 
BUG Sanitise the PHP output.
 2014-06-11 12:13:33 +12:00
Mateusz Uzdowski
18b6870cf2 BUG Sanitise the PHP output. 2014-06-11 11:34:31 +12:00
Damian Mooyman
fe597e32b4 Merge pull request #3193 from phillprice/patch-3 
Update Form.php
 2014-06-11 09:02:17 +12:00
Phill Price
b2455f2d20 Update Form.php 
tiny typo
 2014-06-10 13:50:28 +01:00
Daniel Hensby
a32a1bcf11 DOCS Explicitly exclude dev deps for deployment 
Docs should tell users how to deploy without development dependencies
 2014-06-05 18:57:25 +01:00
Simon Welsh
81e6c806a7 Update modeladmin.md 
DataList is immutable, so need to assign.
 2014-06-05 15:03:02 +10:00
Damian Mooyman
e7014f4cb5 Merge pull request #3184 from silverstripe-iterators/pulls/conditional-force 
Conditionally reset MemberLoginForm.force_message
 2014-06-04 08:24:24 +12:00
Ingo Schommer
58445245d9 Conditionally reset MemberLoginForm.force_message 
Avoid starting a session just because the login form is rendered,
which adds overhead to requests and makes them harder to cache.
 2014-06-03 23:21:57 +12:00
Damian Mooyman
89333d575d Merge pull request #3174 from camspiers/patch-1 
Remove redundant ternary expression
 2014-05-30 17:28:53 +12:00
Damian Mooyman
4fdfff8a23 Update for Mink 1.6 compatibility 2014-05-30 15:46:54 +12:00
Cam Spiers
9aa7414aed Remove redundant ternary expression 
Replace it with casting to a boolean
 2014-05-30 14:54:57 +12:00
Damian Mooyman
fda91b7f8c Merge pull request #3165 from sanjaymundhra/patch-9 
Update sqlquery.md
 2014-05-29 08:23:53 +12:00
Simon Welsh
e75f222fa5 Merge pull request #3166 from phillprice/patch-2 
Update DropdownField.php
 2014-05-28 21:38:10 +10:00
Phill Price
5b60646e55 Update DropdownField.php 
An error in the example (missing comma) spotted by michaelcslweb
 2014-05-28 11:36:51 +01:00
John Milmine
da67f9109d added in a getter 2014-05-28 13:58:40 +12:00
sanjay
b317fbabdd Update sqlquery.md 
adds missing datatype (i.e. Varchar) to the database field 'Name' of the Class 'Player'
 2014-05-27 20:05:37 +05:30
Damian Mooyman
1c9f9551b6 Merge pull request #3160 from sanjaymundhra/patch-8 
Update simple-contact-form.md
 2014-05-27 11:40:02 +12:00
Ingo Schommer
0101423969 Merge pull request #3048 from JayDevlin/2920-uploadfield-master 
API UploadField: move replaceFile to the front end config
 2014-05-26 22:20:35 +12:00
sanjay
b5a7be6082 Update simple-contact-form.md 
corrects the description about the order of the arguments passed while creating Form object.
 2014-05-26 14:27:44 +05:30
Sean Harvey
3e4bf08f36 Merge pull request #3155 from simonwelsh/iconv_changes 
Only use iconv.internal_encoding in PHP<5.6
 2014-05-26 09:22:58 +12:00
Sean Harvey
486521ed1a Merge pull request #3158 from JorisDebonnet/patch-1 
Update i18n.md
 2014-05-26 09:16:29 +12:00
JorisDebonnet
90bb1ec7f7 Update i18n.md 
Corrected a mistake: to make a new locale available (in particular for use with silverstripe/translatable), i18n:common_locales needs to be updated, not i18n:common_languages.
 2014-05-25 21:09:06 +02:00
Simon Welsh
8ed5e8490d Use php.internal_encoding instead of iconv.internal_encoding in PHP 5.6+ 2014-05-24 11:35:19 +10:00
Simon Welsh
85d2a16ad6 Update Zend_Locale_Format to the latest Zend version 2014-05-24 11:28:00 +10:00
Simon Welsh
824c6067a2 Merge pull request #3107 from micmania1/patch-1 
CustomMember extends wrong class.
 2014-05-24 11:08:35 +10:00
Simon Welsh
9b3bfb2e10 Merge pull request #3145 from tractorcow/pulls/3.1/fix-choose-stage 
BUG Fix access to protected Session::current_session()
 2014-05-24 11:07:40 +10:00
Simon Welsh
b020cabc1a Merge pull request #3138 from tractorcow/pulls/3.1/fix-arraylist-sorting 
BUG ArrayList failing to respect the SS_Sortable interface
 2014-05-24 11:05:25 +10:00
Mateusz U
2ed85dd47b Merge pull request #3152 from silverstripe-iterators/pulls/https-proto 
API Fix HTTPS proxy header detection
 2014-05-23 09:08:29 +12:00
Ingo Schommer
ec325a3c7f API Fix HTTPS proxy header detection 
Didn't use the de facto standard HTTP_X_FORWARDED_PROTO or the less standard HTTP_FRONT_END_HTTPS.
Removed the 'X-Forwarded-Proto', since PHP should prefix/underscore all HTTP headers before it hits $_SERVER.

References:
- https://docs.djangoproject.com/en/1.4/ref/settings/#secure-proxy-ssl-header
- https://drupal.org/node/1859252
- https://drupal.org/node/313145
- http://scottwb.com/blog/2013/02/06/always-on-https-with-rails-behind-an-elb/
 2014-05-22 18:34:15 +12:00
Damian Mooyman
6466e390af Merge pull request #3151 from IgorNadj/patch-2 
BUG fix listview not working with IE9
 2014-05-22 15:59:31 +12:00
Igor
f9e7d47bc9 BUG fix listview not working with IE9 
To reproduce:

1. Using IE9, go to demo.silverstripe.com
2. login
3. go to Pages
4. switch to listview
5. expand pages to get to one with pagination (e.g. Pages > Features > Listview)
6. go to next page

Expected: you go to the next page
Actual: it jumps you back to the home page

Fix: this fix passes parameters stored in the hash part of the url, which IE9 and below rely on for PJAX.
 2014-05-22 14:17:33 +12:00