Commit Graph

15001 Commits

Author SHA1 Message Date
Christopher Pitt
4ba051409d Cleaned up FormField 2015-06-20 13:55:58 +01:00
Daniel Hensby
a94103245d DOCS Bump PHP version in Server Requirements 2015-06-20 11:32:29 +01:00
David Alexander
305801d015 Update 07_Code_of_conduct.md
Typos, grammar, rewording.
2015-06-20 16:52:46 +12:00
Ingo Schommer
c5cf19a86a Merge pull request #4312 from sminnee/exclude-docs-from-export
FIX: docs not included in composer package installs
2015-06-20 13:22:47 +12:00
Daniel Hensby
b4802dfd78 Merge pull request #4311 from JayDevlin/3.2-install-requireWriteable
Install - Check if mysite/_config/config.yml is writeable
2015-06-19 17:38:05 +01:00
Daniel Hensby
9110e689cf Merge pull request #4313 from shoaibali/3.2
Unable to migrate down
2015-06-19 16:28:08 +01:00
ezero
900a7b7ff9 Unable to migrate down
Possible bug? Running PHP 5.6.3 
I had to override this method in MyMigrationTask.
2015-06-20 00:38:59 +12:00
Sam Minnee
a58e59565b FIX: docs not included in composer package installs (through export-ignore git attribute)
This change will improve the performance of package-download-based installs of composer packages, by
excluding docs. It does this by exlcuding them from the output of the "git archive" command.

The suggestion came from https://github.com/composer/composer/issues/1750
2015-06-19 12:01:41 +01:00
Devlin
da4c31cd50 Install - Check if mysite/_config/config.yml is writeable 2015-06-19 12:36:49 +02:00
Damian Mooyman
9cccfec1a0 Added 3.2.0-beta1 changelog 2015-06-19 19:22:38 +12:00
Damian Mooyman
bc8bc7d0c5 Update translations 2015-06-19 18:18:00 +12:00
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
David Alexander
f6d60ca946 Update 02_Release_Process.md
Updated: deprecated API's removed only in MAJOR releases.
2015-06-19 07:51:16 +12: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
David Alexander
54b0b1fd4e Update 02_Release_Process.md
Typos. Spelling. 404 errors for framework and cms milestones links to github(line 13).
2015-06-18 17:26:58 +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