Commit Graph

13515 Commits

Author SHA1 Message Date
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
colymba
8fb5e9c3a4 API New JS sprintf and inject replacement functions
Fix sprintf issues when replacement was at start of string + introduce
new inject function using injection map similar to the PHP version of
_t()
2014-06-05 22:47:49 +03: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
d76486344a Merge pull request #3172 from stevie-mayhew/patch-1
Update datamodel.md
2014-05-29 16:58:26 +12:00
Stevie Mayhew
0da889bde2 Update datamodel.md
Fix broken link to SS_List->column
2014-05-29 16:25:40 +12:00
Damian Mooyman
083c0e083b Merge pull request #3171 from ss23/patch-4
Update i18n.md
2014-05-29 14:34:10 +12:00
Stephen Shkardoon
6b410aa9a0 Update i18n.md
Fix a link being inside backticks, which broke the formatting.
2014-05-29 13:13:45 +12:00
JorisDebonnet
a224678d98 Update modeladmin.md
Corrected many broken link-renderings. Also removed the "Related" link to [genericviews Module](http://silverstripe.org/generic-views-module) because it doesn't work, and I can't it elswhere.
2014-05-29 00:51:27 +02:00
JorisDebonnet
9899b48daf Update dataobject.md
There's no way to make things like [api:DataObject->beforeUpdateCMSFields()] work, is there? 

I removed those kind of api tags (the links yielded a 404 page), and corrected a few other link-rendering issues.
2014-05-29 00:41:29 +02: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
Damian Mooyman
a5a390680f Merge pull request #3150 from IgorNadj/patch-3
BUG fix listview not working with IE9
2014-05-22 13:11:03 +12:00
Igor
32136305be 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 12:39:32 +12:00
Hamish Friedlander
a263bed937 Merge pull request #3091 from willmorgan/pulls/testrunner-suites
TestRunner: allow test suite running
2014-05-22 10:32:21 +12:00
Devlin
5f7ebd3c23 API UploadField: move replaceFile to the front end config 2014-05-21 12:03:26 +02:00
Damian Mooyman
4a34c364e6 BUG Fix access to protected Session::current_session()
Fixes #3144
2014-05-20 10:17:33 +12:00
Simon Welsh
08ea44d458 Merge pull request #3140 from marijnkampf/patch-2
Update uploadfield.md
2014-05-15 21:32:57 +10:00
Marijn Kampf
5daec94830 Update uploadfield.md
Fix 403 forbidden error: Action 'Form' isn't allowed on class GalleryPage_Controller.
2014-05-15 08:55:16 +01:00
Damian Mooyman
ee6e4968fd BUG Fix grid field showing search without search component added
ref: CWPBUG-133
2014-05-15 14:26:05 +12:00
Damian Mooyman
c24a2c2177 BUG ArrayList failing to respect the SS_Sortable interface
ref: CWPBUG-133
2014-05-15 14:25:23 +12:00
Damian Mooyman
c3c3145d37 Merge remote-tracking branch 'origin/3.1.5' into 3.1 2014-05-13 16:51:55 +12:00
Damian Mooyman
830c10704c Fix changelog 2014-05-13 15:06:43 +12:00
Damian Mooyman
c492c5efda Merge remote-tracking branch 'origin/3.0' into 3.1.5
Conflicts:
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	tests/filesystem/FolderTest.php
2014-05-13 14:32:27 +12:00