tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
14,822 Commits 31 Branches 527 Tags 162 MiB
445f1d4ccb
Commit Graph

14822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5fcebbef02 Alias 3 as 3.3 2015-06-18 11:27:05 +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
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