Commit Graph

14578 Commits

Author SHA1 Message Date
Damian Mooyman
a569bc9825 Update translations 2015-06-15 10:47:30 +12:00
Daniel Hensby
5c8925f92e Merge pull request #4256 from tractorcow/pulls/3/fix-manymany-falsey-values
BUG Fix false values for many_many_ExtraFields not being saved
2015-06-14 23:32:02 +01:00
Ingo Schommer
d3e1b58364 Merge pull request #4277 from dhensby/travis-fix
Make travis more resilient to composer self-update
2015-06-15 09:59:03 +12:00
Damian Mooyman
1a10add909 Merge pull request #4229 from jonom/max-image-methods
Max image methods & Force resampling changes
2015-06-15 09:19:28 +12:00
Daniel Hensby
f52ac775f5 Merge pull request #4280 from SpiritLevel/patch-2
Update 03_Documentation.md
2015-06-14 19:22:52 +01:00
Daniel Hensby
2b9ccda06b Fixing doc block issues 2015-06-14 12:49:37 +01:00
David Alexander
e54b7fe404 Update 03_Documentation.md
Addressed dhensby's comments :)
2015-06-14 08:29:50 +12:00
David Alexander
ee4fe7c10c Update 03_Documentation.md
Minor typos & rewording.

Clearer example needed on line 104.
2015-06-13 21:34:32 +12:00
Will Rossiter
7933617a25 Merge pull request #4278 from SpiritLevel/patch-1
Update index.md
2015-06-13 12:18:31 +12:00
Jeremy Shipman
e766658ee3 API: Allow HTTP Cache Headers to be customized 2015-06-13 12:16:56 +12:00
Jonathon Menz
838926085c API New and renamed image functions
Renamed image functions with more expressive names. Added CropWidth & CropHeight functions. Added no-upsampling capabilities. Cleaned up Image docs. Closes #4211
2015-06-12 17:02:55 -07:00
Jonathon Menz
24a268a12b FIX Image test cleanup
Ensured files referenced by name in tests are actually used, and fixed added support for Flushable interface in image regeneration. Also ensured getters methods are used for width and height.
2015-06-12 16:43:13 -07:00
David Alexander
52a248534a Update index.md
Minor typo.
2015-06-13 11:08:25 +12:00
Daniel Hensby
65fce1cb07 Merge pull request #4261 from tractorcow/pulls/3/fix-orphaned-delete
BUG Fix deletion of orphaned versioned records when a parent _versions has been deleted
2015-06-12 20:55:37 +01:00
Daniel Hensby
96c14bd7bf Make travis more resilient to composer self-update
`composer self-update` has been failing regularly on travis recently.

As `composer` is already installed and it's not strictly essential to have the very latest version, this change allows the build to continue, even if composer can't self-update
2015-06-12 19:41:24 +01:00
Damian Mooyman
f2edf34297 Merge pull request #4274 from stojg/form-docblock
Update and fix PHP docblocks, document spelling mistakes and strip trailing whitespace on Form.php
2015-06-12 15:24:41 +12:00
Damian Mooyman
9a278b7613 Merge branch 'pr/4275' into 3.1 2015-06-12 14:16:10 +12:00
Matthew Hailwood
d673fdf497 Float labels with ss-ui-button class in accordion
Currently things like the upload field etc break when you use them inside a ToggleCompositeField:

