tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
18,663 Commits 31 Branches 527 Tags 162 MiB
a7bf0e49ec
Commit Graph

2273 Commits

Author SHA1 Message Date
Damian Mooyman
61388b153f API Rewrite Date and Time fields to support HTML5 2017-04-28 10:06:37 +12:00
Ingo Schommer
a73abbfcb8 unit test cleanup 2017-04-27 09:18:38 +12:00
Ingo Schommer
1ec2abe75f Fixed timezone and normalised ISO handling 
A few observations:
- ISO says “T” is optional (https://en.wikipedia.org/wiki/ISO_8601#cite_note-21),
- WHATWG says in the HTML5 spec that it’s optional (https://html.spec.whatwg.org/multipage/infrastructure.html#local-dates-and-times)
- W3C says it’s reqiured in 1997 (https://www.w3.org/TR/NOTE-datetime), but then later says it’s optional in its HTML5 spec (https://www.w3.org/TR/html5/infrastructure.html#floating-dates-and-times).
- Chrome doesn’t parse values with whitespace separators (requires "T")
- DataObject DBDatetime values and database columns use whitespace separators (and will have many devs relying on this format)
- MySQL only supports whitespace separators (https://dev.mysql.com/doc/refman/5.7/en/datetime.html)
- SQLite can parse both ways (https://sqlite.org/lang_datefunc.html)

So the goal here is to retain ORM/database compatibility with 3.x (whitespace separator),
while exposing "T" separators to the browser in HTML5 mode.

Regarding timezones, this fixes a regression where setValue() would not actually
apply the timezone (last $value assignment is ineffective now that sub fields are removed).
 2017-04-26 22:55:29 +12:00
Saophalkun Ponlu
507add8566 Update changelogs 2017-04-26 22:45:07 +12:00
Robbie Averill
0391596786 DOCS Remove tabs from JSON examples to fix code blocks 2017-04-23 21:14:12 +12:00
Simon Erkelens
ff3ad6eb6b Use Config for authenticator settings 2017-04-22 14:48:56 +12:00
root
96d323fba1 Added 3.6.0-beta1 changelog 2017-04-21 11:49:44 +01:00
Damian Mooyman
c21f71405f Merge pull request #6823 from open-sausages/pulls/4.0/remove-TeamCityListener 
Removed TeamCityListener
 2017-04-21 15:56:20 +12:00
Damian Mooyman
629465584e Merge pull request #6825 from open-sausages/pulls/4.0/skip-without-phpunit 
Don't fail dev/build without phpunit
 2017-04-21 15:38:22 +12:00
Chris Joe
430c7ad79a Merge pull request #6824 from micmania1/patch-13 
DOCS Corrected logger documentation
 2017-04-21 15:18:22 +12:00
Ingo Schommer
0a55ff9f8c API Remove SapphireTestReporter and CliTestReporter 
Was missed from the removal of PHPUnitWrapper:
a16588aac3

Original reason for this: Don't fail dev/build without phpunit
When you install a SilverStripe project with "composer install --no-dev",
the PHPUnit dependency gets skipped. Which means the PHPUnit_Framework_TestListener
interface doesn't exist. The SilverStripe Classloader might still include
SapphireTestReporter which relies on this interface, which then breaks execution.

SS3 fixed this by NOT defining the class in the first place.
This has been removed in 2fdc96a0de (diff-82b3f89e8e5ae090c93e9c3a2ba8aa36L3),
as part of a PHPUnit version upgrade - but without an apparent fix to replace this.
 2017-04-21 15:11:59 +12:00
Michael Strong
484e15807c DOCS Corrected logger documentation 2017-04-21 13:15:14 +12:00
Ingo Schommer
60e4c011de Removed TeamCityListener 2017-04-21 12:13:13 +12:00
Michael Strong
649dad526b DOCS Fixed namespace for factory 2017-04-21 10:54:21 +12:00
Damian Mooyman
2548bfba1e API Replace SS_HOST with SS_BASE_URL 
API Remove Director::$test_servers / $dev_servers
API Remove MODULES_PATH / MODULES_DIR constants
ENHANCEMENT Injector backtick syntax now supports environment variables as well as constants
Fixes #6588
 2017-04-20 22:28:57 +12:00
Aaron Carlino
fdd9ad6dbc MINOR: Add documentation for aggregate filters (#6796) 
* MINOR: Add documentation for aggregate filters

* Update 01_Data_Model_and_ORM.md

* Update 01_Data_Model_and_ORM.md
 2017-04-19 15:44:00 +12:00
Sam Minnee
9b1baa9503 DOCS: API changes from f862ce71d5 2017-04-18 17:04:40 +12:00
Damian Mooyman
e2b0c56175 Merge pull request #6791 from caffeineinc/master 
Documentation: Updated Index & Secure Coding Practices
 2017-04-18 11:24:25 +12:00
Damian Mooyman
136b67f597
API Major refactor of Hierarchy into MarkedSet 2017-04-13 16:27:13 +12:00
Damian Mooyman
22b6835537 Move cache upgrade instructions into Upgrading Guide section 2017-04-13 16:23:05 +12:00
Simon Gow
5f82997690 Secure Coding - Security Headers, Force HTTPS and Cookies 
- Amending best practices for secure coding to enforce HTTPS
- Add security headers to enforce HTTPS
- Ensure secure cookies are used.
- Added links for testing, changed documentation as part of peer review.
- Arrange headers to work with HTTP interface.
- fixed Cache-Control case
- Added reference to Secure Sessions.
- Replaced Cardinality with unique
- Fixed innacurate reference to decendant.
- Consistent spelling
- Databases over DBMSs
 2017-04-13 13:59:02 +12:00
Simon Gow
8d2a1ba8be Index documentation 
- updating index documentation to give a better description of how to improve performance with silverstripe applications
 2017-04-07 11:27:07 +12:00
Damian Mooyman
92a5e4a057
API Refactor CMS-specific code out of LeftAndMain 2017-04-06 13:26:32 +12:00
Damian Mooyman
5c50ab5884 Added 4.0.0-alpha6 changelog 2017-04-05 16:17:48 +12:00
Damian Mooyman
ed9b2edf7d Added 4.0.0-alpha6 changelog 2017-04-05 16:13:01 +12:00
Sam Minnee
061b71328b Update docs. 2017-04-05 11:06:10 +10:00
Nic
091d355059 DOCS update example to use Config::modify 2017-04-04 19:18:23 -05:00
Damian Mooyman
24d1207eb9 Merge pull request #6769 from sminnee/mssql-community-support 
NEW: Downgrade MSSQL from commercially supported to community supported
 2017-04-05 10:23:26 +12:00
Ingo Schommer
5b2106ad8a Corrected i18n docs 2017-04-03 20:04:43 +12:00
Sam Minnee
bb880a3257 FIX: Clarify PHP 5.6 support for 4.x 2017-04-03 12:29:34 +12:00
Sam Minnee
8b1c020b9f NEW: Downgrade MSSQL from commercially supported to community supported 
As of SS4 I recommend that we clarify the level of support we provide
for MSSQL. The testing coverage of MSSQL and production use of it in
systems supported by the core team both seems very low.

MSSQL support was a lot more important in a pre-cloud-hosting world, but
these days our recommendation is to run SilverStripe on a stack that its
designed to work with rather than trying to fit it into your existing
hosting infrastructure.
 2017-04-03 12:29:23 +12:00
Ingo Schommer
3b94d14e42 MERGE 2017-04-03 12:11:21 +12:00
Ingo Schommer
326aa37ea4 API HTML5 date/time fields, remove member prefs (fixes #6626) 2017-03-31 15:21:47 +13:00
Ingo Schommer
4b79940368 API Drop IE10 support (fixes #6321) 2017-03-31 10:50:42 +13:00
Daniel Hensby
ac075eaf0b Remove TestListener and rely on PHPUnits APIs 2017-03-30 11:46:58 +13:00
Ingo Schommer
dfc0dec7b3 Require LICENSE in supported modules (no *.md) 
It's more standard to have this file in the webroot.
It's technically markdown compatible text (e.g. asterisk bullet points),
but there's not much point in rendering it via markdown.

If you use the Github "new repo" dialog, it'll create the file without
an extension, so that's pretty much considered the standard.
 2017-03-28 16:12:24 +13:00
Sam Minnée
cfa6a36697 Merge pull request #6706 from open-sausages/pulls/4.0/manifest-cache 
API Build new ManifestCache based on PSR-16 SimpleCache
 2017-03-21 10:29:03 +13:00
Damian Mooyman
480597e5ff Add missing docs to upgrading guide for cache config 2017-03-21 09:43:49 +13:00
Damian Mooyman
3a0099161b API Remove Log class 2017-03-21 09:43:49 +13:00
Damian Mooyman
54ba08a306 API Replace ManifestCache with ManifestCacheFactory 
API Remove lots of deprecated module code from ClassManifest
 2017-03-21 09:43:48 +13:00
Ingo Schommer
1efa22f9bb Reinstate 7.0 support, clarify policy 
We’ve discussed dropping support for 5.6 once it’s EOL on https://github.com/silverstripe/silverstripe-framework/issues/6705.
The same question needs to be asked for 7.0, which goes EOL in the same month. And should be generalised to future PHP versions.
Follow up to https://github.com/silverstripe/silverstripe-framework/pull/6718/
 2017-03-21 08:28:08 +13:00
Ingo Schommer
6e58408806 Drop PHP 5.5 support, limit PHP 5.6 to 2018 
Fixes #6705
 2017-03-20 10:34:24 +13:00
Damian Mooyman
ce14060913 API Apply default logger to all caches 
API Rename ‘Logger’ service name to ‘Psr\Log\LoggerInterface’
API DefaultCacheFactory constructor now takes an array of default arguments
 2017-03-15 15:31:24 +13:00
Ingo Schommer
e4daf70b27 Merge pull request #6695 from open-sausages/pulls/4.0/admin-module 
API Move admin to separate module
 2017-03-15 11:59:51 +13:00
Ingo Schommer
3ec5a5b035 Fixed upgrading path references 2017-03-15 11:08:28 +13:00
Damian Mooyman
9f953770f5 API Move CMSPreviewable to framework module 
Remove or soft-link dependency on admin module
 2017-03-14 10:22:45 +13:00
Jack O'Connor
100e9bf59c Correcting typo 2017-03-13 12:15:07 +00:00
Damian Mooyman
0c41a97a8b API Refactor Form request handling into FormRequestHandler 
API Add HasRequestHandler interface
API Refactor Link() and url handling behaviour from Controller into RequestHandler
API RequestHandler classes now must define url_segment to have a default Link()
API Clean up redirectBack()
 2017-03-10 15:04:33 +13:00
Damian Mooyman
23b92c8187
Documentation and linting updates 2017-03-10 11:59:38 +13:00
Christopher Joe
466c50b302 API Switch from npm4 and shrinkwrap to npm6 and yarn 2017-03-10 11:38:26 +13:00
Damian Mooyman
bf3383731d Upgrading guide for uploadfield 2017-03-09 13:33:00 +13:00
Christopher Joe
50deb17763 API remove UploadField, AssetField and associated files 
Fixes #6481
 2017-03-09 10:16:46 +13:00
Ingo Schommer
97a29c1ee2 Add Chris to core committers list 2017-03-08 14:50:24 +13:00
Ingo Schommer
06ec59b4f2 Sort core committers alphabetically 2017-03-08 14:50:24 +13:00
Damian Mooyman
53cad18fd7 Added 4.0.0-alpha5 changelog 2017-03-01 15:01:48 +13:00
Damian Mooyman
09f47789b7 Added 4.0.0-alpha5 changelog 2017-03-01 14:27:17 +13:00
Loz Calver
b9da55c8ab Merge pull request #6659 from robbieaverill/bugfix/quote-constants-in-yaml 
FIX Add quotes to constants in YAML to ensure syntax validity
 2017-02-28 09:19:22 +00:00
Robbie Averill
badf7d3a73 FIX Add quotes to constants in YAML to ensure syntax validity 2017-02-27 21:48:42 +13:00
Robbie Averill
d47a4ef63f DOCS Swap legacy code block syntax for GFM 
This page (currently) for example breaks the code block whenever you mix spaces and tabs for indentation (which is currently part of the 3.x style guideline) - it makes updating existing code examples in the docs quite difficult: https://docs.silverstripe.org/en/3/developer_guides/templates/requirements/

GFM isn't as picky - this PR replaces with it.
 2017-02-27 16:54:43 +13:00
Damian Mooyman
e2064b5cc8 Update config documentation 2017-02-27 16:54:01 +13:00
Damian Mooyman
a6e9a7111b API Substitute core config system with new silverstripe/config module 2017-02-27 16:54:01 +13:00
Ingo Schommer
d220ca3f67 API Use symfony/cache (fixes #6252) 2017-02-26 13:07:59 +13:00
Damian Mooyman
aa69cfe497
Improve upgrading guide for .env 2017-02-24 09:18:47 +13:00
Daniel Hensby
7156da6279
Merge branch '3' 2017-02-20 22:19:33 +00:00
Daniel Hensby
0ddf3b4186
Merge branch '3.5' into 3 2017-02-20 21:33:31 +00:00
Daniel Hensby
5a6f784e42
Merge branch '3.4' into 3.5 2017-02-20 21:31:09 +00:00
Dan Hensby
a2580456bd Added 3.5.3 changelog 2017-02-20 17:01:16 +00:00
Dan Hensby
9cd480e47a Added 3.4.5 changelog 2017-02-20 16:41:59 +00:00
Ingo Schommer
7e71ef7cb8 Document correct setlocale() use (fixes #6311) 2017-02-17 12:30:52 +13:00
Ingo Schommer
a9f2e9e73d Fixed DateFieldSeparated docs 2017-02-16 08:26:51 +13:00
Damian Mooyman
014f0d23ed
API Create SeparatedDateField 
API Restrict allowed values parsed via DBDate::setValue
API Remove NumericField_Readonly
API Remove DBTime::Nice12 / Nice24
 2017-02-15 11:07:58 +13:00
Damian Mooyman
029a8b9586
API Substitute Zend_Currency with NumberFormatter based solution 
API Substitute Zend_Locale with Locale / NumberFormatter
API Substitute Zend_Date with IntlDateFormatter
API Added DBTIme::Nice12, FormatFromSettings
API Added Short() method to DBDate / DBTime / DBDatetime
API Add Date::getTimestamp()
API Added setSubmittedValue api for FormField
API Add second arg to base FormField::setValue()
API Major refactor of i18n into component data parts
API Implement Resettable interface to reset objects between tests
ENHANCEMENT Changed DBField::create_field return type to `static` to support better type hinting
ENHANCEMENT i18nTextCollector supports __CLASS__
 2017-02-09 15:28:59 +13:00
Daniel Hensby
71383b827d
Merge branch '3' 2017-02-08 12:34:45 +00:00
Damian Mooyman
bd3f21d32b Add changelog note 2017-02-08 13:33:57 +13:00
Damian Mooyman
043e9d538c Merge 3.5 into 3 2017-02-08 11:56:47 +13:00
Damian Mooyman
7633040646 Merge 3.4 into 3.5 2017-02-08 11:55:17 +13:00
Damian Mooyman
acf3c0aeaa Added 3.5.3-rc1 changelog 2017-02-08 11:20:44 +13:00
Damian Mooyman
b06ac1708b Add in changelog line 2017-02-08 10:49:08 +13:00
Damian Mooyman
e01a5f4523 Added 3.4.5-rc1 changelog 2017-02-08 10:44:18 +13:00
Robbie Averill
4daa1b4a89 DOCS Add note about using dotenv on SilverStripe Platform (#6602) 
Include link to shiv example for importing `_ss_environment.php` constants into dotenv compatible environment variables.
 2017-02-07 17:14:34 +13:00
Daniel Hensby
040ebdb66e DOCS Update routing docs to include FQCN in config 2017-02-03 17:06:02 +00:00
Damian Mooyman
8d5ff9b2fe Merge pull request #6583 from robbieaverill/bugfix/remove-theme-dir 
API Remove ViewableData::ThemeDir, update changelog to reflect suggested replacement
 2017-02-02 12:57:20 +13:00
Andrew Dover
0574cce1c6 Update 01_Syntax.md 
Fixed spelling mistake
 2017-02-02 12:26:30 +13:00
Sam Minnee
59f8e42f1e DOC Added note about Email::populateTemplate() replacement 2017-02-01 21:21:03 +13:00
Daniel Hensby
6a107ff9ba
Merge branch '3' 2017-02-01 01:20:12 +00:00
Daniel Hensby
305bcac971
Merge branch '3.5' into 3 2017-02-01 01:02:09 +00:00
Daniel Hensby
9bd85ac773
Merge branch '3.4' into 3.5 2017-02-01 00:55:35 +00:00
Daniel Hensby
d54f2b35c5
Merge tag '3.5.2' into 3.5 
Release 3.5.2
 2017-02-01 00:55:31 +00:00
Daniel Hensby
8c8231c03e
NEW Director::host() to determine host name of site 2017-01-31 21:36:04 +00:00
Daniel Hensby
6e096f6172
DOCS Updated environment management docs to use .env file 2017-01-31 21:28:51 +00:00
Daniel Hensby
a5da085cc7
Merge branch '3' 2017-01-31 17:03:53 +00:00
Daniel Hensby
669f6a3d41
Merge branch '3.5' into 3 2017-01-31 13:33:26 +00:00
Daniel Hensby
56b887f578
Merge branch '3.4' into 3.5 2017-01-31 13:33:00 +00:00
Dan Hensby
00cdc33845 Added 3.5.2 changelog 2017-01-31 12:07:13 +00:00
Dan Hensby
02a87d4ed1 Added 3.4.4 changelog 2017-01-31 11:39:09 +00:00
Robbie Averill
da3db5ff3a DOCS Update Requirements to use the ThemeResourceLoader to find themed javascript and CSS 2017-01-31 17:00:13 +13:00
Robbie Averill
9d35ff8f95 API Remove ViewableData::ThemeDir, update changelog to reflect suggested replacement 2017-01-31 10:56:52 +13:00
Robbie Averill
fa5370e4dd Update themes document for SS4 
* Remove module specific subthemes documentation as it's removed
* Added notes about cascading theme configuration
* Update links to Themes listing to point to addons
* Remove references to tarballs, and put composer publishing instructions in place instead
 2017-01-30 15:35:33 +13:00
Daniel Hensby
c3cd8f4344 Merge pull request #6526 from open-sausages/pulls/3/remove-webpi 
Remove WebPI references
 2017-01-29 23:24:16 +00:00
Dan Hensby
578f12204d Added 3.5.2-rc1 changelog 2017-01-26 21:47:37 +00:00
Dan Hensby
c5a8963d32 Added 3.4.4-rc1 changelog 2017-01-26 18:57:28 +00:00
Daniel Hensby
c81959cce0 Merge pull request #6558 from open-sausages/pulls/4.0/i18n-symfony 
API Replace i18n message localisation with symfony/translation
 2017-01-26 13:11:59 +00:00
Daniel Hensby
90072e27e3 Merge pull request #6559 from robbieaverill/feature/4.0-upgrade-guide 
DOCS Add 4.0 upgrade guide, update "composer" and "modules" to include 4.x recommended practices
 2017-01-25 11:13:15 +00:00
Damian Mooyman
de02a3f733
Restored context parameter to i18n, and added to a “comment” key 
Rolled pluralisation functionality into the i18n::_t() method
Warnings on missing default can now be turned off
 2017-01-25 18:12:40 +13:00
Damian Mooyman
8a07c56bdf API Replace i18n message localisation with symfony/translation 
API Implement enhanced pluralisation
Remove Zend_Translate and all Zend dependencies from i18n
Deprecated $context from i18n::_t()
Warn on missing default string for i18n::_t()
 2017-01-25 17:08:12 +13:00
Robbie Averill
13bdec50e3 Remove * version constraints and update references for dev-master to 4.0 related constraints 2017-01-25 09:33:23 +13:00
Robbie Averill
7d8a93a669 DOCS Add note for $segment in BuildTask to 4.0.0 changelog, switch code blocks to GitHub style 2017-01-24 17:17:34 +13:00
Robbie Averill
394af0615f DOCS Add 4.0 upgrade guide, update "composer" and "modules" to include 4.x recommended practices 2017-01-24 16:52:53 +13:00
Daniel Hensby
b40904ffa7 Merge pull request #6547 from EtherealTallow/patch-2 
Update 00_Server_Requirements.md
 2017-01-23 16:39:11 +00:00
Jordan
cb38bc7930 Update 00_Server_Requirements.md 2017-01-20 11:42:58 +13:00
Jordan
b26e81d91a Update 05_UploadField.md 2017-01-20 11:26:05 +13:00
Ingo Schommer
d9e8b37ac4 Remove WebPI references 
SQL Server is still community supported, and we have IIS 7+ in our “server requirements”, which won’t change.
But the WebPI installer is rarely used in practice, and doesn’t provide the best user experience for Windows users
compared to other installation options. Given it sucks up time on every release process. this should be removed.
 2017-01-18 11:37:11 +13:00
Ingo Schommer
d34b33c733 Remove module list from release docs 
We have more modules now, it's a bit unmaintainable to list them.
 2017-01-18 11:06:24 +13:00
Ingo Schommer
9a9a82460d Release docs pointers around checking doc.ss.org 2017-01-18 11:06:19 +13:00
Daniel Hensby
c8d95cb558 Merge pull request #6521 from open-sausages/pulls/4.0/improve-release-docs 
Release docs improvements
 2017-01-17 11:13:17 +00:00
Ingo Schommer
7635f0f5f7 Docs: Update release cmds to match cow 2.0 2017-01-17 17:29:28 +13:00
Ingo Schommer
2bcbddc476 Docs: Release link to aws and transifex credential setup 2017-01-17 17:29:11 +13:00
Ingo Schommer
a584083476 Docs: Mention release issues with python on OSX 
Also removed listing of modules, since that tends to change with newer releases
 2017-01-17 17:28:25 +13:00
Ingo Schommer
3138092ad7 Added 4.0.0-alpha4 changelog 2017-01-17 16:26:04 +13:00
Damian Mooyman
d4d7d5629e Merge pull request #6516 from open-sausages/pulls/remove-release-maintainer-from-docs 
Removed "release maintainer" from docs
 2017-01-17 13:27:43 +13:00
Ingo Schommer
020a4dc81e Removed "release maintainer" from docs 
The role moves around based on current availability.
@tractorcow has done most of the last releases,
but a separate team (headed by @dhensby) will be
responsible for 3.x releases.

There's not really much point to declaring a release maintainer,
unless there's disagreements in the core team where we need
an arbitrator. So far those conflicts have been resolved
on individual tickets (e.g. what should go into a release),
and the process for that seems to work well.
 2017-01-17 11:51:20 +13:00
Damian Mooyman
87ac3e3971 ENHANCEMENT Display warning on always_populate_raw_post_data not being -1 in php 5 (#6507) 2017-01-16 17:31:48 +13:00
Damian Mooyman
7d67c5b9bd
API Allow users to act-as another 2017-01-16 09:04:20 +13:00
Daniel Hensby
9a00ead731
DOCS Email docs and upgrade notes 2017-01-13 16:12:25 +00:00
Will Rossiter
b72e8db226 Merge pull request #6495 from robbieaverill/patch-4 
DOCS Add namespacing to environment types page
 2017-01-13 19:25:35 +13:00
Daniel Hensby
3ea5015f8b NEW Move to SwiftMailer powered Emails (#6466) 
* API Replace existing Email and Mailer classes with SwiftMailer powered email system

* DOCS New Email docs

* Initial feedback from Damian

* Making Mailer an interface

* Templates relocated

* Round of feedback

* More robust approach to plain parts

* Revert changes to TestMailer
 2017-01-13 14:48:46 +13:00
Robbie Averill
03e890fe5d DOCS Add namespacing to environment types page 2017-01-13 11:52:43 +13:00
Ingo Schommer
b1d5e97a3d Enforce unique Folder names, use AssetNameGenerator 2017-01-13 11:11:37 +13:00
Robbie Averill
c620063608 DOCS Update docs to reference PageController without an underscore, implement some PSR-2 2017-01-11 09:59:28 +13:00
Robbie Averill
47ab244f0a DOCS Change "Injector" to "SilverStripe\Core\Injector\Injector" in Logger examples 2017-01-06 14:37:27 +13:00
Daniel Hensby
664c0eafbe
Merge branch '3' 2016-12-28 14:30:54 +00:00
Daniel Hensby
1b1f8ed731
Merge branch '3.5' into 3 2016-12-28 11:37:10 +00:00
Damian Mooyman
a9b7a489d1 Merge 3.5 into 3 2016-12-22 13:19:08 +13:00
Damian Mooyman
b1b3a6ee13 Merge 3.4 into 3.5 2016-12-22 13:18:37 +13:00
Damian Mooyman
28d065c587 Added 3.4.3 changelog 2016-12-22 12:02:45 +13:00
Damian Mooyman
9de539fdab Added 3.5.1 changelog 2016-12-22 10:43:34 +13:00
Dan Hensby
26cd99de22 Added 3.5.1-rc2 changelog 2016-12-19 16:28:18 +00:00
Dan Hensby
98b8fefad8 Added 3.4.3-rc1 changelog 2016-12-19 12:21:39 +00:00
Daniel Hensby
19dd8d6824
Merge branch '3.5' into 3 2016-12-19 11:18:00 +00:00
Damian Mooyman
fd9ee8aed3 Merge pull request #6379 from open-sausages/pulls/4.0/psr-coding-conventions 
Updated coding conventions for PSR-2
 2016-12-19 09:41:02 +13:00
Damian Mooyman
534d0f16a3 Merge pull request #6314 from chillu/pulls/4.0/contributing-composer-install 
Composer contributing docs
 2016-12-19 09:40:02 +13:00
Dan Hensby
d249dc9c86 Added 3.5.1-rc1 changelog 2016-12-16 20:49:07 +00:00
Daniel Hensby
efd8114fd5
Merge branch '3.4' into 3.5 2016-12-16 15:52:53 +00:00
Damian Mooyman
6d5e5e7782 Add upgrading note for UploadField.js 2016-12-16 13:41:50 +13:00
Damian Mooyman
c4dd7af886 Whitespace cleanup for 4.0.0.md 2016-12-16 13:41:50 +13:00
Myles Derham
18ff6bec6d Updated location of custom field templates 2016-12-16 10:40:01 +13:00
Daniel Hensby
2ec664d4c2 Merge pull request #6400 from robbieaverill/patch-6 
Update 04_Fixtures.md
 2016-12-15 18:51:12 +00:00
Daniel Hensby
734fe5d8e4 Merge pull request #6399 from robbieaverill/patch-5 
Update 00_Write_a_SapphireTest.md
 2016-12-15 15:49:28 +00:00
Daniel Hensby
5926cd3501 Merge pull request #6398 from robbieaverill/patch-4 
Update unit testing doc for 4.0
 2016-12-15 15:03:22 +00:00
Daniel Hensby
ba39e552a2
Merge branch '3' 2016-12-15 12:20:29 +00:00