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
Robbie Averill
0f058af946
Update 04_Fixtures.md
...
* Added reference for namespaced class names in YAML fixtures
* Updated some examples for PSR-2 compatibility
2016-12-15 16:11:42 +13:00
Robbie Averill
07e4ee4187
Update 00_Write_a_SapphireTest.md
...
* Add imported namespace and convert example to PSR-2
2016-12-15 15:47:56 +13:00
Robbie Averill
403f02e0cd
Update unit testing doc for 4.0
...
* Add namespaced class imports
* Convert examples to PSR-2
2016-12-15 15:45:14 +13:00
Damian Mooyman
8e08eb04ce
Merge branch 'master' into pulls/4.0/psr-coding-conventions
2016-12-14 19:29:35 +13:00
Damian Mooyman
55a9496ad7
Merge pull request #6378 from open-sausages/pulls/4.0/english-coding-conventions
...
Clarify UK-english in coding conventions
2016-12-12 10:29:46 +13:00
Damian Mooyman
6e589aac75
API Updates to Form, ValidationResponse, ValidationException
...
API Implement form schema "errors" handling
2016-12-09 14:24:11 +13:00
Ingo Schommer
e1b84b3c8d
Updated coding conventions for PSR-2
...
See https://github.com/silverstripe/silverstripe-framework/pull/6340
See https://github.com/silverstripe/silverstripe-framework/issues/6376
2016-12-09 11:59:01 +13:00
Ingo Schommer
ad99da1c2e
Clarify UK-english in coding conventions
2016-12-09 11:44:19 +13:00
Robbie Averill
43ad12f134
Remove RHS heading delimiters
...
Our markdown parser doesn't catch them, and they end up being output literally.
2016-12-09 11:20:14 +13:00
Jake Bentvelzen
085c8f5a43
ENHANCEMENT 2x increase in scanning of files for ConfigManifest
2016-12-08 21:35:38 +11:00
Daniel Hensby
c6d43b477e
Merge branch '3'
2016-11-29 13:27:49 +00:00
Damian Mooyman
792a9ec3ed
Add missing changelog content
2016-11-29 16:21:14 +13:00
Daniel Hensby
4bb6765392
Merge branch '3.4' into 3.5
2016-11-28 13:36:06 +00:00
Daniel Hensby
17690ff6bc
Merge branch '3.3' into 3.4
2016-11-28 13:30:29 +00:00
Daniel Hensby
6552dce70e
Merge branch '3.2' into 3.3
2016-11-28 13:26:31 +00:00
Daniel Hensby
214c3d2582
Merge branch '3.1' into 3.2
2016-11-28 13:16:27 +00:00
Dan Hensby
179996b5f9
Added 3.5.0 changelog
2016-11-28 12:35:19 +00:00
Daniel Hensby
1be2e70a2a
Merge branch '3'
2016-11-24 14:18:09 +00:00
Damian Mooyman
6e8304ff2f
API Namespace framework tests
2016-11-23 19:25:12 +13:00
Dan Hensby
47c33dc7c2
Added 3.5.0-rc3 changelog
2016-11-22 14:53:03 +00:00
Dan Hensby
3067bcbd24
Added 3.4.2 changelog
2016-11-21 13:28:00 +00:00
Dan Hensby
375df539eb
Added 3.3.4 changelog
2016-11-21 12:37:09 +00:00
Dan Hensby
4a82041061
Added 3.2.6 changelog
2016-11-18 15:14:42 +00:00
Dan Hensby
586e5281e0
Added 3.1.21 changelog
2016-11-18 12:17:03 +00:00
Ingo Schommer
1ae2709cca
Use "composer update" in contrib docs
...
The "repositories" key makes "composer update" ridiculously slow with the amount of tags and branches we have in core,
so unfortunately we can't rely on it. I've also removed the thinkapp-based instructions about working with git,
since it's now fairly widespread knowledge, and better documented elsewhere.
Note that I've chosen to rename the "origin" remote to "upstream" in order to keep in line with
the contribution documentation on help.github.com (even if it's a bit more clumsy to explain upfront)
2016-11-15 17:36:43 +13:00
Ingo Schommer
56e9f7a627
Removed deprecated --dev flag in docs
2016-11-15 16:29:56 +13:00
Dan Hensby
fcd3d2478c
Added 3.5.0-rc2 changelog
2016-11-10 14:30:07 +00:00
Daniel Hensby
bcc21c2403
Merge branch '3'
2016-11-10 01:09:35 +00:00
Dan Hensby
e1c092e73a
Added 3.5.0-rc1 changelog
2016-11-09 11:45:29 +00:00
Daniel Hensby
0a835c6fe7
Merge branch '3.4' into 3
2016-11-03 13:27:31 +00:00
Damian Mooyman
af27a0f888
Added 4.0.0-alpha3 changelog
2016-11-03 15:27:10 +13:00
Matt Peel
45048ae3b3
Update 14_PHP_Coding_Conventions.md ( #6094 )
...
Include a note preferring type-safe identical comparisons (===) over equality (==) where possible.
2016-11-01 18:12:11 +13:00
Antony Thorpe
148126fb79
Updated 01_Error_Handling.md ( #6128 )
...
Corrected indentation in yaml
2016-11-01 18:11:10 +13:00
Jono Menz
fdfd0c4fc3
DOCS Remove duped content ( #6214 )
...
D.R.Y.
2016-11-01 17:56:32 +13:00
Daniel Hensby
3859a1d7e7
Merge branch '3.4' into 3
2016-10-27 16:16:04 +01:00
Damian Mooyman
ea6851fd70
API Rename _versions table to _Versions
...
API Support case-sensitive changes to tables
Fixes #2365
2016-10-25 13:27:21 +13:00
Matthew Hailwood
7778357b03
Switch Mandrill recommendation to sparkpost. ( #6196 )
...
Now that Mandrill has become a paid part of Campaign Monitor it makes sense for us to recommend the free alternative SparkPost.
The package I've linked to is by the same author as the original Mandrill package.
2016-10-25 13:26:56 +13:00
Nicola Fontana
4d327f81fd
DOCS Specify that the selectors change the scope ( #6213 )
...
Follow up of issue #4015 .
2016-10-21 09:15:27 -07:00
Damian Mooyman
316ac86036
API Writes to versioned dataobjects always writes to stage even when written on live
...
API Remove "Archive" actions
API "Delete" actions for pages now archives records
BUG Fix batch actions failing on certain controllers
Fixes #6059
2016-10-21 13:16:32 +13:00
Damian Mooyman
840f275235
API Created a generic FormFactory interface ( #6178 )
...
Created a generic DataObject FormFactory interface that can be substituted in place of getCMSFields. Different FormFactories can depend on different kinds of context, such as
'Record' or 'Controller' - it's the responsibility of the code calling the factory to interpret and
supply this context.
The expected use-case is that rather than overriding getCMSFields(), developers can
change CMS UIs by manipulating the FormFactory associated with the given DataObject.
This is an experimental UI and may change before 4.0 stable is released.
2016-10-20 12:42:24 +13:00
Jonathon Menz
d2c0b98bc5
DOCS Clarify nested cache block restrictions
...
Fixes #6078
2016-10-13 14:52:41 -07:00
Jonathon Menz
646d34ec48
DOCS Non-extendable classes
...
Closes #6129
2016-10-13 09:39:46 -07:00
Jonathon Menz
bfdac2b7b6
DOCS Template debugging
2016-10-13 09:39:10 -07:00
Jonathon Menz
e9a75a54d9
DOCS Partial caching of relationships
...
Fixes #6177
2016-10-13 09:38:49 -07:00
Jonathon Menz
a893e2aa0f
DOCS How to increase partial cache expiry
...
Closes #3649
2016-10-13 09:37:52 -07:00
Damian Mooyman
92e34b7434
API controller::join_links supports array values
2016-10-07 13:25:56 +13:00
Damian Mooyman
cb24d199b6
API Convert fieldSpec options to bitwise operators ( #6161 )
...
Fixes #6159
2016-10-06 23:23:22 +01:00
Damian Mooyman
11bbed4f76
API Move many methods from DataObject to DataObjectSchema
2016-10-06 19:57:24 +13:00
Damian Mooyman
f0dd9af699
API Support named join alias for many_many through list
...
Add tests for sorting on joined alias
2016-10-06 17:39:48 +13:00
Damian Mooyman
e7303170c2
API Implement many_many through
...
API Remove DataObject::validateModelDefinitions, and move to DataObjectSchema
API Remove deprecated 3.0 syntax for addSelect()
API made DataList::createDataObject public
API Move component parsing logic to DataObjectSchema
API Remove support for triangular has_many / belongs_many relationships
2016-10-06 17:39:48 +13:00
Damian Mooyman
380d6523c5
API Cleaned up versioned status checks
2016-10-06 10:31:09 +13:00
Jonathon Menz
24f8f2715c
DOCS Introduce TemplateGlobalProvider
2016-10-03 09:36:47 -07:00
Daniel Hensby
45736ef2db
Merge branch '3'
2016-10-03 12:00:20 +01:00
jeffreyguo
801574b9b0
Update index.md ( #4020 )
...
MINOR: wording correction
2016-09-29 13:21:17 +13:00
Daniel Hensby
99f98e51d0
Merge branch '3'
2016-09-23 17:15:59 +01:00
Daniel Hensby
6022012481
Merge branch '3.4' into 3
2016-09-23 16:33:45 +01:00
Daniel Hensby
004bb8f03a
Merge pull request #5998 from sminnee/remove-bbcode
2016-09-23 15:28:30 +01:00
Damian Mooyman
68ac1283d0
Add changelog placeholder
2016-09-23 16:27:11 +12:00
Loz Calver
fc72434ea5
Update 4.0.0.md
2016-09-22 16:56:37 +01:00
Damian Mooyman
e8375111b1
API Enable default value to be specified for dbstring types at the db level
...
Fixes #1409
2016-09-22 15:19:30 +12:00
Ingo Schommer
54aad839c4
Clarified <% include %> use in SS4 (see #5952 )
2016-09-22 11:29:32 +12:00
Jason Irish
dcc51ec479
Docs - sort by random instructions
...
Added instructions for sorting per database type. `RAND()` throws errors in PostgreSQL and SQLite
2016-09-20 14:16:22 -05:00
Ingo Schommer
a0c0a4ae4f
Updated docs with sass-lint references
2016-09-18 16:25:16 +12:00
Sam Minnee
c2ebff5c19
NEW: Use sass-lint over scss-lint
...
SCSS linting now uses the node-based sass-lint tool, since we’re
shifting away from CodeClimate.
This has the benefit of not requiring a ruby gem on dev tools -
everything is provided as npm dev dependencies.
This was also necessary to run the linting inside travis.
2016-09-18 14:50:27 +12:00
Daniel Hensby
f65168ef8d
Merge branch '3'
2016-09-16 13:43:23 +01:00
Ingo Schommer
8f23fa99a5
API Moved CMS-specific JavaScript to admin/thirdparty
...
The 'admin' module will be split off from 'framework',
where 'framework' only provides (mostly) frontend-agnostic PHP classes.
For example, HTMLEditorField.php has a TinyMCEConfig.php driver,
but doesn't come with its own JS includes.
2016-09-16 13:46:10 +12:00
Ingo Schommer
2316b0da9f
API Remove i18n::js_i18n option
...
The JavaScript i18n functionality in SilverStripe is used in the CMS as well as form field implementations.
Form fields used to include their own JavaScript for usage outside of CMS. This now requires custom build tooling in a project.
Hence there's no need for an i18n shim (i18nx.js), since the CMS always uses i18n support.
2016-09-16 13:46:09 +12:00
Ingo Schommer
ee10dbb680
API Moved frontend assets into admin/ "module"
...
We've removed the ability to directly reference JS and CSS files
for form fields and other SilverStripe features in favour of a common bundle built by Webpack.
The logical next step is to make the framework module free of frontend dependencies,
which should simplify its operation, and avoid another time intensive "npm install" on a module.
2016-09-16 13:46:06 +12:00
Ingo Schommer
0a380a94cd
API Removed unused UMD builds of individual JS files
...
This has been made obsolete, since those files are all included in the main bundle (see bundle-lib.js).
They should not be referenced individually (e.g. through Requirements::block() or Requirements::javascript()).
2016-09-15 22:19:10 +12:00
Sam Minnee
1b527fca3f
FIX Webpack handles images & fonts.
...
Responsibility for finding and referencing images and fonts is now
given to webpack. All the url references are now relative to the
component scss file, and point to font & images files in src/, rather
than assuming someone else will place them in dist.
This makes the source more modular, and makes it easier to, for
example, inline images are data URIs, or create a new build script that
builds several modules for a project in a single pass.
Workaround for bad font path in bundle.css:
ExtactTextPlugin didn’t work as well with a subfolder reference in the
filename. This is just a short-term fix and could probably be improved
to put bundle.css back in the styles subfolder.
Webpack handles images & fonts:
Responsibility for finding and referencing images and fonts is now
given to webpack. All the url references are now relative to the
component scss file, and point to font & images files in src/, rather
than assuming someone else will place them in dist.
This makes the source more modular, and makes it easier to, for
example, inline images are data URIs, or create a new build script that
builds several modules for a project in a single pass.
Clarify docs on spriting and webfonts:
We've decided to remove sprity since it comes with hundreds of dependencies,
and needs compilation within the "npm install" - dragging out the already overweight
install process, and making the resulting node_modules/ folder less portable between systems.
2016-09-15 22:19:09 +12:00
Sam Minnee
2e577ddb1d
API Use Webpack
...
The bundle is generated by running “webpack” directly - gulp is no
longer needed as an intermediary. The resulting config is a lot shorter,
although more configuration is pushed into lib.js.
Modules are shared between javascript files as global variables.
Although this global state pollution is a bit messy, I don’t think it’s
practically any worse than the previous state, and it highlights the
heavy coupling between the different packages we have in place.
Reducing the width of the coupling between the core javascript and
add-on modules would probably be a better way of dealing with this than
replacing global variables with some other kind of global state.
The web pack execution seems roughly twice as fast - if I clear out my
framework/client/dist/js folder, it takes 13.3s to rebuild. However,
it’s not rebuilding other files inside dist, only the bundle files.
CSS files are now included from javascript and incorporated into
bundle.css by the webpack. Although the style-loader is helpful in some
dev workflows (it allows live reload), it introduces a flash of
unstyled content which makes it inappropriate for production.
Instead ExtractTextPlugin is used to write all the aggregated CSS
into a single bundle.css file. A style-loader-based configuration could
be introduced for dev environments, if we make use of the webpack live
reloader in the future.
Note that the following features have been removed as they don't appear to be
necessary when using Webpack:
- UMD module generation
- thirdparty dist file copying
LeftAndMain.js deps: Without it, ssui.core.js gets loaded too late,
which leads e.g. to buttons being initialised without this added behaviour.
2016-09-15 22:19:05 +12:00
Daniel Hensby
f25b88b146
showqueries debugging tool now inserts parameters in place ( #5885 )
2016-09-15 09:15:19 +12:00
Daniel Hensby
4e1d38c209
Merge branch '3'
2016-09-14 11:49:07 +01:00
Daniel Hensby
a9df28c791
Merge branch '3.4' into 3
2016-09-14 11:40:15 +01:00
Sam Minnee
aecf5260fc
API: Remove TextParser and BBCodeParser
...
These have been archived at
https://github.com/silverstripe-archive/silverstripe-bbcodeparser
2016-09-14 09:10:49 +12:00
Daniel Hensby
e3ac75febd
DOCS Reference composer docs for installation instructions
2016-09-12 17:04:20 +01:00
Zaid Al-Dabbagh
d0aa0cb911
Update 01_Error_Handling.md
...
Indentation error causes yaml parsing error.
2016-09-12 10:51:30 +12:00
Damian Mooyman
bfd9cb1aca
Rename SS_ prefixed classes ( #5974 )
2016-09-09 18:43:05 +12:00
Ingo Schommer
01fdb7949f
Clarify upgrader docs
2016-09-09 13:54:54 +12:00
Ingo Schommer
97c2baedeb
Less verbosity in upgrading guide
2016-09-09 13:33:52 +12:00
Damian Mooyman
fe5925726e
Restructure 4.0.0.md
2016-09-09 13:16:09 +12:00
Damian Mooyman
8dd644d25d
API Namespace all classes
...
Namespace all templates
Move difflib and BBCodeParser2 to thirdparty
Remove deprecated API marked for removal in 4.0
2016-09-08 10:23:17 +12:00
Daniel Hensby
918fb94396
Merge branch '3'
2016-09-07 09:31:23 +01:00
Daniel Hensby
3fd9fe3aa0
Merge branch '3.4' into 3
2016-09-07 09:22:06 +01:00
Ingo Schommer
3b71b7731a
Merge pull request #5943 from open-sausages/pulls/4.0/template-lookup-redux
...
API Update template lookup to late resolution for performance reasons
2016-09-06 20:27:11 +12:00
Damian Mooyman
c9b6e9bac0
API Update template lookup to late resolution for performance reasons
...
API Update behaviour of form fields to use standard template lookup mechanism
API Support custom "type" parameter to template lookup
2016-09-06 12:54:03 +12:00
Daniel Hensby
2fbd1658dd
Merge pull request #5949 from open-sausages/pulls/4.0/document-iconv
...
Document iconv a bit better
2016-09-06 00:00:29 +01:00
Damian Mooyman
ca6be9eddb
Document iconv a bit better
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1002
2016-09-05 17:55:32 +12:00
Damian Mooyman
7105099497
API Change behaviour of filter API to support injected search filter classes
...
API Remove DataList::applyFilterContext(), superseded by DataList::createSearchFilter()
API SearchFilter::getSupportedModifiers() added to support supported modifier inspection
2016-09-05 17:28:36 +12:00
Ingo Schommer
d38db31eb4
Added link to React coding conventions
2016-09-01 13:59:34 +12:00
Ingo Schommer
1a8348900d
Merge pull request #5899 from christopherdarling/patch-7
...
DOCS add missing commit af3412a
2016-09-01 08:17:16 +12:00
Rob Ingram
a0d3ad1875
Change order of fixtures in example
...
* Make the document explicit about the definition of objects before they are referenced.
2016-08-24 07:37:55 +12:00
Daniel Hensby
1d1227cc9a
Merge branch '3'
2016-08-23 10:37:47 +01:00
Daniel Hensby
058f57979b
Merge branch '3.4' into 3
2016-08-22 16:23:22 +01:00
Daniel Hensby
060bf6b327
Merge branch '3.3' into 3.4
2016-08-22 16:22:37 +01:00
Daniel Hensby
088d88e978
Merge branch '3.2' into 3.3
2016-08-22 16:22:02 +01:00
Daniel Hensby
f4a6e9e517
Merge branch '3.1' into 3.2
2016-08-22 15:30:03 +01:00
Daniel Hensby
8e4e2b4fa8
Merge pull request #4173 from AntonyThorpe/patch-4
...
DOCS Update 06_Tabbed_Forms.md
2016-08-19 15:49:51 +01:00
Christopher Darling
ef1d93c994
DOCS add missing commit af3412a to 3.4.1 changelog
2016-08-18 16:27:36 +01:00
Damian Mooyman
59efd280ad
Fix issues with CMS permission codes
...
Standardise template locations
Move CMSSettingsController class to SiteConfig module
Fix CMSMenu behaviour for namespaced admin sections
Split classes into one per file
Manual fixes and cleanup
2016-08-17 11:19:14 +12:00
Ingo Schommer
f3db2e3e03
Upgrade note on HeaderField
2016-08-16 11:09:20 +12:00
Damian Mooyman
d88516203c
Merge 3.4 into 3
2016-08-15 19:05:20 +12:00
Damian Mooyman
f4ba3cd175
Merge 3.3 into 3.4
...
# Conflicts:
# security/ChangePasswordForm.php
# templates/forms/OptionsetField.ss
2016-08-15 19:03:13 +12:00
Damian Mooyman
ebc0bafea9
Merge 3.2 into 3.3
2016-08-15 18:51:07 +12:00
Damian Mooyman
f3afd14e4f
Merge 3.2 into 3.3
2016-08-15 18:47:43 +12:00
Damian Mooyman
8ec89be9d4
Merge 3.1 into 3.2
...
# Conflicts:
# forms/CheckboxSetField.php
# forms/OptionsetField.php
# security/Member.php
# tests/forms/CheckboxSetFieldTest.php
2016-08-15 18:46:26 +12:00
Damian Mooyman
1f06e6dd18
Added 3.4.1 changelog
2016-08-15 18:29:38 +12:00
Damian Mooyman
68986558c9
Added 3.3.3 changelog
2016-08-15 18:05:32 +12:00
Damian Mooyman
351bf6cfe4
Added 3.2.5 changelog
2016-08-15 17:22:23 +12:00
Damian Mooyman
6f60d2518b
Added 3.1.20 changelog
2016-08-15 16:44:36 +12:00
Damian Mooyman
02000e5446
Added 3.4.1-rc2 changelog
2016-08-15 15:55:19 +12:00
Damian Mooyman
7c0669486a
Added 3.3.3-rc2 changelog
2016-08-15 15:34:41 +12:00
Damian Mooyman
d83c678b6a
Added 3.3.3-rc2 changelog
2016-08-15 15:07:26 +12:00
Damian Mooyman
1a03bdba7a
Added 3.2.5-rc2 changelog
2016-08-15 14:17:41 +12:00
Damian Mooyman
b2a7170c64
Added 3.1.20-rc2 changelog
2016-08-15 13:41:31 +12:00
Christopher Joe
42d36da3fb
Switch redux-logger to redux devtools for easier debugging
2016-08-12 16:11:33 +12:00
Damian Mooyman
c7387ff45f
API Upgrade to SilverStripe\CMS namespace
2016-08-11 11:50:18 +12:00
Damian Mooyman
7de5b998e1
Merge 3.4 into 3
2016-08-05 19:12:25 +12:00
Damian Mooyman
2299b8e67a
Added 3.4.1-rc1 changelog
2016-08-05 18:52:14 +12:00
Damian Mooyman
ca754eb887
Merge 3.3 into 3.4
...
# Conflicts:
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/it.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/it.js
# lang/cs.yml
# lang/eo.yml
# lang/fa_IR.yml
# lang/fi.yml
# lang/it.yml
# lang/sk.yml
2016-08-05 16:48:26 +12:00
Damian Mooyman
958344eb5d
Added 3.3.3-rc1 changelog
2016-08-05 16:33:22 +12:00
Damian Mooyman
0d5ae23f2b
Merge 3.2 into 3.3
2016-08-05 14:36:35 +12:00
Damian Mooyman
6e6451fa71
Added 3.2.5-rc1 changelog
2016-08-05 13:24:35 +12:00
Damian Mooyman
cb39f2ef27
Merge 3.1 into 3.2
...
# Conflicts:
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# javascript/lang/fa_IR.js
# javascript/lang/src/fa_IR.js
2016-08-05 11:41:04 +12:00
Damian Mooyman
ec969c21e6
Added 3.1.20-rc1 changelog
2016-08-05 11:17:57 +12:00
Paul Clarke
b9445511b7
Bootstrap GridField
2016-08-03 18:35:18 +12:00
Daniel Hensby
d083c9622a
Merge pull request #4394 from simonwinter/patch-1
...
Update 05_Typography.md
2016-08-02 21:27:56 +01:00
Damian Mooyman
9188628ae3
API Add $action parameter to Controller::Link
2016-08-02 10:27:55 +12:00
Damian Mooyman
020d0c181e
Changelog for https://github.com/silverstripe/silverstripe-cms/pull/1556 ( #5837 )
2016-07-25 18:27:38 +12:00
Damian Mooyman
20daf1f8e1
API Abstract ThemeManifest into ThemeList
...
BUG Fix Requirements not resolving $default theme
2016-07-21 12:11:25 +12:00
Daniel Hensby
f548ddf8a8
Merge branch '3'
2016-07-20 21:44:47 +01:00
Daniel Hensby
340a48306b
Merge branch '3.4' into 3
2016-07-20 19:48:17 +01:00
Daniel Hensby
cf247534d5
Merge branch '3.3' into 3.4
2016-07-20 19:43:41 +01:00
Damian Mooyman
319d6d293e
BUG Fix doclink ( #5827 )
...
Fixes #5721
2016-07-20 10:12:42 +01:00
Daniel Hensby
ac17e12464
Merge pull request #3274 from colymba/custom-admin-url
2016-07-19 14:42:25 +01:00
Loz Calver
0a7e4cf7c3
Merge branch '3'
2016-07-15 16:01:48 +01:00
Sam Minnée
5c98d331a3
Merge pull request #5804 from open-sausages/feature/themestack
...
API Theme stacking
2016-07-15 17:12:54 +12:00
Hamish Friedlander
b8b4e98ac2
API Theme stacking
2016-07-15 16:29:25 +12:00
Damian Mooyman
5cb4ab4a82
API Add PopoverField for extra-actions popup in react
2016-07-15 15:46:11 +12:00
Daniel Hensby
b7fc0a2752
Merge pull request #5790 from patricknelson/issue-5784-email-reply-to
...
FIX for #5784 : Email API improvements, documentation cleanup.
2016-07-15 00:23:25 +01:00
Patrick Nelson
74c555e004
FIX for #5784 : Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards.
2016-07-14 10:25:40 -07:00
Daniel Hensby
d19955afc8
Merge branch '3'
2016-07-14 14:05:18 +01:00
Daniel Hensby
4c40cf8dbb
Merge branch '3.4' into 3
2016-07-14 12:01:19 +01:00
Daniel Hensby
d766c8559b
Merge branch '3.3' into 3.4
2016-07-14 11:57:15 +01:00
Damian Mooyman
6e68f38efb
API Update react sections to use react-router instead of page.js ( #5796 )
...
Fixes #5711
2016-07-14 17:51:01 +12:00
Damian Mooyman
26d46517ac
API Remove custom DBHTMLText::exists() custom behaviour
...
Fix merge regressions
2016-07-13 18:45:57 +12:00
Damian Mooyman
b7ac5c564d
API / BUG Fix DBField summary methods
...
Cleanup DBField subclasses
Fixes #2929
Fixes #1381
Fixes #5547
Fixes #1751
2016-07-13 17:15:45 +12:00
Damian Mooyman
5c9044a007
API Enforce default_cast for all field usages
...
API Introduce HTMLFragment as casting helper for HTMLText with shortcodes disabled
API Introduce DBField::CDATA for XML file value encoding
API RSSFeed now casts from the underlying model rather than by override
API Introduce CustomMethods::getExtraMethodConfig() to allow metadata to be queried
BUG Remove _call hack from VirtualPage
API Remove FormField::$dontEscape
API Introduce HTMLReadonlyField for non-editable readonly HTML
API FormField::Field() now returns string in many cases rather than DBField instance.
API Remove redundant *_val methods from ViewableData
API ViewableData::obj() no longer has a $forceReturnObject parameter as it always returns an object
BUG Fix issue with ViewableData caching incorrect field values after being modified.
API Remove deprecated DB class methods
API Enforce plain text left/right formfield titles
2016-07-13 17:15:45 +12:00
Damian Mooyman
ce11c47d00
Merge pull request #5700 from Ironcheese/patch-1
...
Moving a field between tabs, wrong variable name
2016-07-12 13:58:54 +12:00
Daniel Hensby
5776a03141
Merge branch '3'
2016-07-11 23:45:41 +01:00
Daniel Hensby
3906228fc1
Merge branch '3.4' into 3
2016-07-11 21:14:21 +01:00
Daniel Hensby
f44c47eea1
Merge branch '3.3' into 3.4
2016-07-11 21:11:05 +01:00
Florian Thoma
9fc51dc527
add async and defer attributes to js requirements, replaces #4555
2016-07-08 14:31:39 +10:00
Robbie Averill
04a4d7937e
DOCS Update 02_Relations ( #5785 )
...
* Code formatting on some variable names
* Add example for removing scaffolded parent relation fields
2016-07-07 22:32:43 +01:00
Damian Mooyman
af22a83166
API Apply Framework\Security namespace
2016-07-07 11:32:28 +12:00
Damian Mooyman
4dadc276b5
Merge pull request #3916 from dhensby/nfauchelle-gd-padding-improvementt
...
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
2016-07-04 17:35:47 +12:00
Damian Mooyman
27ce71390a
Documentation for https://github.com/silverstripe/silverstripe-upgrader/ ( #5695 )
2016-06-20 12:07:29 +12:00
Ironcheese
9b1a4b328c
Moving a field between tabs, wrong variable name
2016-06-15 15:36:43 +02:00
Hamish Friedlander
51d53f4b50
Merge pull request #5646 from open-sausages/pulls/4.0/config-table-name
...
API Allow table_name to be declared / introduce DataObjectSchema
2016-06-14 15:06:38 +12:00
Daniel Hensby
9e3f76832b
Merge branch '3'
2016-06-13 13:41:20 +01:00
Daniel Hensby
4e392a4d43
Merge branch '3.3' into 3.4
2016-06-13 12:30:16 +01:00
Ingo Schommer
ac6ada9f10
Document gcc requirement for frontend build tooling
2016-06-13 08:30:45 +12:00
Ingo Schommer
75a23c0b31
Moved "build tooling" into separate doc
...
It was getting a bit lost halfway down the contributing/code instructions,
in between the detailed git instructions.
Also reordered the docs TOC for that folder by renaming the files.
2016-06-13 08:30:44 +12:00
Ingo Schommer
c96e031367
Moved coding conventions docs into contributing folder
...
Also created a contributing/coding_conventions landing page separately from the PHP ones, since we now need to account for JS and CSS conventions as well
2016-06-13 08:30:44 +12:00
Damian Mooyman
a4f64d01c2
Merge pull request #5607 from chillu/pulls/4.0/docs-release-instructiongs
...
Updated docs instructions on core release
2016-06-10 11:59:30 +12:00
Damian Mooyman
8fdcae5c7d
Merge pull request #5608 from chillu/pulls/4.0/contributing-docs-master
...
Clarify where docs commits go
2016-06-10 11:57:27 +12:00
Damian Mooyman
5e8ae41d47
API Refactor dataobject schema management into separate service
...
API Allow table_name to be configured via Config
2016-06-08 13:22:56 +12:00
Sam Minnee
b249cc389a
DOC: Add docs for template namespacing.
2016-06-07 14:36:00 +12:00
Nick
dae2295e16
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
2016-06-05 00:05:37 +01:00
Damian Mooyman
8a99b4f74e
Merge 3.4.0 into 3.4
2016-06-03 11:33:44 +12:00
Damian Mooyman
8008fcbe97
Update changelog
2016-06-03 10:59:29 +12:00
Damian Mooyman
3fbeab94c8
Added 3.4.0 changelog
2016-06-02 17:27:21 +12:00
Ingo Schommer
ed9ebaa670
Updated docs instructions on core release
...
See https://github.com/silverstripe/doc.silverstripe.org/pull/137 for context
2016-05-30 11:31:40 +12:00
Ingo Schommer
f5893547c5
Clarify where docs commits go
2016-05-30 10:42:26 +12:00
Paul
f4037fe319
Swap out .Actions class for bootstrap .btn-toolbar ( #5581 )
...
* Swap out .Actions class for bootstrap .btn-toolbar
* Converted all south toolbars to use new toolbar component styles, content and preview styles for scrollbars adjusted where required
2016-05-27 13:39:10 +12:00
Simon Erkelens
20fac04637
RFC #5487 Remove Oembed in favor of embed/embed. ( #5536 )
2016-05-27 13:09:03 +12:00
Ingo Schommer
5cace7c693
Fixed javascript/ docs references ( #5599 )
...
* More pointers to new build tooling docs in upgrading guide
* Fixed docs references to moved files
We don't want to mandate every module to switch from javascript/ to client/src,
but at the same time shouldn't reference non-existant files and confuse newcomers that way.
* More pointers to new React docs
2016-05-27 13:08:22 +12:00
Ingo Schommer
6eae67dbf1
Removed duplicate changelog ( #5600 )
...
Introduced by 75d9f6e589
2016-05-27 13:07:22 +12:00
Michael Strong
db4dc64fb4
DOCS incorrect method referenced
...
ModelAdmin uses 'getDefaultSearchContext': http://api.silverstripe.org/3.3/source-class-ModelAdmin.html#173
2016-05-24 13:25:02 +12:00
Daniel Hensby
75d9f6e589
Upgrading docs
2016-05-23 00:21:04 +01:00
Daniel Hensby
cdb0b07345
Merge branch '3'
2016-05-20 14:20:33 +01:00
Daniel Hensby
016d39c81e
Merge branch '3.3' into 3.4
2016-05-20 12:34:10 +01:00
Damian Mooyman
0d356d078d
Add release notes to changelog
2016-05-19 15:27:07 +12:00
Damian Mooyman
b4e8c595f5
Added 3.4.0-rc1 changelog
2016-05-19 15:08:09 +12:00
Damian Mooyman
5df9cb05f3
Merge pull request #5551 from AntonyThorpe/patch-1
...
Updated 01_Data_Model_and_ORM.md for byID
2016-05-19 14:08:45 +12:00
Michael James
3870c499d6
DOCS Adding comma to array declaration ( #5558 )
2016-05-18 15:07:45 +01:00
Damian Mooyman
574bc6038b
Merge 3 into master
...
# Conflicts:
# CONTRIBUTING.md
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.EditForm.js
# admin/javascript/LeftAndMain.js
# admin/scss/_forms.scss
# dev/Debug.php
# docs/en/05_Contributing/01_Code.md
# forms/DropdownField.php
# model/DataObject.php
# model/Versioned.php
# model/fieldtypes/DBLocale.php
# tests/forms/gridfield/GridFieldExportButtonTest.yml
# tests/model/MoneyTest.php
# tests/model/MoneyTest.yml
# tests/model/SQLQueryTest.php
2016-05-18 18:36:10 +12:00
Damian Mooyman
757cfae90c
API Enable Debug.friendly_error_httpcode to correctly set HTTP status code for errors
2016-05-18 14:27:45 +12:00
Damian Mooyman
8ed25ae482
BUG Fix DataObject::isChanged() detecting non saveable changes ( #5545 )
2016-05-18 09:00:04 +10:00
Antony Thorpe
f12258427a
Updated 01_Data_Model_and_ORM.md for byID
...
According to the framework's API documentation 'byID' is a method of DataList not 'byId'. Both are used in the documentation.
2016-05-18 08:30:29 +12:00
Igor
5b691d1835
Minor: update docs for PR branch guidelines #5345 ( #5365 )
2016-05-16 12:34:43 +12:00
Daniel Hensby
0594542e7f
Merge branch '3'
2016-05-12 16:42:48 +01:00
Damian Mooyman
2d07f9b24c
Add current 4.0.0 changelog to alpha 1 release notes.
2016-05-12 16:07:35 +12:00
Damian Mooyman
b9a32386c9
Added 4.0.0-alpha1 changelog
2016-05-12 16:00:20 +12:00
Damian Mooyman
7041c5945c
API Enable requirements to persist between flushes
2016-05-12 12:46:30 +12:00
Damian Mooyman
664ebdde05
Merge remote-tracking branch 'origin/3'
2016-05-11 15:39:38 +12:00
Damian Mooyman
06f0f558d4
Merge remote-tracking branch 'origin/3.3' into 3
2016-05-11 15:38:40 +12:00
Damian Mooyman
5f82e40fd4
Remove stale commits from release notes
2016-05-11 15:37:31 +12:00
Damian Mooyman
d3f5c85403
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-05-11 15:36:40 +12:00
Damian Mooyman
79602dc44d
Remove stale commits from release notes
2016-05-11 15:34:32 +12:00
Damian Mooyman
f13e44a265
Merge 3 into master
...
# Conflicts:
# admin/javascript/LeftAndMain.Tree.js
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/en.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/en.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# css/GridField.css
# forms/gridfield/GridFieldExportButton.php
# javascript/GridField.js
# javascript/lang/ar.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/en.js
# javascript/lang/en_GB.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/id.js
# javascript/lang/id_ID.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr@latin.js
# javascript/lang/sr_RS.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fi.js
# javascript/lang/src/fr.js
# javascript/lang/src/id.js
# javascript/lang/src/id_ID.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr@latin.js
# javascript/lang/src/sr_RS.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# scss/GridField.scss
# tests/model/ManyManyListTest.php
# tests/model/SQLQueryTest.php
2016-05-11 15:19:35 +12:00
Damian Mooyman
4f06a43986
Merge 3.3 into 3
...
# Conflicts:
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/en.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# javascript/lang/fr.js
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fi.js
# javascript/lang/src/fr.js
# javascript/lang/src/id.js
# javascript/lang/src/id_ID.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr@latin.js
# javascript/lang/src/sr_RS.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
# lang/it.yml
2016-05-11 14:06:23 +12:00
Damian Mooyman
b165d52f30
Merge 3.2 into 3.3
2016-05-11 14:00:10 +12:00
Damian Mooyman
9da594b326
Merge 3.1 into 3.2
...
# Conflicts:
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# javascript/lang/ar.js
# javascript/lang/bg.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fa_IR.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/id.js
# javascript/lang/id_ID.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr@latin.js
# javascript/lang/sr_RS.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# lang/nl.yml
# lang/sk.yml
2016-05-11 13:48:22 +12:00
Damian Mooyman
7693fc9504
Merge upgrading notes from 3.1.19
2016-05-11 13:42:41 +12:00
Damian Mooyman
18fcd68acf
Merge up changes from 3.1.19 changelog
2016-05-11 13:41:02 +12:00
Damian Mooyman
de5949b3dd
Added 3.3.2 changelog
2016-05-11 11:25:17 +12:00
Damian Mooyman
cfb3d96a03
Added 3.2.4 changelog
2016-05-11 11:24:49 +12:00
Damian Mooyman
68dca6f6c0
Added 3.1.19 changelog
2016-05-11 11:09:20 +12:00
Wing Ho
1e408a13b5
Update typo in environment types documentation
2016-05-10 14:52:49 +10:00
Christopher Pitt
aedc01bf18
Simplified branching code
2016-05-09 16:45:46 +12:00
Hamish Friedlander
b2786c228b
FIX add_i18n_javascript calls not being updated after JS move
...
This fixes alert / confirm boxes that were popping up without text (for
example silverstripe-cms/issues/1476), although ideally we wouldn't
show empty dialog boxes on this sort of error - we'd have some default,
or a way to detect the issue.
2016-05-09 15:41:24 +12:00
Ingo Schommer
a1dccaa8ff
Add linting note in coding conventions
2016-05-06 08:02:41 +12:00
Daniel Hensby
5eafdce963
Added 3.3.2-rc1 changelog
2016-05-05 13:38:46 +01:00
Daniel Hensby
d1751e3310
Merge remote-tracking branch '3.2.4' into 3.3.2
2016-05-05 12:33:21 +01:00
Daniel Hensby
73b922d43b
Added 3.2.4-rc1 changelog
2016-05-05 11:48:07 +01:00
Daniel Hensby
cf29b2c146
Merge remote-tracking branch '3.1.19' into 3.2.4
2016-05-05 11:17:45 +01:00
Daniel Hensby
ee5133f355
Added 3.1.19-rc1 changelog
2016-05-05 09:33:57 +01:00
Ingo Schommer
9011aaefa7
Merge pull request #5455 from open-sausages/pulls/4.0/OSS-1691-update-docs
...
Update front-end build tooling docs
2016-05-05 20:25:57 +12:00
David Craig
7ceae58e8a
Mark legacy JavaScript docs as deprecated
2016-05-05 11:29:13 +12:00
David Craig
32bfc3853a
Update client-side build tooling docs
2016-05-04 16:02:49 +12:00
Damian Mooyman
8ce3d90e18
API Injector dependencies no longer inherit from parent classes automatically
...
API Allow classes to inherit service definitions explicitly
2016-05-03 18:39:31 +12:00
Ingo Schommer
2f9e03ec22
Mention ReactJS vs. entwine in docs
...
https://silverstripe.atlassian.net/browse/OSS-1691
2016-05-03 08:52:18 +12:00
Damian Mooyman
72fcfbf4bc
API Campaign preview for images
2016-05-02 15:27:12 +12:00
Damian Mooyman
d52db0ba34
Merge 3 into master
...
# Conflicts:
# .travis.yml
# admin/css/ie7.css
# admin/css/ie7.css.map
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.js
# admin/scss/_style.scss
# admin/scss/_uitheme.scss
# control/HTTPRequest.php
# core/Object.php
# css/AssetUploadField.css
# css/AssetUploadField.css.map
# css/ConfirmedPasswordField.css.map
# css/Form.css.map
# css/GridField.css.map
# css/TreeDropdownField.css.map
# css/UploadField.css
# css/UploadField.css.map
# css/debug.css.map
# dev/Debug.php
# docs/en/00_Getting_Started/00_Server_Requirements.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
# filesystem/File.php
# filesystem/Folder.php
# filesystem/GD.php
# filesystem/Upload.php
# forms/ToggleField.php
# forms/Validator.php
# javascript/lang/en_GB.js
# javascript/lang/fr.js
# javascript/lang/src/en.js
# javascript/lang/src/fr.js
# model/Image.php
# model/UnsavedRelationList.php
# model/Versioned.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/DBField.php
# model/fieldtypes/Enum.php
# scss/AssetUploadField.scss
# scss/UploadField.scss
# templates/email/ChangePasswordEmail.ss
# templates/forms/DropdownField.ss
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
# tests/forms/EnumFieldTest.php
# tests/security/MemberTest.php
# tests/security/MemberTest.yml
# tests/security/SecurityTest.php
2016-04-29 17:50:55 +12:00
NightJar
89351e6c31
Fix the most egregious error for an NZ based proj. ( #5416 )
...
The Bay of Plenty Rugby team is the Steamers, and play in the NPC (National Provincial Championship), hailing from the Te Ika a Maui (North Island).
The Canterbury Crusaders (note the alliteration) hail from Te Waipounamu (South Island), and are an entry in the Super Rugby championship, which is an international affair (also known as the Super12, Super15 & most recently Super18), in which the Bay of Plenty is (most unfortunately, depending on your disposition) drafted under the Waikato region's entry with The Chiefs. Being the most popular sport and widely announced news topic in the country means that even people that don't particuarly follow rugby know this, and simple trolls (whether intentional or not) cannot be allowed to slide past quality control; for those that do can get quite upset about this kind of thing. Plus international folk can't be getting the wrong idea; Everyone knows the internet is no place for misinformation!
2016-04-29 12:07:25 +12:00
Ingo Schommer
e48b23222f
Finished sentence in CSS conventions
2016-04-27 08:00:44 +12:00
Ingo Schommer
cb723a684a
Fixed docs wording
2016-04-27 07:58:58 +12:00
Paul
3ce1f48202
Updated CSS coding conventions ( #5389 )
...
Co-authored by @chillu
2016-04-26 14:21:08 +12:00
David Craig
95565d91ab
Update docs to include new client-side routing
2016-04-26 13:46:30 +12:00
Daniel Hensby
679185514d
Merge 3.3 into 3
...
Conflicts:
admin/css/screen.css.map
2016-04-26 00:24:59 +01:00
Daniel Hensby
745faebd81
Merge 3.2 into 3.3
...
Conflicts:
.travis.yml
2016-04-26 00:17:09 +01:00
Daniel Hensby
a0812f987a
Merge 3.1 into 3.2
...
Conflicts:
admin/javascript/LeftAndMain.js
control/HTTPRequest.php
docs/en/00_Getting_Started/00_Server_Requirements.md
2016-04-26 00:09:33 +01:00
Ingo Schommer
2d1f948a36
Documented JS coding conventions
...
See https://github.com/silverstripe/silverstripe-framework/pull/5108
2016-04-25 21:55:33 +12:00
Damian Mooyman
8b239a5011
Docs and tests for exempt validation actions
2016-04-22 14:52:38 +12:00
Daniel Hensby
a6bd22ab2f
[SS-2016-006] FIX dont disable XSS for login forms
2016-04-20 23:57:59 +01:00
Ingo Schommer
19de22f427
API Moved frontend assets into admin/client/
...
admin/javascript => admin/client
admin/javascript/src => admin/client/src/legacy (mostly)
admin/scss/_variables.scss => admin/client/styles/_variables.scss
admin/scss => admin/client/styles/legacy/
admin/css/editor.css => admin/client/dist/css/editor.css
admin/css/screen.css => admin/client/dist/css/bundle.css
admin/images => admin/client/dist/images
admin/images/sprites/src => admin/client/src/sprites
admin/images/sprites/dist => admin/client/dist/sprites
admin/font => admin/client/dist/font
2016-04-20 21:13:10 +12:00
Sam Minnee
82a89a94f4
Add 2 new committers, remove 1 who has left.
2016-04-19 23:05:59 +12:00
Igor
ec5464a6dc
minor docs broken link
2016-04-19 22:21:26 +12:00
Damian Mooyman
0bd62735bc
BUG Fix issue with Requirements mangling custom scripts ( #5337 )
...
API Remove deprecated $template parameter from Requirements::includeInHTML
2016-04-19 17:20:30 +12:00
Michael Strong
1f820b0b1c
DOCS allowed_actions access control ( #5333 )
2016-04-18 17:49:30 +12:00
Hamish Friedlander
97a62b4982
Merge pull request #5278 from open-sausages/pulls/4.0/campaign-admin
...
Campaigns Feature
2016-04-08 10:14:06 +12:00
Ingo Schommer
7ff646091e
Noting update to LeftAndMain.help_link
...
See https://github.com/silverstripe/silverstripe-framework/pull/5167/
2016-04-06 19:39:17 +12:00
Patrick Nelson
49e6d701e5
Removal of FlushGeneratedImagesTask was not documented.
...
This task appears to have been superseded by a new task called `RegenerateCachedImagesTask` but it was not documented, so `FlushGeneratedImagesTask` simply appeared to have vanished. This will update the documentation to reflect this change for both v3.2 and v3.3 (separate PR).
2016-04-05 15:09:46 -07:00
David Craig
f8c17bed3b
CampaignAdmin and GridField React sections
...
Also removes watchify because it wasn't working.
Add SilverStripeBackend class used to fetch data from endpoints for the front-end
2016-04-05 22:42:13 +12:00
Damian Mooyman
3c2b53157e
API Update Versioned methods
2016-04-04 14:50:16 +12:00
Damian Mooyman
87ee4365e7
API Implement ChangeSets for batch publishing
2016-04-04 14:46:38 +12:00
Damian Mooyman
29c5eff433
API Add $context method to DataObject::can for consistency with canCreate()
2016-04-04 14:46:38 +12:00
David Craig
aa1aebd007
Implement client-side routing with Page.js
...
- Removes thirdparty dependency History.js
- Adds thirdparty dependency Page.js to manage client-side routing
- Adds a wrapper around Page.js for SilverStripe specific behaviour
- Increased minimum browser requirement to IE10. Native HTML History API routing requires IE10 or newer (necessitated by removal of History.js)
- PJAX pannel loading via now uses promises rather than callbacks
- Adds getClientConfig method to LeftAndMain which can be used to pass config from to the front-end client
2016-04-01 13:45:14 +13:00
Damian Mooyman
b8e7f9a934
Standardise spelling of "customise"
...
Fixes #3988
2016-03-30 13:17:28 +13:00
Damian Mooyman
094745ec0f
API Formally support custom ownership relations
...
API 'owned_by' is no longer mandatory for relations backed by normal db relations
API Extension setOwner/clearOwner is now nested
2016-03-23 14:49:34 +13:00
Sam Minnee
aeccb8b8e0
API: Move DBField subclasses into SilverStripe\Model\FieldType namespace
...
API: Deprecate SS_Datetime.
The DBField subclasses are have all been renamed to start with “DB” and
be in the SilverStripe\Model\FieldType namespace. To keep DataObject
definitions concise, the original short variations of their names are
preserved as service definitions. Most of the field generation code
doesn’t need to change, but where field classes are referenced directly,
changes will be needed.
SS_Datetime, which is commonly referenced outside the model system
itself, has been preserved as a subclass of DBDatetime. This has been
marked as deprecated and can be removed in SilverStripe 5.
A few places that referred to $db and $casting values weren’t using
the Injector to instantiate the relevant classes. This meant that the
remapping we have created as part of moving classes into a namespace
didn’t work.
2016-03-22 18:09:30 +13:00
Damian Mooyman
5d3b896297
Merge pull request #5180 from dhensby/pulls/4/npm-update
...
Updating required node version
2016-03-21 10:46:56 +13:00
Ingo Schommer
8ae794ee99
API TinyMCE Image shortcodes
2016-03-21 09:23:40 +13:00
Garion
c59cd1e598
Update Extend_CMS_Interface.md
...
Add missing `private` declaration.
2016-03-20 13:08:23 +13:00
Damian Mooyman
0848aca462
API Massive refactor of Versioned
...
API Implemented recursive versioned actions (publish, etc)
API Un-deprecate delete batch action
API Changed Versioned getters and setters for stages
BUG Inject query parameters during DataObject construction to prevent incorrect lazy loading
2016-03-17 13:43:53 +13:00
Daniel Hensby
ed267d03bd
Updating required node version
2016-03-16 21:54:07 +00:00
Garion
47179fc808
Update Extend_CMS_Interface.md
...
Resurfaces details on actually creating the required handlers for custom buttons in the CMS, which were detailed in a [past version of the docs](https://github.com/silverstripe-droptables/sapphire/blob/side-by-side/docs/en/howto/extend-cms-interface.md#extending-the-cms-actions ).
2016-03-10 01:02:28 +13:00
Robbie Averill
9379914038
Updated 4.0.0 changelog
...
Backtick mania
2016-03-09 09:37:06 +13:00
Cam Findlay
14044fff35
DOCS Added a useful code example around positioning of tabs in CMS.
...
This useful example wasn't in the docs when I needed it. I ended up tracking this information down at http://stackoverflow.com/questions/5033028/silverstripe-how-do-i-insert-a-tab-before-another-tab
It should really be in the docs.
2016-03-08 16:18:49 +13:00
Ingo Schommer
f36b110db3
Merge remote-tracking branch 'origin/3.3'
2016-03-04 17:06:04 +13:00
Ingo Schommer
466ed29f0e
Merge remote-tracking branch 'origin/3.3' into 3
2016-03-04 14:55:08 +13:00
Ingo Schommer
3c53da0890
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-03-04 14:05:06 +13:00
Ingo Schommer
0f08176c6c
Merge pull request #5095 from open-sausages/pulls/4.0/ownership-api
...
API Ownership API Implementation
2016-03-03 17:39:07 +13:00
Daniel Hensby
b8c8875303
DOCS Explicitly noting lack of PHP 7 support
2016-03-01 10:14:14 +00:00
Damian Mooyman
22c0025d47
Improve documentation on documentation
2016-03-01 12:18:11 +13:00
Ingo Schommer
2a3f4daa76
"npm run lock" command
...
Uses https://github.com/uber/npm-shrinkwrap instead of the built-in "npm shrinkwrap" since it works more reliably.
Specifically, "npm install" doesn't fail depending on node_modules/ being installed in the local cache or not.
It also makes npm-shrinkwrap.json easier to diff by more consistently ordering its output between runs.
If you need any convincing that this is a problem, look at the over 400 issues related to "shrinkwrap"
in https://github.com/npm/npm/search?q=shrinkwrap&type=Issues&utf8=%E2%9C%93
2016-02-29 20:50:15 +13:00
Damian Mooyman
7312692a09
Merge branch '3.3' into 3
2016-02-29 17:30:20 +13:00
Damian Mooyman
393a4788bf
Merge branch '3.2' into 3.3
2016-02-29 17:29:41 +13:00
Damian Mooyman
f7d49df258
Merge tag '3.2.3' into 3.2
...
Release 3.2.3
# Conflicts:
# lang/cs.yml
2016-02-29 17:27:00 +13:00
Damian Mooyman
ee6c08a0e4
Merge remote-tracking branch 'origin/3.3' into 3
2016-02-29 17:16:13 +13:00
Damian Mooyman
24a6c53645
Merge branch '3.2' into 3.3
...
# Conflicts:
# admin/code/ModelAdmin.php
# lang/cs.yml
# lang/lt.yml
# lang/sk.yml
2016-02-29 17:03:22 +13:00
Damian Mooyman
4fbf0b0863
Merge remote-tracking branch 'origin/3.3.1' into 3.3
2016-02-29 17:01:26 +13:00
Damian Mooyman
2c1f837442
Merge branch '3.1' into 3.2
...
# Conflicts:
# docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
# docs/en/01_Tutorials/03_Forms.md
# docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
# docs/en/02_Developer_Guides/00_Model/10_Versioning.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
# docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
# docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
# docs/en/02_Developer_Guides/14_Files/01_Image.md
# docs/en/02_Developer_Guides/14_Files/index.md
# lang/cs.yml
# lang/fi.yml
# lang/sk.yml
2016-02-29 16:59:20 +13:00
Damian Mooyman
71bf14d590
Merge remote-tracking branch 'origin/3.1.18' into 3.1
2016-02-29 16:49:25 +13:00
Damian Mooyman
fb58233201
Added 3.3.1 changelog
2016-02-29 15:23:25 +13:00
Damian Mooyman
9050761f17
Added 3.2.3 changelog
2016-02-29 15:22:39 +13:00
Damian Mooyman
2147205dc1
Added 3.1.18 changelog
2016-02-29 15:10:05 +13:00
Damian Mooyman
b196d33bfa
API Ownership API
...
API Filter Relation. query parameters from relations when creating objects
API Versioned::publish now triggers invokeWithExtensions
API Update behaviour of versioned for all_versions mode to respect ID filters
API Tweak behaviour of inherited query parameters
2016-02-29 14:38:44 +13:00
Damian Mooyman
2b26511faa
Merge branch '3.3' into 3
2016-02-27 21:20:15 +13:00
Damian Mooyman
8a8d82cc57
Merge branch '3.3.1' into 3.3
...
# Conflicts:
# lang/cs.yml
2016-02-27 21:19:29 +13:00
Damian Mooyman
14aa497b80
Merge branch '3.2.3' into 3.2
2016-02-27 21:11:57 +13:00
Damian Mooyman
807377ad2d
Added 3.3.1-rc2 changelog
2016-02-27 21:02:09 +13:00
Damian Mooyman
3d2c87029c
Added 3.3.1-rc2 changelog
2016-02-27 21:01:57 +13:00
Damian Mooyman
3c053bb85d
Added 3.2.3-rc2 changelog
2016-02-27 21:00:59 +13:00
Damian Mooyman
3f5c635353
Added 3.2.3-rc2 changelog
2016-02-27 21:00:46 +13:00
Damian Mooyman
cd05068814
Merge branch '3.1.18' into 3.1
2016-02-27 20:59:51 +13:00
Damian Mooyman
b77acaeeb7
Added 3.1.18-rc2 changelog
2016-02-27 20:53:23 +13:00
Damian Mooyman
9d9a6fc0e8
Added 3.1.18-rc2 changelog
2016-02-27 20:53:15 +13:00
Damian Mooyman
d27be2b325
Merge branch '3.3' into 3
...
# Conflicts:
# javascript/GridField.js
2016-02-26 17:45:06 +13:00
Damian Mooyman
a2c7524b85
Merge branch '3.1.18' into 3.1
2016-02-26 17:39:06 +13:00
Damian Mooyman
73780ce94e
Merge branch '3.2.3' into 3.2
2016-02-26 17:36:45 +13:00
Damian Mooyman
ae29576763
Merge branch '3.3.1' into 3.3
2016-02-26 17:35:42 +13:00
Damian Mooyman
a80c6e1e8c
Added 3.3.1-rc1 changelog
2016-02-26 17:30:07 +13:00
Damian Mooyman
8c12b6f992
Added 3.2.3-rc1 changelog
2016-02-26 17:25:00 +13:00
Damian Mooyman
9e0037d43e
Added 3.1.18-rc1 changelog
2016-02-26 17:13:49 +13:00
Damian Mooyman
c275c21057
API Extensible::invokeWithExtension has same method signature as Extensible::extend
2016-02-25 17:32:41 +13:00
Damian Mooyman
3b0a9f4ba2
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# admin/javascript/LeftAndMain.Menu.js
# control/HTTPRequest.php
# css/GridField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/01_File_Management.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# filesystem/Upload.php
# javascript/HtmlEditorField.js
# model/Image.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/Enum.php
# model/versioning/Versioned.php
# scss/GridField.scss
2016-02-25 14:51:59 +13:00
Daniel Hensby
2fdc96a0de
Update PHPUnit from 3.7 to 4.8
2016-02-24 21:42:20 +13:00
Damian Mooyman
9fed5561f4
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# core/Constants.php
# dev/DevelopmentAdmin.php
2016-02-24 17:39:04 +13:00
Damian Mooyman
5f2d3f31d7
Merge remote-tracking branch 'origin/3.2' into 3.3
...
# Conflicts:
# dev/DevelopmentAdmin.php
# docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
# lang/cs.yml
# lang/lt.yml
2016-02-24 17:29:06 +13:00
Damian Mooyman
ff5ed6efeb
Merge remote-tracking branch 'origin/3.2.2' into 3.2
2016-02-24 17:03:43 +13:00
Damian Mooyman
06d5050321
Merge remote-tracking branch 'origin/3.1.17' into 3.1
2016-02-24 16:54:18 +13:00
Damian Mooyman
0ec021dac8
Added 3.3.0 changelog
2016-02-24 16:30:34 +13:00
Damian Mooyman
531b8b167b
Added 3.2.2 changelog
2016-02-24 15:33:02 +13:00
Damian Mooyman
1fe7d029db
Added 3.1.17 changelog
2016-02-24 15:31:12 +13:00
Damian Mooyman
9a4f0b48df
Added 3.1.17-rc2 changelog
2016-02-24 12:38:54 +13:00
Damian Mooyman
6cd66a6b13
Added 3.2.2-rc2 changelog
2016-02-24 12:01:41 +13:00
