Commit Graph

13735 Commits

Author SHA1 Message Date
Christopher Darling
2da0ebe148 Renamed IMagickBackend to ImagicBackend
Also updated config:: to Config:: on line #52
2015-02-27 11:19:09 +00:00
Daniel Hensby
2298bed4e9 Merge pull request #3950 from micmania1/patch-8
DOCS Updated docs
2015-02-27 10:18:44 +00:00
Michael Strong
4c5a07ecec FIX Updated docs
The docs as they were would break websites and no warning was given regarding the security around doing this.
2015-02-27 17:00:46 +13:00
Jean-Fabien Barrois
bbe27999eb BUGFIX Use correct query when searching for items managed by a tree dropdown field #3173 2015-02-27 11:18:27 +13:00
Damian Mooyman
773624a40b Merge pull request #3947 from camfindlay/docs/uploadfield
DOCS Reinstate a missing upload field doc and give a review.
2015-02-26 17:51:01 +13:00
Cam Findlay
8146943a00 DOCS Reinstate a missing upload field doc and give a review. 2015-02-26 15:17:05 +13:00
Daniel Hensby
763173d6c6 Merge pull request #3939 from kinglozzer/pulls/many-many-extrafields-bug
FIX: Unable to access a list of all many_many_extraFields
2015-02-26 01:21:01 +00:00
Loz Calver
3a7e24a220 FIX: Unable to access a list of all many_many_extraFields 2015-02-25 10:33:50 +00:00
Daniel Hensby
18f7855794 Merge pull request #3928 from johndalangin/patch-1
YML Config Not Compatible with Requirements Class
2015-02-24 21:55:58 +00:00
johndalangin
5eb5cc7cca YML Config Not Compatible with Requirements Class
After hours of trying to debug why `write_js_to_bottom` wasn't working, I realized that the Requirements class variables were set to `protected` and not `private static` which I believe is necessary for the Config YML variables to be passed correctly to the class.

The documentation was edited to reflect the working, albeit traditional non-YML method of setting class variables.

Best regards,

John
2015-02-24 00:58:31 +08:00
Daniel Hensby
2336ea8f66 Merge pull request #3918 from muskie9/patch-6
DOCS Update index.md to link to how-to's for 3 tutorials/recipies
2015-02-19 15:50:51 +00:00
unclecheese
2af48738c9 MINOR: Remove children from Tutorials landing page. Deprecated. 2015-02-19 17:20:45 +13:00
Nic
5cda017424 Update index.md to link to how-to's for 3 tutorials/recipies 2015-02-18 20:47:57 -06:00
Ingo Schommer
3b66b75f2f Merge pull request #3889 from unclecheese/tutorial-deprecation
Several changes that deprecate the old written tutorials in favour of Lessons section
2015-02-19 14:49:30 +13:00
Damian Mooyman
1e5519cf1a Reformat changelog 2015-02-19 13:16:40 +13:00
Damian Mooyman
f95c181c97 Merge remote-tracking branch 'origin/3.1.10' into 3.1 2015-02-19 12:57:12 +13:00
Damian Mooyman
c302edc4e7 Added 3.1.10 changelog 2015-02-19 12:37:16 +13:00
Daniel Hensby
baca51c9d0 Merge pull request #3917 from oddnoc/httpresponse-return-values
Correct return statements in SS_HTTPResponse
2015-02-18 20:54:09 +00:00
Fred Condo
5047143e7b Correct return statements in SS_HTTPResponse
- setBody failed to return a value; it now returns $this as related methods do
- getHeader had an extra, unreachable return statement; removed
2015-02-18 10:32:33 -08:00
Daniel Hensby
1f695df952 Merge branch 'AntonyThorpe-patch-3' into 3.1 2015-02-18 00:11:56 +00:00
Daniel Hensby
8a405b50b0 Merge branch 'patch-3' of https://github.com/AntonyThorpe/silverstripe-framework into AntonyThorpe-patch-3
DOCS Error handling examples of different files closes #3701

Conflicts:
	docs/en/topics/error-handling.md
