tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-06 03:19:32 +02:00
Code Issues Projects Releases Wiki Activity
14,631 Commits 29 Branches 517 Tags 147 MiB
c170f90d5e
Commit Graph

14631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
513f0191fb API New default behaviour for Director::getAbsoluteUrl 2015-06-12 16:12:38 +12: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
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
4e9f37c516 Merge pull request #4258 from tractorcow/pulls/4.0/fix-extra-args 
API Formalise new additional arguments
 2015-06-12 00:55:45 +01: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
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
e9d4863828 API Formalise new additional arguments to DataObject::canCreate, DataExtension::augmentSQL, and DataObject::extendedCan 2015-06-09 11:31:34 +12:00
Damian Mooyman
786b1dd5d4 Merge remote-tracking branch 'origin/3' 
Conflicts:
	control/HTTPRequest.php
	filesystem/Upload.php
	model/ManyManyList.php
 2015-06-09 11:10:14 +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
Sam Minnée
836c8bf1c7 Merge pull request #4189 from tractorcow/pulls/3.2/archive-actions 
API Replace Page Delete with new Page Archive action
 2015-06-04 19:03:36 +12:00
Damian Mooyman
358b7bfa05 Merge pull request #4251 from jonom/file-versions-prefix-master 
NEW Configurable file version prefix
 2015-06-04 13:18:08 +12:00
Damian Mooyman
0189367be2 Merge pull request #4241 from jonom/file-versions-prefix-3 
NEW: Configurable file version prefix
 2015-06-04 13:17:49 +12:00
Jonathon Menz
223466a8b8 NEW Configurable file version prefix 
Numbers are often used at the end of file names in image sequences (e.g. digital photos) and the current renaming scheme can disrupt this, creating a confusing situation for the user. A configurable file version prefix should help prevent this.

Filename   | Old result | New result
-----------|------------|--------------
IMG001.jpg | IMG2.jpg   | IMG001-v2.jpg
 2015-06-03 09:24:30 -07:00
Jonathon Menz
44b1ff1931 NEW: Configurable file version prefix 
Numbers are often used at the end of file names in image sequences (e.g. digital photos) and the current renaming scheme can disrupt this, creating a confusing situation for the user. A configurable file version prefix should help prevent this, with a default of '-v' proposed for SS4.0.

Filename   | Old result | New result (with '-v' prefix)
-----------|------------|--------------
IMG001.jpg | IMG2.jpg   | IMG001-v2.jpg
 2015-06-03 08:55:38 -07:00
Damian Mooyman
a72bd16f42 API Deprecate delete in favour of archive 
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug in reporting publishing of error pages
Restoring a page also restores parents
 2015-06-03 14:24:27 +12:00
scott1702
a9d22f1fbf NEW: Files can be uploaded directly in the 'Insert Link' form 2015-06-03 11:20:29 +12:00
Robert Reiz
747e87baeb Adding dependency badge and reference badge 2015-06-03 08:57:07 +12:00
Daniel Hensby
d3b7abb0b5 Merge pull request #4242 from jonom/docs-database-defaults 
DOCS: Added default value examples
 2015-06-02 18:01:06 +01:00
Damian Mooyman
51df4df9f1 Fix merge regressions / errors 2015-06-02 20:19:12 +12:00
Damian Mooyman
8331171f2c Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
 2015-06-02 19:13:38 +12:00
Sam Minnée
0f3e62f613 Merge pull request #4245 from tractorcow/pulls/3.1.14/fix-api 
FIX Incorrect env setting in 3.1.13
 2015-06-02 15:16:48 +12:00
Damian Mooyman
0319f7855b FIX Incorrect env setting in 3.1.13 2015-06-02 12:27:08 +12:00
Ingo Schommer
dac1b5818b Merge pull request #4217 from tractorcow/pulls/3.1/fix-directortest 
BUG Fix DirectorTest failing when run with sake
 2015-06-01 17:34:26 +12:00