12843 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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	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	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
Damian Mooyman	d9c037bb69	Merge remote-tracking branch 'origin/3.0.11' into 3.0	2014-05-13 14:02:28 +12:00
Damian Mooyman	ce516ca1cd	Release docs	2014-05-13 13:02:21 +12:00
Will Morgan	1d4082b6f0	MINOR Use composer @stable for PHPUnit ... Using stable will allow some packages to be downloaded as zips instead of clones all the time.	2014-05-13 11:25:56 +12:00
Damian Mooyman	96b086a843	Update translation masters ... Revert some changes from prior commit	2014-05-13 10:54:33 +12:00
Sean Harvey	f5569078e5	Merge pull request #3125 from tractorcow/pulls/3.1/configtest ... BUG Fix deprecated use of statics in test cases	2014-05-12 09:21:28 +12:00
Damian Mooyman	51c3346b46	BUG Fix deprecated use of statics in test cases	2014-05-12 08:44:11 +12:00
Ingo Schommer	21fef41c3f	Merge pull request #3124 from kinglozzer/pulls/3122-translate-cache-cleaning ... FIX: Prevent i18n clearing all SS_Caches (fixes #3122)	2014-05-12 08:14:58 +12:00
Loz Calver	d012b79cf0	FIX: Prevent i18n clearing all SS_Caches (fixes #3122)	2014-05-10 21:37:13 +01:00
Will Morgan	8ab3881bfa	MINOR Use composer @stable for PHPUnit ... Using stable will allow some packages to be downloaded as zips instead of clones all the time.	2014-05-09 16:42:43 +12:00
Ingo Schommer	dd638014a4	Merge pull request #3104 from willmorgan/patch-5 ... MINOR Use composer @stable for PHPUnit	2014-05-09 16:34:01 +12:00
Ingo Schommer	a05d8113af	Merge pull request #3103 from simonwelsh/configstatic_nextstring ... Adds to nextString() method to ConfigStaticManifest	2014-05-09 16:08:19 +12:00
Ingo Schommer	c647c97fe4	Merge pull request #3118 from phillprice/patch-1 ... Update pagination.md	2014-05-09 09:09:42 +12:00
Phill Price	adf478b4e9	Update pagination.md ... Eror in Limit example	2014-05-08 21:46:30 +01:00
Damian Mooyman	98e5c1556f	Release docs update	2014-05-07 15:54:55 +12:00
Damian Mooyman	0099a18182	Merge pull request #3100 from tractorcow/pulls/3.0-fix-foldername ... FIX Folder Title not being exactly the same as Name field	2014-05-07 15:34:59 +12:00
Damian Mooyman	0ae96ab030	Changelog tags	2014-05-07 14:11:10 +12:00
Damian Mooyman	953e4b4c49	Added change log for 3.0.11-rc1	2014-05-07 14:03:13 +12:00
Damian Mooyman	617827d3ed	Updated documentation index	2014-05-07 11:06:34 +12:00
Damian Mooyman	58d2535082	Added 3.1.5-rc1 change log	2014-05-07 10:54:33 +12:00
Ingo Schommer	ea1a0d16fc	Merge pull request #3106 from tractorcow/pulls/3.0/path-checking ... Path resolution cleanup	2014-05-07 08:39:17 +12:00
Michael Strong	9e66db4fe1	CustomMember extends wrong class. ... CustomMember was extending the wrong class to be able to reference $this->owner. Also, changed CustomMember to MyMemberExtension to remain consistent with the initial example.	2014-05-06 09:37:30 +01:00
Damian Mooyman	5a69cf67ff	Update translation masters	2014-05-06 17:38:58 +12:00
Simon Welsh	3602ce2db8	Adds to nextString() method to ConfigStaticManifest ... This is used to get the classname out of the tokens, rather than assuming that the class name is a single T_STRING.	2014-05-06 15:35:37 +10:00
Hamish Friedlander	50e1ed2f72	Merge pull request #3101 from tractorcow/pulls/3.1-fileexists-checking ... BUG Better checking of existing files	2014-05-06 15:32:06 +12:00