tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-02 01:19:29 +02:00
Code Issues Projects Releases Wiki Activity
10,270 Commits 29 Branches 516 Tags 147 MiB
683db8dc1d
Commit Graph

10270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
683db8dc1d API Explicitly load project template files after modules 
Resolves an issue where if not using the themes directory (i.e just a single app folder) you cannot override module templates.
Changes the SS_TemplateManifest constructor with a new $project argument.
 2012-12-04 10:47:37 +01:00
Ingo Schommer
a108f67476 Merge pull request #922 from simonwelsh/rellist-presave 
NEW: Allows setting of has_many and many_many relations before writing
 2012-12-04 01:25:15 -08:00
Damian Mooyman
65002f6b83 BUG GD::greyscale did not correctly preserve alpha component of images Added test cases to test greyscale operation across various image formats Replaced various magic numbers with IMAGETYPE_XXX definitions 2012-12-04 09:47:26 +01:00
Kirk Mayo
20a5bc1d36 BUG iOS safari navigation bug (fixes #8039) 2012-12-03 12:27:59 +01:00
Ingo Schommer
700c95a523 Merge pull request #989 from silverstripe-rebelalliance/8063 
BUG Unable to return to site tree admin from Preview mode trac 8063
 2012-12-03 01:33:04 -08:00
Kirk Mayo
da1a6e7bf7 BUG Unable to return to site tree admin from Preview mode trac 8063 2012-12-03 10:38:47 +13:00
Ingo Schommer
fa2057bcd9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	search/FulltextSearchable.php
 2012-11-30 14:25:06 +01:00
Ingo Schommer
3f67404a8a Revert "BUGFIX: ArrayList now discards keys of the array passed in and keeps the numerically indexed array sequential." 
This reverts commit b6017a7c90.
It breaks SelectionGroup, and its most prominent usage,
the "add page" dialog.
 2012-11-30 14:24:03 +01:00
Ingo Schommer
0808a1c21e Fixed JS syntax error 
Regression from dbbcd08d
 2012-11-30 12:30:41 +01:00
Ingo Schommer
78015ea3cf Merge pull request #985 from ARNHOE/3.0 
SummaryFields doesn't change Title of Field
 2012-11-30 01:01:55 -08:00
ARNHOE
8590bec1a9 SummaryFields doesn't change Title of Field 
$field_labels does for me.
 2012-11-30 09:53:01 +01:00
Will Rossiter
69dffd9b86 Merge pull request #982 from zoao/3.0 
More fluent API.
 2012-11-29 20:06:01 -08:00
João Martins
cc3e500f82 return $this, for do things like this: new DropdownField('XPTOName', 'XPTO Label', XPTOModel::get()->map("ID", "Name")->unshift(0,'- Select -')) 
This does not break anything and makes things more natural
 2012-11-30 01:37:36 +00:00
Ingo Schommer
888d4a87c5 Merge pull request #978 from adrexia/css-fix 
BUG: Extends too generic (tree.scss)
 2012-11-29 05:53:49 -08:00
Ingo Schommer
7db1d619e8 Merge pull request #981 from ARNHOE/3.0 
MINOR: Forgot Apostrophe in comment
 2012-11-29 03:17:17 -08:00
ARNHOE
47f5235f94 MINOR: Forgot Apostrophe in comment 2012-11-29 12:12:26 +01:00
Naomi Guyer
7d0e10f5fa BUG: Extends too generic 2012-11-29 10:20:00 +13:00
Ingo Schommer
0dba1485a5 Merge remote-tracking branch 'origin/3.0' 2012-11-28 16:36:21 +01:00
Ingo Schommer
9e44672433 Using $TRAVIS_BRANCH again, since its now available on travis-ci.org 2012-11-28 16:35:29 +01:00
Simon Welsh
bbc4443af7 NEW: Allows setting of has_many and many_many relations before writing 
Adds a new wrapper list, UnsavedRelationList, that maintains the relations until
writing, where it is converted into the correct RelationList.
 2012-11-28 09:37:08 +13:00
jean
fbfff8df28 FIX 7934 When lazy loading fields respect version of the record 2012-11-27 17:31:45 +01:00
Simon Welsh
68894c1e35 Merge pull request #976 from chillu/pulls/gd-classalias 
BUG Restore GD class to avoid breaking GD::set_default_quality() calls
 2012-11-27 02:26:36 -08:00
Ingo Schommer
414c006c8e BUG Restore GD class to avoid breaking GD::set_default_quality() calls 
Regression from d24b586
 2012-11-27 11:20:19 +01:00
Ingo Schommer
87d538c7ee Merge pull request #959 from silverstripe-droptables/alternating-button-rc 
NEW Extend the ssui.button with alternate appearances.
 2012-11-27 01:55:16 -08:00
Ingo Schommer
4f23ac43e0 Merge pull request #871 from chillu/pulls/gridfieldadd-relationsearch 
NEW Relation search for GridFieldAddExistingAutocompleter
 2012-11-27 01:51:59 -08:00
Ingo Schommer
8108f7f936 NEW Relation search for GridFieldAddExistingAutocompleter 
Now also searches 1:n relations if they where defined in searchableFields() with dot notation.
 2012-11-27 10:51:10 +01:00
Ingo Schommer
26c449d69b Merge pull request #939 from chillu/pulls/gridfield-manymanyfields 
NEW Many-many relation data editing in GridFieldDetailForm
 2012-11-27 01:46:58 -08:00
Ingo Schommer
c8136f5d4c NEW Many-many relation data editing in GridFieldDetailForm 
Also adds GridFieldDetailForm->setFields() for customizing
the displayed form fields (required for adding relational fields).
 2012-11-27 10:45:43 +01:00
Ingo Schommer
46dc8ae1e5 Merge pull request #974 from adrexia/update-chosen 
Updating chosen dependency
 2012-11-27 01:18:47 -08:00
Simon Welsh
7935c14e39 Merge pull request #975 from kopymark/patch-1 
Add limit() details to datamodel.md
 2012-11-27 00:01:50 -08:00
Adam Judd
2d8b7daaf9 Add limit() details to datamodel.md 2012-11-26 23:59:31 -08:00
Naomi Guyer
715b62f790 Updating chosen dependency 2012-11-27 16:28:17 +13:00
Sean Harvey
6ce6f9a2c1 Merge branch '3.0' 2012-11-26 17:17:41 +13:00
Sam Minnée
270f6b2d77 Merge pull request #973 from silverstripe-rebelalliance/docs/composer 
DOC Update composer docs with changes from 3.0.3
 2012-11-25 19:36:43 -08:00
Hamish Friedlander
40fd5abb57 DOC Update composer docs with changes from 3.0.3 2012-11-26 16:29:20 +13:00
Sean Harvey
220d317f27 Upgrading TinyMCE dependency from 3.5.7 to 3.5.8 
This also fixes 78ab9d3bf6 which strips HTML data attributes
from the editor contents.

See changelog here:
http://www.tinymce.com/develop/changelog/index.php?type=tinymce
 2012-11-26 15:13:48 +13:00
Hamish Friedlander
e934030bc1 Merge changes for 3.0.3 release into 3.0 2012-11-26 11:34:28 +13:00
Hamish Friedlander
77f7778b4a Add 3.0.3 changelog 2012-11-26 11:20:21 +13:00
Mateusz Uzdowski
dbbcd08d8f NEW Extend the ssui.button with alternate appearances. 
Reusable feature for making CMS buttons that respond to the current
contextual state with an appearance change.

Provides capability to specify initial state, alternate icon and
alternate text via data attributes or options (PHP or JS), and to hook
up into events triggered when the state is alternating.

This is used by the follow-up cms action buttons cleanup work.
 2012-11-26 09:51:02 +13:00
UndefinedOffset
4310718b94 BUG Insert Media, inserts all previous media (fixes #7545) 2012-11-23 17:37:39 +01:00
Ingo Schommer
15a687f1e7 Merge remote-tracking branch 'origin/3.0' 2012-11-23 15:31:08 +01:00
Ingo Schommer
aa72425e84 Fixed PHPUnit assertions for incomplete tests in core 
Avoid PHPUnit throwing "test didn't run any assertions"
notices in PHP. If nothing else, it keeps test output
looking less broken by default, making it more likely
that actual errors do get noticed.
 2012-11-23 15:16:39 +01:00
Ingo Schommer
453d04e4ba BUG Reset DataObject caches in SapphireTest->resetDBSchema() 
This became a problem with fdcd7a2e where $custom_database_fields
were cached, but never reset. It lead to extensions not applying
correctly in SapphireTest->setUpOnce().
 2012-11-23 11:14:02 +01:00
Ingo Schommer
a3cd7ddc09 BUG Force SapphireTest schema reset for extension changes 
Previously changes to $requiredExtensions and $illegalExtensions
didn't cause a reset unless there was also other schema-altering
settings like $extensionsToRemove or $extraDataObjects
 2012-11-23 11:12:03 +01:00
Mateusz Uzdowski
b02b1e6dbc API Forward the editor events to underlying textarea. 
Makes the editor API more flexible by triggering generic JS events that
can be used from entwine. This makes it easier to add event handlers to
the editor and cleans up the initialisation call from unrelated code.

The patching code also forwards editor changes to the textarea field,
which in perspective will allow the changetracker to react to changes in
this field as they happen.
 2012-11-23 00:50:18 +01:00
Ingo Schommer
e021a190b3 Merge pull request #968 from silverstripe-droptables/submitform-validation 
Future-proof the submitForm for use with forms without validation.
 2012-11-22 15:31:51 -08:00
Ingo Schommer
33039958c2 Merge pull request #965 from silverstripe-droptables/incorrect-bc-nesting 
BUG Incorrect html nesting of breadcrumbs
 2012-11-22 15:28:54 -08:00
Ingo Schommer
c55c7c33f8 Merge branch '3.0' 
Conflicts:
	admin/code/CMSProfileController.php
	composer.json
	tests/model/DataObjectTest.php
 2012-11-22 23:51:28 +01:00
Mateusz Uzdowski
3f2ddbb3fb Future-proof the submitForm for use with forms without validation. 
We might decide to use it for other submissions than EditForm.
 2012-11-23 11:09:43 +13:00
Ingo Schommer
96acd50681 Update composer contributing instructions 2012-11-22 15:10:10 +01:00