tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-08 20:39:26 +02:00
Code Issues Projects Releases Wiki Activity
16,059 Commits 29 Branches 517 Tags 147 MiB
179996b5f9
Commit Graph

1771 Commits

Author SHA1 Message Date
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
Daniel Hensby
a6bd22ab2f
[SS-2016-006] FIX dont disable XSS for login forms 2016-04-20 23:57:59 +01:00
Sam Minnee
82a89a94f4 Add 2 new committers, remove 1 who has left. 2016-04-19 23:05:59 +12:00
Michael Strong
1f820b0b1c DOCS allowed_actions access control (#5333) 2016-04-18 17:49:30 +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
Damian Mooyman
b8e7f9a934 Standardise spelling of "customise" 
Fixes #3988
 2016-03-30 13:17:28 +13:00
Garion
c59cd1e598 Update Extend_CMS_Interface.md 
Add missing `private` declaration.
 2016-03-20 13:08:23 +13: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
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
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
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
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
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
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
Ingo Schommer
37059eb6b3 [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-24 11:47:16 +13:00
Ingo Schommer
faa94d51d5 [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-24 11:33:54 +13:00
Damian Mooyman
94cec68c7e Merge pull request #5065 from SpiritLevel/typo 
typo in api link
 2016-02-22 09:14:51 +13:00
David Alexander
23c6b25c6c typo in api link 2016-02-18 23:11:31 -07:00
Damian Mooyman
f1f662fd49 Merge pull request #5050 from SpiritLevel/3.2 
DOCS 3.2 : fixing api: links now that api: tag parser working
 2016-02-19 14:28:20 +13:00
Damian Mooyman
4ba2eb6244 Merge pull request #5053 from robbieaverill/patch-1 
Typo fixes
 2016-02-19 14:27:07 +13:00
Damian Mooyman
73ee4e5458 Merge pull request #5049 from SpiritLevel/3.1 
DOCS 3.1 : fixing api: links
 2016-02-19 14:18:37 +13:00
Damian Mooyman
af28b0a414 Added 3.2.2-rc1 changelog 2016-02-19 11:22:10 +13:00
Damian Mooyman
f32302522c Added 3.1.17-rc1 changelog 2016-02-19 10:30:25 +13:00
Damian Mooyman
97089db8a6 Added 3.3.0-rc3 changelog 2016-02-18 17:29:18 +13:00
Ingo Schommer
893e49703d [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-18 17:28:54 +13:00
David Alexander
903379bde2 DOCS 3.2 : fixing api: links now that api: tag parser working 
fixed a couple of external links

fixed a docs link
 2016-02-17 18:02:38 -07:00
Robbie Averill
0811e87ecc Typo fixes 
* Fixed typo in `$dependencies`
* Updated "simplest example usage of the `Injector`" to specify the correct class name
 2016-02-18 13:53:36 +13:00
David Alexander
febbd35b51 DOCS 3.1 : fixing api: links 
missed one
 2016-02-17 03:00:22 -07:00
Richard Rudy
87718597e8 FIX "where" method in SQLUpdate Example 
Method should be addWhere
 2016-02-15 02:27:04 -05:00
Patrick Nelson
35ce802ff6 Update 01_Caching.md 
`'failure_callback' => ''` fails but providing `'failure_callback' => null` seems to work fine (since it expects a closure but gets a string, I think).
 2016-02-10 12:59:58 -05:00
Damian Mooyman
d5b4c90cb4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_fonts.scss
#	admin/scss/_retina.scss
 2016-02-09 18:25:47 +13:00
Damian Mooyman
96a905aa09 Update changelog 2016-02-09 18:07:11 +13:00
Damian Mooyman
f66e21c10d Added 3.3.0-rc2 changelog 2016-02-09 18:02:22 +13:00
DouG
87a674a460 Correct minor typo 
had the word "fun" rather than "run"
 2016-02-01 16:25:17 +13:00
Damian Mooyman
e091bb8474 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	tests/model/VersionedTest.yml
 2016-01-25 15:57:37 +13:00
Damian Mooyman
b4e76df531 Add upgrading notes to rc1 2016-01-25 15:35:42 +13:00
Myles Beardsmore
b0057c77f0 Removed PlayerCsvBulkLoader as importer 
Removed PlayerCsvBulkLoader as model importer class and replaced it with CsvBulkLoader instead.
 2016-01-25 15:26:25 +13:00
Damian Mooyman
5f511e5048 Added 3.3.0-rc1 changelog 2016-01-25 15:22:58 +13:00
Damian Mooyman
7c448bb4a2 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	tests/model/DataObjectLazyLoadingTest.php
#	tests/model/VersionedTest.yml
 2016-01-25 14:11:37 +13:00
Daniel Hensby
f131b0d91e Merge pull request #4961 from silverstripe/tractorcow-patch-1 
DOCS Update branch names
 2016-01-22 18:20:15 +00:00
Damian Mooyman
bf8bf5e4d5 BUG Prevent Versioned::doRollbackTo from creating incorrect versions on subclasses of Versioned DataObjects 
Document correct configuration of Versioned DataObjects
Fixes #4936
 2016-01-22 15:35:58 +13:00
Damian Mooyman
cca7129385 BUG Revert lost documentation 
Resolves some regressions from #3735
 2016-01-22 11:45:00 +13:00
Damian Mooyman
45c6d0284a Minor: Update branch names 2016-01-21 14:02:42 +13:00
Damian Mooyman
8c1cafd1a0 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	admin/scss/_tree.scss
#	javascript/TreeDropdownField.js
 2016-01-19 17:08:26 +13:00
Meeeeeeow
e448774150 Fixed Typo 
Changed 'Gudes' to 'Guides'
 2016-01-19 16:18:35 +13:00
Damian Mooyman
5d240feaec Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:24 +13:00
Damian Mooyman
46cbe809ac Merge remote-tracking branch 'origin/3.1' into 3.2 
# Conflicts:
#	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/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
#	docs/en/03_Upgrading/index.md
#	docs/en/05_Contributing/01_Code.md
#	forms/TreeMultiselectField.php
#	security/Permission.php
 2016-01-19 14:00:19 +13:00
David Alexander
45d2b57a65 DOCS 3.1 : typose and broken internal links 2016-01-15 16:39:23 +13:00
David Alexander
5c99e33eb2 DOCS 3.1 - fixes broken internal links 2016-01-14 23:59:53 +13:00
Christopher Joe
007e0eeb2f DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox 2016-01-13 12:12:21 +13:00
Damian Mooyman
0b3b7ba134 Merge pull request #4888 from sminnee/remove-trailing-whitespace 
MINOR: Remove trailing whitespace
 2016-01-12 10:18:09 +13:00
Christopher Joe
0ac0e5a7d2 Added tutorial for installing silverstripe with Vagrant and Virtualbox 2016-01-08 15:54:05 +13:00
Sam Minnee
4aa50534d5 FIX: Fixes needed to adapt to whitespace changes. 
API: Whitespace trimmed from custom form field templates

The introduction of trailing newlines on all template files introduced
some changes that needed to be made.

Notably, whitespace has been trimmed from rendered form field templates.
This is the minimal impact to SilverStripe developers, as it preserves
the behaviour of the default field types, but I’ve still noted as a
change.
 2016-01-07 14:17:57 +13:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:15:54 +13:00
Damian Mooyman
3c55608075 Merge pull request #4892 from camfindlay/patch-37 
DOCS FIX typo for i18n
 2016-01-06 15:18:51 +13:00
Damian Mooyman
e59595bb23 Merge pull request #4879 from gordonbanderson/patch-1 
Documentation : Using SQLite for Testing
 2016-01-06 13:49:03 +13:00
Peter Thaleikis
4366000a9f fixing examples 
PSR-2 style for examples
 2016-01-06 12:28:26 +13:00
Cam Findlay
7b77380df5 DOCS FIX typo for i18n 
Was causing a number of 404 crawl errors.
 2016-01-06 09:11:23 +13:00
Ingo Schommer
70897834c9 Corrected release docs merge pipeline 2016-01-05 14:08:49 +13:00
Ingo Schommer
90837d4aa2 Release docs: Mention IRC, Behat and milestones 2016-01-05 11:27:46 +13:00
Ingo Schommer
ce1a069885 Clarify RC wording in release docs 
An RC is technically only one of a few "pre-release" labels (alpha, beta, rc)
 2016-01-05 11:27:45 +13:00
Ingo Schommer
7c3fd7de13 Note required commands in release docs 2016-01-05 11:27:45 +13:00
Gordon Anderson
f61cedc03c Update to 00_Unit_Testing 
Additional section with instructions on running tests using in memory SQLite,
 2015-12-30 13:29:32 +07:00
Christopher Darling
ef4a75ad43 DOCS: fixed 3.2.0 changelog DataList code sample 2015-12-23 13:13:32 +00:00
Damian Mooyman
0dfa8ca7b2 Improve release process instructions 2015-12-23 16:45:34 +13:00
Damian Mooyman
5507ce89c6 Copy upgrade notes from 3.3.0.md 2015-12-23 14:12:02 +13:00
Damian Mooyman
70bb3d92c7 Added 3.3.0-beta1 changelog 2015-12-23 13:38:55 +13:00
Damian Mooyman
d63441623a Merge pull request #4612 from johndalangin/patch-4 
Added cookie_secure configuration directive
 2015-12-22 16:36:05 +13:00
Damian Mooyman
48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3 
# Conflicts:
#	admin/javascript/LeftAndMain.BatchActions.js
#	css/UploadField.css
#	forms/HtmlEditorField.php
 2015-12-22 14:07:52 +13:00
Damian Mooyman
55e1b66285 Merge pull request #4859 from chillu/pulls/noteworthy-contrib-docs 
Note about changelog additions in contrib guide
 2015-12-21 14:33:57 +13:00
Ingo Schommer
b97b604a05 Merge pull request #4837 from tractorcow/pulls/3.2/release-docs 
Documentation on the release process
 2015-12-21 11:55:19 +13:00
Ingo Schommer
e114548a48 Note about changelog additions in contrib guide 2015-12-21 11:52:08 +13:00
Ivo Bathke
f77bac3ab0 Update 02_Composer.md 
gdmedia/ss-auto-git-ignore as dev requirement
 2015-12-17 11:57:46 +01:00
Damian Mooyman
22d8105a56 Add changelog for 3.3.0 2015-12-10 17:48:06 +13:00
Hamish Friedlander
1eda9151a4 Merge pull request #4831 from open-sausages/pulls/3/fix-versioned-canview 
API Create default security permission model for versioned data objects
 2015-12-09 14:17:27 +13:00
Damian Mooyman
6089a7c5bd API Create default security permission model for versioned data objects 2015-12-09 11:33:53 +13:00
Damian Mooyman
903d4838bb Documentation on the release process 2015-12-04 15:09:58 +13:00
Peter Thaleikis
7db7140a70 fixing example 2015-12-04 11:14:02 +13:00
Marcus Nyeholt
f7c270a3ba NEW Use Config for determining Vary header 
Existing implementation hardcodes the Vary header; swap to using Config layer
instead

Added test for changing the variable from config
 2015-12-02 10:28:24 +11:00
muskie9
fc3b06dbf9 DOCS update LinkingModes description 2015-11-23 14:10:47 -06:00
Daniel Hensby
572945a2fd Merge pull request #4704 from spekulatius/patch-1 
fixing syntax error
 2015-11-23 14:18:50 +00:00
Damian Mooyman
624e3fde6a Merge pull request #4708 from muskie9/patch-7 
DOCS update framework and cms milestone links
 2015-11-20 12:43:11 +13:00
Damian Mooyman
84667e5aa6 Merge pull request #4693 from camfindlay/patch-33 
DOCS Upgrading information about 3.2.0 and the additional modules req…
 2015-11-20 11:13:36 +13:00
Nic
2e5c56f1d0 DOCS update framework and cms milestone links 2015-11-19 11:34:01 -06:00
Cam Findlay
9672cd3994 DOCS SilverStripe core RFC process, template and archive links to past RFCs. 2015-11-19 16:05:49 +13:00
Damian Mooyman
43e4eb129a Merge pull request #4771 from camfindlay/patch-36 
DOCS Update conflict resolution help in code of conduct
 2015-11-17 10:04:40 +13:00
Damian Mooyman
302c741b07 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	control/HTTP.php
	forms/Form.php
	tests/view/SSViewerTest.php
 2015-11-16 16:50:40 +13:00
Damian Mooyman
0178fa5a18 Added 3.2.1 changelog 2015-11-16 16:17:10 +13:00
Damian Mooyman
2e6469956f Add 3.1.16-rc1 changelog 2015-11-16 15:20:30 +13:00
Damian Mooyman
615b2d5563 Added 3.1.16 changelog 2015-11-16 15:16:49 +13:00
Cam Findlay
e5e4a55fe0 DOCS Update conflict resolution help in code of conduct 
Original link was 404.
 2015-11-14 09:42:12 +13:00
Damian Mooyman
c19420f545 Add 3.2.1-rc2 changelog 2015-11-13 15:32:09 +13:00
Damian Mooyman
49acc0d468 Added 3.2.1-rc2 changelog 2015-11-13 15:27:08 +13:00
Hamish Friedlander
b61d6dcd57 [ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs 2015-11-13 15:20:09 +13:00
Damian Mooyman
245e0aae2f [ss-2015-026]: BUG Fix FormField error messages not being encoded safely 2015-11-11 17:50:02 +13:00
Damian Mooyman
1c1c0a23bd Added 3.2.1-rc1 changelog 2015-11-11 17:10:41 +13:00
Damian Mooyman
bc1b2893ac [ss-2015-026]: BUG Fix FormField error messages not being encoded safely 2015-11-11 16:56:19 +13:00
Daniel Hensby
583cbdd77f Merge pull request #4756 from camfindlay/patch-34 
DOCS Suggest a tool to help people generate their change logs for mod…
 2015-11-10 07:50:11 +00:00
Cam Findlay
218049f5c0 DOCS Suggesting a convention for CMS user documentation so CMS users don't get lost in dev docs. 2015-11-10 11:59:38 +13:00
Cam Findlay
c7b2f88d4e DOCS Suggest a tool to help people generate their change logs for modules. 2015-11-10 11:50:53 +13:00
Damian Mooyman
c4dc10b255 Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	forms/DropdownField.php
	tests/model/ImageTest.php
 2015-11-03 13:06:39 +13:00
Damian Mooyman
e07f80014c Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	lang/cs.yml
	lang/sk.yml
 2015-11-03 11:10:46 +13:00
Ed Linklater
cacbbd75bc DOCS: jQuery delegation in Admin interface 2015-11-01 05:46:13 +13:00
Damian Kissick
0197b46001 Update 01_Code.md 
Corrected 'submiting' spelling
 2015-10-28 21:28:45 +13:00
Michael Parkhill
e44f22c6b2 Fix broken link to DataObject api 2015-10-28 11:52:35 +13:00
Christopher Darling
a1e343629b DOCS: correct config setting for custom editor.css 
see a964e7636e/admin/code/LeftAndMain.php (L287-L308)
 2015-10-26 11:02:47 +00:00
Peter Thaleikis
791c52c6bd fixing syntax error 2015-10-25 22:41:13 +13:00
David Alexander
e88032a7aa DOCS : spelling 2015-10-23 13:49:03 +13:00
Cam Findlay
0fa8335bc0 DOCS Upgrading information about 3.2.0 and the additional modules required (reports & siteconfig) 
Based on a community question about upgrading their site manually, they followed the instructions but were not aware of the additional modules now required.
 2015-10-22 09:13:57 +13:00
Cam Findlay
a555817d6f DOCS Module standard 1.0 
Adding the module standard to 3.2+ docs.
 2015-10-19 11:44:31 +13:00
Damian Mooyman
cc4d92e91a Merge remote-tracking branch 'origin/3.2.0' into 3.2 2015-10-12 09:18:01 +13:00
Damian Mooyman
0092792568 Added 3.2.0 changelog 2015-10-12 08:44:34 +13:00
Damian Mooyman
a679680c0d Update changelogs to include PDO upgrade instructions 2015-10-07 16:11:42 +13:00