Commit Graph

14360 Commits

Author SHA1 Message Date
Will Rossiter
80d4127f43 Review and tidy up contributing documentation. 2014-12-15 09:12:45 +13:00
Will Rossiter
d52b475cfb Add introduction files to each of the sections 2014-12-15 09:12:45 +13:00
Will Rossiter
1b8f2478e6 Move todo list to trello. 2014-12-15 09:12:45 +13:00
Will Rossiter
85f3beee2c Update documentation introduction 2014-12-15 09:12:45 +13:00
Will Rossiter
79e9254f05 Add readme to include status of docs rewrite and high level todos
Conflicts:
	docs/en/03_Upgrading.md
	docs/en/03_Upgrading/00_Upgrading.md
	docs/en/03_Upgrading/index.md
2014-12-15 09:12:45 +13:00
Will Rossiter
e9d88dd8ee Restructure of the docs markdown source files into more logical taxonomy.
Rebased on 3.1
2014-12-15 09:12:44 +13:00
Damian Mooyman
644f38f2d6 Merge pull request #3726 from willmorgan/bugfixes/gd-image-exists
FIX: GD - check file exists before getimagesize
2014-12-12 08:30:39 +13:00
Will Morgan
b5c361a66c FIX: GD - check file exists before getimagesize
Use is_readable to check the file exists and is readable
2014-12-11 15:21:38 +00:00
Will Morgan
03bf7324a9 Merge pull request #3721 from gordonbanderson/TINY_MCE_EDIT_EXTENSION_POINTS
ENHANCEMENT: Additional extension points when editing with Tiny MCE
2014-12-10 10:03:57 +00:00
Gordon Anderson
fba688018f ENHANCEMENT: Additional extension points for Tiny MCE editing, for when images are regenerated and manipulating the HTML prior to a save 2014-12-10 14:54:12 +07:00
Will Morgan
d28992a1e5 Merge pull request #3716 from tractorcow/pulls/3.1/fix-gridfield-session
BUG Fix gridfield storing duplicate data in session
2014-12-09 15:58:27 +00:00
Will Morgan
80092e5daa Merge pull request #3662 from camfindlay/corecommiters
DOCS Repositioned house rules and added core commiter list.
2014-12-09 00:21:13 +00:00
Damian Mooyman
6bdd30c19d BUG Fix gridfield storing duplicate data in session 2014-12-09 10:38:42 +13:00
Daniel Hensby
b2ace2b76c Merge pull request #3689 from guru-digital/patch-2
Add ability to use Basic Auth when running PHP in CGI mode in Apache
2014-12-08 18:39:42 +00:00
Will Morgan
18f0cb650e Merge pull request #3708 from JorisDebonnet/patch-4
File.php: support for MS Office template / macro files
2014-12-05 10:49:41 +00:00
Stig Lindqvist
9155eb5802 Merge pull request #3675 from micmania1/fix-datadifferencer-comparison
FIX DataDifferencer was trying to compare fields, even if the fields did...
2014-12-05 19:04:05 +13:00
Corey Sewell
fbebf96d66 Add detection for PHP running in CGI mode and add HTTP_AUTHORIZATION rewrite rule
Detect and parse HTTP_AUTHORIZATION for basic authentication running PHP in CGI mode
Add comments about using CGI mode with Apache and Basic Auth in /docs/en/topics/environment-management.md
Added notes  to docs/en/changelogs/3.1.9.md
2014-12-05 11:35:52 +13:00
Damian Mooyman
ece28cc629 Unreference master version 2014-12-05 10:53:13 +13:00
JorisDebonnet
af47a63322 File.php: support for MS Office template / macro files
Fixes #3692
2014-12-04 21:57:31 +01:00
Ingo Schommer
e349a13968 Merge pull request #3693 from JorisDebonnet/patch-4
Update Member.Email from 256 to 254 length
2014-12-05 09:04:38 +13:00
Daniel Hensby
7f0d6421e8 Merge pull request #3705 from JayDevlin/minor-controller-ss
MINOR Closing tag in Controller.ss
2014-12-04 18:00:23 +00:00
Will Morgan
ad672af7a9 Merge pull request #3700 from dhensby/pulls/editor-config
Adding .editorconfig file
2014-12-04 15:06:56 +00:00
Will Morgan
00e029f574 FIX check for suite existence in endCurrentTest
When using data providers with tests, the reporter appears to get confused and run callbacks in a weird order. This checks that the current suite before adding more details.
2014-12-04 14:59:52 +00:00
Devlin
8e27f3c3dc MINOR Closing tag in Controller.ss 2014-12-04 15:41:10 +01:00
Cam Findlay
22ecab555c DOCS Repositioned house rules and added core commiter list. 2014-12-04 15:39:19 +13:00
Will Rossiter
836ea04d90 Add note about semvar to contributing.md 2014-12-04 12:14:18 +13:00
Damian Mooyman
19549d620f Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
Loz Calver
369c561aa2 Merge pull request #3666 from Copperis/versioned-0-version-write-fix
Versioned now creates a new version if the version is 0
2014-12-03 09:43:53 +00:00
Antony Thorpe
6c6d217273 Update error-handling.md
Add how to log notices (deprecation notifications can help with discovering problems caused by old code).
2014-12-03 16:56:53 +13:00
Damian Mooyman
1f4f5e68ba BUG Fix versioned
Versioned is not writing Version to _version tables for subclasses of Version dataobjects which have their own DB fields
- Fix disjoint of ID / RecordID (which should be the same)
- Fix calculation of new record version
- Fix use of empty vs !isset to check for existing version

