Commit Graph

15253 Commits

Author SHA1 Message Date
Loz Calver
d18fc3bb6f Merge pull request #3810 from camfindlay/patch-15
DOCS Update sake to reference new docs
2015-01-22 17:14:24 +00:00
Loz Calver
ccad618d80 Merge pull request #3817 from anjanawijesundara/patch-1
mysite/code/Page.php to mysite/code/Product.php
2015-01-22 17:01:40 +00:00
Anjana Wijesundara
376ce73390 mysite/code/Page.php to mysite/code/Product.php
"mysite/code/Page.php" line in Displaying Results Section should be "mysite/code/Product.php"
2015-01-22 22:28:13 +05:30
Nick
114a5c39c8 Flush should be off by default - consistant
Flushing should be off by default, just like it is when you are on the site normally.

It's not obvious that tests always flush when they run and you have to pass flush=0 to turn them off. People expect to have to flush to clear the cache, and the documentation already covers mentions about flushing

-> http://doc.silverstripe.org/en/developer_guides/testing/unit_testing/
-> phpunit framework/tests '' flush=all
# Run tests with optional `$_GET` parameters (you need an empty second argument)
2015-01-22 22:29:21 +13:00
Will Rossiter
f733ca2759 Delete README.md 2015-01-22 15:39:26 +13:00
Will Rossiter
a1ffaac9e3 Merge pull request #3809 from camfindlay/docchangelogfix
DOCS Fix missing changelogs
2015-01-22 15:32:37 +13:00
Will Rossiter
9fdd2481bc Merge pull request #3811 from unclecheese/patch-4
Add two new video tutorials
2015-01-22 15:31:45 +13:00
unclecheese
686e072301 Add two new video tutorials 2015-01-22 09:42:02 +13:00
Cam Findlay
2e4bf9abc4 ENHANCEMENT Update sake to reference new docs 2015-01-22 08:49:25 +13:00
Cam Findlay
037c3a1847 DOCS Fix missing changelogs 2015-01-22 08:40:33 +13:00
Damian Mooyman
c5db41d21f Merge pull request #3805 from guru-digital/cgi-httpauth-fix
Fix #3794
2015-01-21 20:14:17 +13:00
Will Rossiter
315d6b6e2c Merge pull request #3806 from MichaelCSLWeb/patch-3
Update 01_Image.md
2015-01-21 16:52:22 +13:00
Will Rossiter
bef7338167 Merge pull request #3807 from camfindlay/patch-14
DOCS Fixed link to yaml config docs.
2015-01-21 16:51:26 +13:00
Cam Findlay
3de82ce8dc DOCS Fixed link to yaml config docs. 2015-01-21 15:27:22 +13:00
Michael
e571b52a27 Update 01_Image.md
Ive added this to show you can change the color of the padding area
2015-01-20 14:23:53 +00:00
Daniel Hensby
5d4c2c4b34 API Adding default_classes to FormField 2015-01-20 13:36:32 +00:00
Daniel Hensby
6d0002780d API Adding default_classes to Form 2015-01-20 13:36:31 +00:00
Corey Sewell
1262115359 Fix #3794
Fix #3794
2015-01-20 13:21:12 +13:00
Damian Mooyman
bf4c9fcd50 Merge pull request #3804 from kinglozzer/3802-dataobject-db
FIX: DataObject::db returned fields in incorrect order, with incorrect data types
2015-01-20 12:06:10 +13:00
Loz Calver
77ebdc22fa FIX: DataObject::db returned fields in incorrect order, with incorrect data types
fixes #3802
2015-01-19 20:38:08 +00:00
Hamish Friedlander
9e4c0c6663 Merge pull request #3790 from ProzacJellybeans/patch-1
Extending site - RSS correction
2015-01-16 12:53:53 +13:00
ProzacJellybeans
8b1aa5f1d7 Extending site - RSS correction
Rewrote the reason as to why the website needs to be flushed more frequently
2015-01-16 11:45:44 +13:00
Elvinas L.
32ce85d9f4 FIX. Summary fields can't be translated
fieldLabels() now can find these fields and translate them.
2015-01-15 15:09:32 +02:00
Damian Mooyman
33b18ce998 Fix merge error 2015-01-15 18:56:09 +13:00
Damian Mooyman
88fdc75456 Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
	.editorconfig
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.md
	docs/en/00_Getting_Started/index.md
	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
	docs/en/01_Tutorials/03_Forms.md
	docs/en/01_Tutorials/04_Site_Search.md
	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
	docs/en/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/02_Developer_Guides/10_Email/index.md
	docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
	filesystem/File.php
	filesystem/GD.php
	model/DataDifferencer.php
	model/Versioned.php
	security/BasicAuth.php
	security/Member.php
	tests/filesystem/FileTest.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/VersionedTest.php
	tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
