Ingo Schommer
b95fdc7ba0
Merge pull request #4286 from tractorcow/pulls/3.2/fix-public-validate
...
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-17 15:36:03 +12:00
Damian Mooyman
ce3b5a5ace
BUG Fix major segfault on PDOConnector after any DDL
...
BUG Fix issue in PDOQuery::first()
Refactor previewWrite and benchmarkQuery into SS_Database
2015-06-17 13:34:21 +12:00
Damian Mooyman
d0bd5bc225
Merge pull request #4292 from scott1702/drag-drop
...
Shorten space between page icons and child page dropdown arrow
2015-06-17 12:33:45 +12:00
Damian Mooyman
0abacaead6
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/LeftAndMain.php
forms/EmailField.php
forms/Form.php
forms/HeaderField.php
forms/LiteralField.php
forms/PasswordField.php
forms/TextareaField.php
forms/TreeDropdownField.php
model/DataObject.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
scott1702
d36d0f348f
Shorten space between page icons and child page dropdown arrow
2015-06-17 10:23:07 +12:00
Damian Mooyman
a35f7e6e5f
Merge pull request #4290 from dhensby/pulls/component-cache
...
FIX No longer caching has_one after ID change
2015-06-17 08:29:48 +12:00
Daniel Hensby
6169bf2760
FIX No longer caching has_one after ID change
2015-06-16 17:38:34 +01:00
Ingo Schommer
5a0f3c0c5e
Merge pull request #4287 from tractorcow/pulls/3.2/document-recoverable-error
...
Document E_RECOVERABLE_ERROR
2015-06-16 21:01:54 +12:00
Damian Mooyman
46479e969f
Document E_RECOVERABLE_ERROR
2015-06-16 12:29:29 +12:00
Damian Mooyman
58cc3da8d8
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-16 11:59:21 +12:00
Daniel Hensby
d3d28c8632
Merge pull request #4270 from tractorcow/pulls/3/cleanup-changelog
...
Cleanup 3.2 changelog for release
2015-06-16 00:55:16 +01:00
Will Morgan
27f272d660
Merge pull request #4282 from SpiritLevel/patch-4
...
Update index.md
2015-06-15 17:51:11 +01:00
Damian Mooyman
4d37e21bc6
Cleanup 3.2 changelog for release
2015-06-15 16:19:08 +12:00
David Alexander
57071869f1
Update index.md
...
url syntax fix for lesson 2
added lesson 17
2015-06-15 14:46:07 +12:00
Ingo Schommer
d4de0f0eac
Merge pull request #4281 from dhensby/pulls/form-docs
...
Fixing doc block issues
2015-06-15 12:09:43 +12:00
Damian Mooyman
6facb1bf5d
Merge pull request #4272 from dhensby/pulls/tree-dropdown-fix
...
FIX TreeDropdownField doesnt change label on unselect
2015-06-15 11:36:45 +12:00
Damian Mooyman
78a3f703f2
Merge pull request #4178 from dhensby/pulls/cookie-name-normalisation
...
NEW Cookie names with dots are now handled more gracefully
2015-06-15 11:35:39 +12:00
Daniel Hensby
eaec2ad9a8
Safe unnesting of Config and Injector
2015-06-15 00:23:40 +01:00
Damian Mooyman
5a1e53818d
Update lithuanian translations
2015-06-15 10:59:49 +12:00
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