![Broken](http://i.imgur.com/abUopVf.png)

This fixes it by adding the float back

![Fixed](http://i.imgur.com/7P0muen.png)
2015-06-12 14:13:47 +12:00
Damian Mooyman
f6fc1e8977 Merge pull request #4126 from assertchris/clean-up-header-field
Clean up HeaderField
2015-06-12 13:48:38 +12:00
Matthew Hailwood
1b93db019c Add 0 Based Position tip. 2015-06-12 13:38:09 +12:00
Damian Mooyman
b692514523 Merge pull request #4118 from assertchris/clean-up-literal-field
Clean up LiteralField
2015-06-12 13:15:32 +12:00
Damian Mooyman
57e39cec7b Merge pull request #4117 from assertchris/clean-up-email-field
Clean up EmailField
2015-06-12 13:11:57 +12:00
Damian Mooyman
52fca99acf Merge pull request #4116 from assertchris/clean-up-textarea-field
Clean up TextareaField
2015-06-12 13:10:37 +12:00
Damian Mooyman
07c166f7af Merge pull request #4115 from assertchris/clean-up-toggle-composite-field
Clean Up ToggleCompositeField
2015-06-12 13:09:44 +12:00
Damian Mooyman
880d167673 Merge pull request #4111 from assertchris/clean-up-password-field
Clean up PasswordField
2015-06-12 12:56:54 +12:00
Daniel Hensby
ad04eeb5c4 Merge pull request #4259 from tractorcow/pulls/3/multi-htmleditor-config
API Support for multiple HTMLEditorConfig per page
2015-06-12 00:53:44 +01:00
Daniel Hensby
282b9d419c Merge pull request #4265 from nfauchelle/patch-3
Fix the order of params
2015-06-12 00:12:31 +01:00
Stig Lindqvist
95860e9229 Update and fix PHP docblocks, document spelling mistakes and strip trailing whitespace on Form.php 2015-06-12 10:28:32 +12:00
Daniel Hensby
f21427d7fa DOCS Explaining test suite nesting 2015-06-11 16:56:57 +01:00
Loz Calver
28be51cab0 FIX: Config state leaking between unit tests 2015-06-11 16:37:26 +01:00
Daniel Hensby
3ee5b24898 Nest and unnest Config and Controller for each test and test suite 2015-06-11 16:37:25 +01:00
Daniel Hensby
6be0488731 FIX TreeDropdownField doesnt change label on unselect 2015-06-11 16:14:08 +01:00
Will Rossiter
38ca214e2b Merge pull request #4266 from mediabeastnz/patch-2
Completed missing comment ending
2015-06-10 17:41:23 +12:00
Myles Beardsmore
67e1cee64a Completed missing comment ending
Completed missing comment ending
2015-06-10 16:56:31 +12:00
Nick
168955135b Fix the order of params
The parameters for the strpos and substr functions were wrong. strpos always failed so never triggered the substr.

This would mean $fieldClass would be left with 'Varchar(255)'

Fixing this had no speed or memory effect.
2015-06-10 13:49:52 +12:00
Damian Mooyman
c877882f7e Merge pull request #4170 from kinglozzer/pulls/4137-leftandmain-tree
Store current page before marking tree nodes (fixes #4137, fixes silverstripe/silverstripe-cms#1135)
2015-06-10 09:18:05 +12:00
Daniel Hensby
c062670ba3 Removing unreachable test line 2015-06-09 16:01:33 +01:00
Loz Calver
c9d410d49e Merge pull request #4262 from SpiritLevel/patch-1
Update 03_Environment_Management.md
2015-06-09 09:27:43 +01:00
Will Rossiter
29906f1599 Merge pull request #4199 from mthomsonnz/patch-2
DOCS: Add links to lessons 10-16 to the tutorials page
2015-06-09 17:19:41 +12:00
David Alexander
5a323f7fe3 Update 03_Environment_Management.md 2015-06-09 16:53:20 +12:00
Damian Mooyman
07c21e2880 BUG Fix deletion of orphaned versioned records when a parent _versions table has been deleted 2015-06-09 13:50:09 +12:00
Damian Mooyman
69e736a02c Merge pull request #4260 from scott1702/spinner
Tidy up loading gif
2015-06-09 13:45:13 +12:00
scott1702
f0bc073848 Tidy up loading gif 2015-06-09 13:41:21 +12:00
Damian Mooyman
b42ddd107c Merge pull request #3499 from colymba/ie-multi-file-upload-fix
FIX #3458 iframe transport multi file upload FIX #3343, FIX #3148
2015-06-09 13:22:10 +12:00
Damian Mooyman
54f4ef0e9f Merge pull request #4249 from scott1702/tinymce-linkform-uploadfield
Update #2908 for 3.2
2015-06-09 12:38:46 +12:00
Damian Mooyman
a8ace75341 API Support for multiple HTMLEditorConfig per page 2015-06-09 12:17:55 +12:00
Damian Mooyman
acf19b72e2 BUG Fix false values for many_many_ExtraFields not being saved
Fixes #4067
2015-06-09 12:05:25 +12:00
Damian Mooyman
f21e59585e Merge remote-tracking branch 'origin/3.1' into 3 2015-06-09 11:02:50 +12:00
Sam Minnée
2fa6f27073 Removed Mateusz from core committer list.
Mateusz has decided to step down from the core committers group.
2015-06-08 22:28:29 +12:00
Stewart Wilson
9421374f91 check to ensure $values is not null or empty before exploding. Otherwise, return an empty array 2015-06-05 21:21:37 +10:00