Elvinas L
cee7adc12c FIX. Placeholder isn't completely translated 2015-01-15 14:15:03 +13:00
Damian Mooyman
50d80e5854 Merge remote-tracking branch 'origin/3.1.9' into 3.1 2015-01-15 13:24:34 +13:00
Damian Mooyman
87d6250ea7 Reword upgrading notes 2015-01-15 11:56:46 +13:00
Damian Mooyman
7b20f775f2 Updated changelog 2015-01-15 11:45:41 +13:00
Will Rossiter
220bdf342c Merge pull request #3577 from tractorcow/pulls/3.1/fix-basicauth-resetlogin
BUG Fix BasicAuth not resetting failed login counts on authentication
2015-01-15 11:03:52 +13:00
Damian Mooyman
aa445b8e5a Merge pull request #3564 from kinglozzer/pulls/3563-encode-backurl
FIX: Ensure query string in X-Backurl is encoded (fixes #3563)
2015-01-15 10:23:19 +13:00
Loz Calver
c18bf6222b Merge pull request #3788 from camfindlay/zippylinkfix
DOCS - fix reported broken links
2015-01-14 09:33:26 +00:00
Nick Spiel
227ea82953 Update 'spinner' to an SilverStripe branded version
PSD: http://nickspiel.me/uploads/silverstripe-assets/spinner.psd
2015-01-14 20:29:07 +11:00
Loz Calver
7b12fb9a60 Merge pull request #3791 from scott1702/patch-2
DOCS Minor spelling error
2015-01-14 09:25:39 +00:00
Loz Calver
dae4de1169 Merge pull request #3780 from phptek/centre-pane-expand
FIX: Expands the CMS' centre-pane when collapsed and it's clicked.
2015-01-14 09:13:43 +00:00
scott1702
bca4024ee8 DOCS Minor spelling error
Fixed a minor spelling error in tutorial 2.
2015-01-14 16:57:54 +13:00
ProzacJellybeans
d28edd09ce Extending site - RSS correction
Instructions needed to be given on flushing more frequently, not just on template editing
2015-01-14 15:34:20 +13:00
Cam Findlay
3239cfd495 DOCS - fix reported broken links by zippy in IRC 2015-01-14 08:59:55 +13:00
Russell Michell
ef237f69cc FIX: Expands the CMS' centre-pane when collapsed and it's clicked. 2015-01-14 08:40:05 +13:00
Elvinas L.
ab24ed3bea FIX. Use i18n_plural_name() instead of plural_name() 2015-01-13 15:31:17 +02:00
Will Rossiter
cf9c6666dd Merge pull request #3785 from emmahuangokeefe/3.1
BUG insert media trims whitespace - fixes #845
2015-01-13 16:27:01 +13:00
Emma O'Keefe
2e6e8af161 BUG insert media trims whitespace - fixes #845 2015-01-13 15:40:12 +13:00
Will Rossiter
ee88a8e538 Merge pull request #3784 from silverstripe/revert-3783-3.1
Revert "BUG insert media trims whitespace fixes #845"
2015-01-13 15:23:36 +13:00
Will Rossiter
90b134d0d1 Revert "BUG insert media trims whitespace fixes #845" 2015-01-13 15:23:28 +13:00
Will Rossiter
b09091cb5f Merge pull request #3783 from emmahuangokeefe/3.1
BUG insert media trims whitespace fixes #845
2015-01-13 15:16:35 +13:00
Emma O'Keefe
2861e7c840 BUG insert media trims whitespace fixes #845 2015-01-13 14:51:24 +13:00
Damian Mooyman
db314b2a76 Added 3.1.9-rc1 changelog 2015-01-13 09:04:39 +13:00
Damian Mooyman
c2af23033f Update translations 2015-01-12 17:54:49 +13:00
Damian Mooyman
c49f16442b Merge pull request #3781 from tractorcow/pulls/3.1/fix-file-canedit
Fix file and uploadfield permissions
2015-01-12 17:22:11 +13:00
Damian Mooyman
7816875e92 Fix file and uploadfield permissions 2015-01-12 10:56:25 +13:00