Conflicts:
	model/Versioned.php
	tests/model/VersionedTest.php

Cherry picked from commit c140459ac6
2014-12-02 22:30:59 +02:00
Daniel Hensby
54f837159a Adding .editorconfig file 2014-12-02 15:13:55 +00:00
JorisDebonnet
1cd54e6bdc Update Member.Email from 256 to 254 length
Fixes #3074
2014-11-29 22:30:11 +01:00
micmania1
7384d011e9 FIX DataDifferencer was trying to compare fields, even if the fields didn't exist causing an error. 2014-11-28 05:35:06 +00:00
Damian Mooyman
3b3478136d Merge pull request #3677 from jonom/3093-flush-bugs
FIX: Manifest flushing
2014-11-27 11:24:40 +13:00
Daniel Hensby
ca7030d70d Merge pull request #3683 from bendubuisson/patch-2
Update 5-dataobject-relationship-management.md
2014-11-26 20:42:17 +00:00
Daniel Hensby
979389ca72 Merge pull request #3687 from bendubuisson/patch-4
Update access-control.md
2014-11-26 20:36:12 +00:00
Ben Dubuisson
e30a354076 Update access-control.md
small typo
2014-11-27 09:25:43 +13:00
Daniel Hensby
9e7373a365 Merge pull request #3686 from AntonyThorpe/patch-2
Update docs/en/reference/index.md
2014-11-26 20:04:14 +00:00
Antony Thorpe
9a7686c8b9 Update docs/en/reference/index.md
GridField line included twice
2014-11-27 08:06:00 +13:00
Daniel Hensby
a8ae5cc55b Merge pull request #3684 from bendubuisson/patch-3
Update member.md
2014-11-26 15:30:40 +00:00
Ingo Schommer
5d1c355cad Form action validation excempts
Thanks to @kinglozzer for doing the majority of work on this. See #2493.
2014-11-26 22:49:37 +13:00
Ben Dubuisson
514098c01a Update member.md
small typo
2014-11-26 16:32:57 +13:00
Igor Nadj
77e30d4524 Cleanup, removing redundant returns 2014-11-26 15:31:07 +13:00
Igor Nadj
657606e8c8 Updating code to allow unit test to use try-catch block to catch warning
without stopping code execution inside try
2014-11-26 15:27:54 +13:00
Ben Dubuisson
efd978074c Update 5-dataobject-relationship-management.md
Some more typos, sorry didn't pick them all up at the same time!
2014-11-26 14:37:33 +13:00
Jonathon Menz
01989aac4e FIX: Manifest flushing
Fixes silverstripe/silverstripe-framework#2325
Fixes silverstripe/silverstripe-framework#3093

Static manifest was not being flushed during a dev/build on some environments (without ?flush in URL) and template manifest was never being flushed during a dev/build.
2014-11-26 10:15:09 +10:30
Ingo Schommer
a61fb89e4f Merge pull request #3682 from bendubuisson/patch-1
Update 5-dataobject-relationship-management.md
2014-11-26 11:53:28 +13:00
Ben Dubuisson
a622fce073 Update 5-dataobject-relationship-management.md
typos
2014-11-26 11:43:49 +13:00
Ingo Schommer
4d4c651b50 Merge pull request #3673 from g4b0/patch-6
Update datamodel.md
2014-11-24 22:52:53 +13:00
Gabriele Brosulo
90a7761394 Update datamodel.md
Syntax error
2014-11-24 10:50:38 +01:00