Commit Graph

12609 Commits

Author SHA1 Message Date
Simon Welsh
0e0597f8cd Merge branch '3.0' into 3.1
Conflicts:
	control/Director.php
	dev/Backtrace.php
	docs/en/installation/nginx.md
	model/HTMLValue.php
	tests/model/SQLQueryTest.php
2014-03-10 22:56:27 +13:00
Simon Welsh
21f462a77b Update nginx.md
Provides a nginx.conf that follows nginx good practices and duplicates the functionality of
the .htaccess files in framework, cms and installer.
2014-03-10 22:48:22 +13:00
Damian Mooyman
6b4864eabf Merge pull request #2934 from timsnadden/patch-2
Update composer.md
2014-03-10 11:22:59 +13:00
Tim Snadden
07ca70fce4 Update composer.md 2014-03-10 11:13:19 +13:00
Damian Mooyman
cad863204c Merge pull request #2871 from feejin/urlsegment-trailing-space
BUG Trim URLSegment before applying replacements in filter
2014-03-06 08:16:31 +13:00
Damian Mooyman
c61c9e7ac2 Merge pull request #2922 from JayDevlin/2904-upload-loadintofile
BUG Upload: loadIntoFile() duplicates files if replaceFile=true
2014-03-05 16:43:45 +13:00
Sean Harvey
c94c26faef Merge pull request #2924 from tractorcow/pulls/3.0-remove-error-suppression
Rewrote usages of error suppression operator (3.0 version)
2014-03-05 16:21:39 +13:00
Sean Harvey
11432d1d75 Merge pull request #2925 from tractorcow/pulls/3.1-remove-error-suppression
Rewrote usages of error suppression operator (3.1 version)
2014-03-05 16:19:38 +13:00
Damian Mooyman
0cbad41d3b Rewrote usages of error suppression operator 2014-03-05 15:48:55 +13:00
Damian Mooyman
6d5d3d8cb7 Rewrote usages of error suppression operator 2014-03-05 14:22:19 +13:00
Devlin
3c1e82b42c Upload: retrieve existing File if an object without an ID is given and replaceFile=true 2014-03-04 18:02:33 +01:00
Damian Mooyman
1cc366fe23 Merge pull request #2850 from kinglozzer/2827-member-extend
FIX: Rewrite Member getCMSFields to ensure updateCMSFields is only run once (fixes #2827)
2014-03-04 13:42:17 +13:00
Simon Welsh
ccb791995e Merge pull request #2894 from wilr/3.1-manymanyyaml
Add support for many_many_extraField in YAML
2014-03-04 11:35:58 +13:00
Simon Welsh
4f0ee925d1 Merge pull request #2911 from silverstripe-iterators/pulls/reset-failedlogincount
Reset FailedLoginCount on successful password reset
2014-03-04 11:35:18 +13:00
Simon Welsh
697a010e5a Merge pull request #2915 from torleif/patch-2
Update preview.md
2014-03-04 11:34:22 +13:00
torleif
c3994f4ce7 Update preview.md
The JavaScript entwine example contains an extra jQuery wrapper
2014-03-04 11:32:45 +13:00
Colin Richardson
7b13041449 Remove trailing dashes from URLSegment 2014-03-03 22:22:03 +00:00
Andrew Short
78678acdad Merge pull request #2912 from sanjaymundhra/patch-5
Update 1-building-site
2014-03-03 20:54:55 +11:00
sanjay
fb0fe3e689 Update 1-building-site
Possessive pronoun "your" was misspelled as "you"...so the required change performed.
2014-03-03 15:24:10 +05:30
Will Rossiter
fb0d349cee Merge pull request #2910 from mullerivan/patch-1
Update css.md
2014-03-03 17:54:30 +13:00
Ingo Schommer
c047a7b990 Reset FailedLoginCount on successful password reset 2014-03-03 17:47:16 +13:00
mullerivan
a7d1991f70 Update css.md 2014-03-03 02:40:33 -02:00
Simon Welsh
41cdacba06 Merge pull request #2893 from silverstripe-iterators/pulls/forgot-password-veto
Allow vetoing forgot password requests
2014-03-03 12:19:09 +13:00
Ingo Schommer
ae31362e21 Merge pull request #2867 from oddnoc/form-docs-consolidation
Combine form validation topic with forms topic
2014-03-03 10:32:04 +13:00
Ingo Schommer
c4ca3b1da4 Merge pull request #2870 from svandragt/patch-1
Better visibility of key phrasing
2014-03-03 10:30:55 +13:00
Ingo Schommer
3023639354 Merge pull request #2886 from KarlKl/patch-1
Silverstripe.com is not this version
2014-03-03 10:30:35 +13:00
Ingo Schommer
f00672bb83 Merge pull request #2889 from howardgrigg/patch-1
MINOR Corrected links for 'Topics' documentation index
2014-03-03 10:30:07 +13:00
Ingo Schommer
edd9738957 Merge pull request #2898 from torleif/patch-1
Update shortcodes.md
2014-03-03 10:29:56 +13:00
Ingo Schommer
c3fcb916f6 Merge pull request #2899 from IgorNadj/patch-1
Update File.php
2014-03-03 10:29:39 +13:00
Ingo Schommer
b489f40866 Added 3.0.9 changelog 2014-03-03 10:19:08 +13:00
Damian Mooyman
f543041b9c Merge pull request #2905 from feejin/urlsegment-leading-dashes
Fix: remove all leading dashes from URLSegments
2014-03-03 09:56:47 +13:00
Ingo Schommer
ead3e26378 Added 3.1.3 changelog 2014-03-03 08:54:18 +13:00
Colin Richardson
1795b21df0 Remove redundant underscore and update the comment 2014-03-02 15:03:02 +00:00
Will Rossiter
c74137e679 FIX: getMessageFromSession returning null on first access 2014-02-28 21:24:16 +13:00
Igor
3e5ac7cdcc Update File.php
Adding warning, took me a couple hours to figure this out...

The file does not get moved because of this line:
https://github.com/silverstripe/silverstripe-framework/blob/3.1/filesystem/File.php#L515

Maybe add to the method doc, telling people to set ParentId and Name instead if they want to change the location of a file (if that's the correct method).
2014-02-26 14:09:09 +13:00
torleif
56e0c72cb0 Update shortcodes.md
Trying to link to [embed] causes the parser to break. (see: http://doc.silverstripe.org/framework/en/reference/shortcodes)
2014-02-26 13:39:14 +13:00
Ingo Schommer
9afcf8f01a Allow vetoing forgot password requests 2014-02-25 13:05:32 +13:00
Will Rossiter
8b92300622 Add support for many_many_extraField in YAML
Format is

RelationName:
  - =>Obj.name:
    ExtraFieldName: "Foo"
2014-02-24 22:03:53 +13:00
Ingo Schommer
8ab0fd879d Merge pull request #2892 from silverstripe/log_formatter_defaults
Adding defaults for unhandled event priorities in log formatters.
2014-02-24 21:48:10 +13:00
Sean Harvey
af01d7f024 Adding defaults for unhandled event priorities in log formatters.
Unhandled types wouldn't show up in the error format message, and a
notice "undefined $errtype" is displayed on these cases.
2014-02-24 15:41:03 +13:00
Ingo Schommer
d6b75acbc4 Added 3.1.3-rc2 changelog 2014-02-24 10:08:09 +13:00
Damian Mooyman
d7a8b0fca4 Merge pull request #2884 from TomSpeak/patch-2
DOC: SapphireTest `objFromFixture`
2014-02-24 08:08:03 +13:00
Ingo Schommer
85972dcf6d Merge pull request #2878 from tractorcow/pulls/fix-folder-find-illegalpath
BUG Fixed critical issue with Folder::find_or_make failing to handle invalid filename characters
2014-02-22 20:57:09 +13:00
Howard Grigg
733bc42dd7 MINOR Corrected links for 'Topics' documentation index 2014-02-22 17:16:07 +10:00
Thomas Speak
437cbe0d91 DOC: SapphireTest objFromFixture
The current docs for `objFromFixture` cause PHPStorm to generate an error because of the mismatched data types.

`$product = $this->objFromFixture('ProductPage', 'StandardSpecs');`

Causes: `Expected The, got string`.
2014-02-21 10:21:18 +00:00
KarlKl
2ae65a6f3d Silverstripe.com is not this version
On Silverstripe.com(http://doc.silverstripe.com/framework/en/3.0/topics/shortcodes) is an older version of this file.
From the "Built-in Shortcodes"-heading down to the bottom the page is marked as code.

Cheers
K
2014-02-21 09:04:53 +01:00
Damian Mooyman
194393d705 Merge pull request #2883 from TomSpeak/patch-1
DOC: DropdownField __construct
2014-02-21 12:36:08 +13:00
Thomas Speak
c7e57e0087 DOC: DropdownField __construct
Current docs make PHPStorm spew errors about data types.

`new CheckboxSetField('Countries'...);`

Causes `Expected The, got string`.

Simple restructure.
2014-02-20 23:04:53 +00:00
Damian Mooyman
042e7a5e5c Merge pull request #2882 from sanjaymundhra/patch-4
update dataobject.md
2014-02-21 10:06:53 +13:00
Damian Mooyman
ebeb663ddf BUG Fixed critical issue with Folder::find_or_make failing to handle invalid filename characters
BUG Fix UploadField duplicate checking with invalid folderName
2014-02-21 09:11:34 +13:00