2015-02-18 00:10:49 +00:00
Daniel Hensby
d788c2e845 Merge pull request #3914 from camfindlay/patch-23
DOCS Mention the mod_dir changes to Windows WAMP users
2015-02-17 22:36:01 +00:00
Cam Findlay
666075d56c DOCS Mention the mod_dir changes to Windows WAMP users
WAMP Server likely comes with Apache 2.4 so is very relevant to have this instruction available as a troubleshoot.
2015-02-18 11:34:03 +13:00
Daniel Hensby
3d9b57ca9e Merge pull request #3905 from muskie9/patch-3
DOCS Update Common Problems with mod_rewrite issue
2015-02-17 22:32:39 +00:00
muskie9
4ccb0bc858 Update Common Problems with mod_rewrite issue 2015-02-17 16:28:02 -06:00
Daniel Hensby
216d1d847b Merge pull request #3912 from camfindlay/patch-22
DOCS Mention the option of Environment files for WAMP users
2015-02-17 22:26:40 +00:00
Cam Findlay
0fd6b8eaca DOCS Mention the option of Environment files for WAMP users
Once you get a few sites under your belt most devs would likely turn to using environment files to names DB credentials. This introduces this a bit earlier to get them used to the simple idea of an environment file.

Eventually I'd like to rewrite the installer to generate this over storing in the _config.php.
2015-02-18 11:13:02 +13:00
Daniel Hensby
1d4150bee4 Merge pull request #3787 from uniun/patch-4
FIX. Use i18n_plural_name() instead of plural_name()
2015-02-17 10:54:45 +00:00
Daniel Hensby
99bc79a48d Merge pull request #3892 from sb-relaxt-at/3891-Wrong-temp-folder-in-tiny_mce_gzip
Changed cache_dir to respect TEMP_FOLDER
2015-02-17 10:15:43 +00:00
Daniel Hensby
389e2e7cd1 Merge pull request #3897 from kinglozzer/patch-1
FIX: Misleading error message in SSViewer
2015-02-17 10:12:30 +00:00
Daniel Hensby
89aae54cf8 Merge branch 'phillprice-patch-9' into 3.1 2015-02-17 10:08:39 +00:00
Phill Price
907944cdf3 Update CheckboxSetField.php
Updated example to work in api - as DropdownField does.
2015-02-17 10:05:27 +00:00
Damian Mooyman
fab44dce75 Added 3.1.10-rc2 changelog 2015-02-17 18:05:16 +13:00
Damian Mooyman
4b7a91569c Merge pull request #3910 from Zauberfisch/patch-5
Fixed infinity loop when searching _ss_environment
2015-02-17 17:39:25 +13:00
Zauberfisch
aa77e126c7 Fixed infinity loop when searching _ss_environment 2015-02-17 04:33:40 +00:00
Damian Mooyman
0d3b55645a Merge pull request #3906 from phillprice/patch-8
Update InlineFormAction.php
2015-02-17 09:23:53 +13:00
Phill Price
9971de6eff Update InlineFormAction.php
typo fix
2015-02-16 20:19:53 +00:00
Daniel Hensby
5d35650cbb DOCS Removing redundant PHP syntax declaration 2015-02-16 13:58:57 +00:00
Loz Calver
998c055676 FIX: Misleading error message in SSViewer
Better error message if theme is disabled

DRY!
2015-02-16 09:24:58 +00:00
Daniel Hensby
9e600e9e0c Removing redundant var declaration 2015-02-16 07:56:04 +00:00
Damian Mooyman
9a97cbc255 Added 3.1.10-rc1 changelog 2015-02-16 16:39:01 +13:00
Damian Mooyman
1879b2ecf6 Merge pull request #3867 from Zauberfisch/patch-5
Fixed looking for _ss_environment.php in root dir
2015-02-16 16:09:22 +13:00
Damian Mooyman
49c462710d Merge pull request #3795 from uniun/patch-2
FIX. Summary fields can't be translated
2015-02-16 15:55:29 +13:00
Damian Mooyman
bf0104644b Update translations 2015-02-16 11:55:17 +13:00
Daniel Hensby
146aa06545 Merge pull request #3902 from camfindlay/patch-21
DOCS Reference to ensure contributors read over the Code of conduct
2015-02-15 21:49:25 +00:00
Cam Findlay
aa5c9ca246 DOCS Reference to ensure contributors read over the Code of conduct 2015-02-16 10:28:52 +13:00
Sean Harvey
cebc0d08c5 Merge pull request #3894 from tractorcow/pulls/3.1/encoding-fixes
BUG Lots of encoding fixes
2015-02-16 09:18:41 +13:00
zauberfisch
eb98b003b7 Fixed looking for _ss_environment.php in root dir and removed redundant code 2015-02-13 23:30:29 +00:00
Daniel Hensby
a304ee37f8 Merge pull request #3896 from Ben-Speakman/patch-1
Use double quotes to escape quotes in CSV export
2015-02-13 10:47:48 +00:00
Daniel Hensby
b3f859d1ad Merge pull request #3893 from LiamW/patch-1
DOCS Update 11_Scaffolding.md
2015-02-13 10:24:10 +00:00