Damian Mooyman
|
e32b06846b
|
Revert "GridFieldDeleteAction missing button text without icons"
This reverts commit 265a34141e.
|
2015-06-19 17:43:05 +12:00 |
|
Hamish Friedlander
|
4e8aa72702
|
Merge pull request #4310 from tractorcow/pulls/3.2/deprecations
Set deprecation level for all changes in 3.x to 4.0
|
2015-06-19 15:58:27 +12:00 |
|
Damian Mooyman
|
d9c7d4538b
|
Update user help link for 3.2
|
2015-06-19 15:56:12 +12:00 |
|
Damian Mooyman
|
e14f743bf0
|
Set deprecation level for all changes in 3.x to 4.0
|
2015-06-19 13:07:41 +12:00 |
|
Damian Mooyman
|
1d122803cc
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
dev/SapphireTest.php
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
forms/DatetimeField.php
forms/NullableField.php
forms/NumericField.php
forms/gridfield/GridField.php
tests/control/DirectorTest.php
tests/model/DataObjectSchemaGenerationTest.php
tests/model/MySQLDatabaseTest.php
|
2015-06-19 10:48:07 +12:00 |
|
Daniel Hensby
|
aa3871d716
|
Merge pull request #4306 from gregsmirnov/pulls/3.1/fixed-datetimefield-setname-issue-4305
Issue #4305: fixed DatetimeField::setName()
|
2015-06-18 22:10:13 +01:00 |
|
Daniel Hensby
|
20ebd88fb8
|
Merge pull request #4307 from gregsmirnov/pulls/3.1/test-timefield-value-at-12am-issue-1713
Test TimeField value at 12:00 am
|
2015-06-18 22:06:16 +01:00 |
|
Gregory Smirnov
|
5b22e3afc5
|
Test TimeField value at 12:00 am
|
2015-06-18 18:53:44 +02:00 |
|
Gregory Smirnov
|
66b1dd9154
|
Issue 4305: fixed DatetimeField::setName()
|
2015-06-18 18:36:02 +02:00 |
|
Daniel Hensby
|
4dec821f63
|
Merge pull request #4297 from SpiritLevel/patch-2
DOCS Update 03_Documentation.md
|
2015-06-18 12:00:49 +01:00 |
|
Daniel Hensby
|
8e96ea3f0f
|
Merge pull request #4302 from SpiritLevel/patch-6
Update index.md
|
2015-06-18 11:41:30 +01:00 |
|
Daniel Hensby
|
d3bcefba3f
|
Merge pull request #4304 from SpiritLevel/patch-5
Update 00_Issues_and_Bugs.md
|
2015-06-18 11:38:34 +01:00 |
|
David Alexander
|
a4ec9b5d4f
|
Update 00_Issues_and_Bugs.md
Corrected Documentation mailing list link.
|
2015-06-18 20:04:07 +12:00 |
|
David Alexander
|
0b7f24537f
|
Update index.md
Rewording.
|
2015-06-18 19:40:04 +12:00 |
|
Daniel Hensby
|
61b6776c99
|
Merge pull request #4298 from SpiritLevel/patch-4
Update 05_Translation_Process.md
|
2015-06-18 08:22:01 +01:00 |
|
David Alexander
|
dfc1c8df34
|
Update 05_Translation_Process.md
Typos.
|
2015-06-18 17:50:29 +12:00 |
|
David Alexander
|
08d8865704
|
Update 03_Documentation.md
Typos.
|
2015-06-18 17:42:55 +12:00 |
|
Damian Mooyman
|
21e891e28c
|
Merge pull request #4200 from cwchong/3.1
Bug fix: File->setName()
|
2015-06-18 16:37:56 +12:00 |
|
Damian Mooyman
|
070ae2555b
|
Remove redundant alias
|
2015-06-18 11:43:09 +12:00 |
|
Damian Mooyman
|
5d9fa3d7fe
|
Merge pull request #4253 from swilsonalfa/fixcheckbox
Issue with empty CheckboxSetField value
|
2015-06-18 11:05:36 +12:00 |
|
Damian Mooyman
|
83c4ffda52
|
Merge pull request #4276 from hailwood/patch-2
Add 0 Based Position tip.
|
2015-06-18 11:04:11 +12:00 |
|
Damian Mooyman
|
9852676696
|
Merge pull request #4180 from assertchris/clean-up-grid-field
Clean up GridField
|
2015-06-18 10:47:36 +12:00 |
|
Damian Mooyman
|
438ee49cda
|
Merge pull request #4114 from assertchris/clean-up-nullable-field
Clean up NullableField
|
2015-06-18 10:28:57 +12:00 |
|
Damian Mooyman
|
a4aa0646f8
|
Merge pull request #4113 from assertchris/clean-up-numeric-field
Clean up NumericField
|
2015-06-18 10:25:54 +12:00 |
|
Sam Minnée
|
32eba39cef
|
Merge pull request #4288 from tractorcow/pulls/3.2/fix-pdoconnector
BUG Fix major segfault on PDOConnector after any DDL / Issue in PDOQuery::first()
|
2015-06-17 17:40:50 +01:00 |
|
Daniel Hensby
|
4d855401bc
|
Merge pull request #4293 from scott1702/quick-fixes
Update styles for multi-selection button
|
2015-06-17 16:20:56 +01:00 |
|
Christopher Pitt
|
4ddc2d231c
|
Clean up GridField
|
2015-06-18 00:51:20 +12:00 |
|
Christopher Pitt
|
efcd64a314
|
Clean up NullableField
|
2015-06-18 00:44:04 +12:00 |
|
Christopher Pitt
|
47ae8ac7e9
|
Clean up NumericField
|
2015-06-18 00:42:24 +12:00 |
|
scott1702
|
6cc1c4580c
|
Update styles for multi-selection button
|
2015-06-17 22:22:59 +12:00 |
|
Hamish Friedlander
|
e21a764439
|
Merge pull request #4283 from tractorcow/pulls/3.2/semver-naughties
API make SQLQuery strict semver for 3.2
|
2015-06-17 20:30:50 +12:00 |
|
Damian Mooyman
|
7597b888c3
|
Make SQLQuery strict semver for 3.2
|
2015-06-17 16:54:17 +12:00 |
|
Damian Mooyman
|
0653ba9630
|
Merge pull request #3979 from dhensby/pulls/test-nest
Nest and unnest Config and Controller for each test
|
2015-06-17 16:04:27 +12:00 |
|
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 |
|