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
10,239 Commits 31 Branches 527 Tags 162 MiB
46dc8ae1e5
Commit Graph

10239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
46dc8ae1e5 Merge pull request #974 from adrexia/update-chosen 
Updating chosen dependency
 2012-11-27 01:18:47 -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
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
Sam Minnée
a054cc5b8f Merge pull request #967 from halkyon/remove_old_testinstall 
Removing redundant DatabaseAdmin::testinstall()
 2012-11-21 20:47:25 -08:00
Sean Harvey
477cf6b793 Removing redundant DatabaseAdmin::testinstall() 
The original intention of this method was to be a rewrite
check by the installer, but it doesn't belong in
DatabaseAdmin, nor is it used by the installer anymore,
since the rewrite test is done by the installer directly.
 2012-11-22 17:07:28 +13:00
Sam Minnee
ecd921cc0a Fixed glitches in the sample composer.json shown in the docs 2012-11-22 17:03:11 +13:00
Naomi Guyer
a933847217 BUG Incorrect html nesting of breadcrumbs 
Removed h2 from outside breadcrumbs, and put it within the breadcrumbs
div

Goes alon the cms commit 4fab9b8248819dc9008d5b94b5437cd833de31ac
 2012-11-22 12:20:02 +13:00
Mateusz Uzdowski
2657a27573 BUG Adjust the handler to jQuery UI 1.9 API change. 
Settings.url no longer contains the URL, as a result navigating around
tabs in IE (browsers that do not support History API) becomes broken.

For example when the admin is opened on "Pages" section it is impossible to
navigate to specific page, or if the admin is opened on a tab, it's not
possible to navigate to another tab.
 2012-11-21 11:02:51 +01:00
Sander van Dragt
8f89aa9171 BUG only call filemtime if file exists 
Added file_exists check before calling filemtime as this results in
'filemtime(): stat failed'
 2012-11-21 13:11:53 +13:00
Ingo Schommer
df4fde3864 Pjax docs 2012-11-18 23:48:43 +01:00
Sam Minnée
541e42f922 Merge pull request #887 from tractorcow/3.0-sqlquery-lastrow-fix 
BUG Fixed isue with SQLQuery->lastRow()
 2012-11-15 20:47:33 -08:00
Ingo Schommer
e9d999d648 Support for chosen.js drop downs in behat steps 2012-11-16 15:32:17 +13:00
Ingo Schommer
d86ad20e72 More flexible tabs selection in behat steps 2012-11-16 15:32:17 +13:00
Ingo Schommer
434759cc83 BUGFIX Correct redirection URL on deletion in GridFieldDetailForm 2012-11-16 15:32:17 +13:00
Ingo Schommer
bd0e597ac6 Use button tag for delete button in GridFieldEditForm 2012-11-16 15:32:17 +13:00
Ingo Schommer
32f829d094 NEW Support for Behat tests, and initial set of tests 2012-11-16 15:31:55 +13:00
Hamish Friedlander
5edf86fe7a Merge branch '3.0.3' into 3.0 2012-11-16 14:57:50 +13:00
Hamish Friedlander
fb7db6de6d Add 3.0.3-rc2 changelog 2012-11-16 14:45:20 +13:00
Sean Harvey
8168a7db09 Remove deprecated DBField::create(), use create_field() instead 2012-11-16 14:36:26 +13:00
Sean Harvey
b3d5b68019 Remove deprecated SQLQuery::setWhere() multiple arguments 2012-11-16 14:35:30 +13:00
Sean Harvey
a2bd378d46 Remove deprecated ArrayList::getRange(), use limit() instead 2012-11-16 14:35:05 +13:00
Sean Harvey
7042d87fd1 Remove deprecated Object::set_uninherited() 2012-11-16 14:34:20 +13:00
Sean Harvey
d13b067b54 Remove deprecated HTTP::getMimeType() use get_mime_type() instead 2012-11-16 14:33:20 +13:00
Sean Harvey
a46838c436 Removed deprecated Folder::findOrMake(), use find_or_make() instead 2012-11-16 14:19:19 +13:00
stojg
78ab9d3bf6 BUG Video embed from Add Media Feature no longer works (open #8033) 
Since the tinymce upgrade from 3.5.6 to 3.5.7 it seems like data attributes are forbidden on tags.
This fix tells tinymce to allow data* properties on img tags
 2012-11-16 13:56:50 +13:00
Hamish Friedlander
87697e08e6 Merge pull request #956 from silverstripe-rebelalliance/open/8003 
Open/8003
 2012-11-15 16:38:42 -08:00
Damian Mooyman
76c63fe4a4 BUG Fixed issue with SQLQuery::lastRow crashing on empty set. Added test cases for lastRow and firstRow. 
Quoted table / column names to make test cases work in postgres

BUG Fixed issue with SQLQuery::lastRow crashing on empty set. Added test cases for lastRow and firstRow.

Quoted table / column names to make test cases work in postgres

Merge branch '3.0-sqlquery-lastrow-fix' of github.com:tractorcow/sapphire into 3.0-sqlquery-lastrow-fix
 2012-11-16 13:27:51 +13:00
Sean Harvey
d1c5cd1454 Removing unused entities from en.yml 2012-11-16 12:44:21 +13:00
Hamish Friedlander
7315be4531 FIX default values from DataObject not showing in GridField details form 2012-11-16 12:36:00 +13:00
Hamish Friedlander
0dd97a38f6 API: Form#loadDataFrom 2nd arg now sets how existing field data is merged with new data 2012-11-16 12:36:00 +13:00
Sean Harvey
4ea5bc5679 adding notes about deprecated things in the core 2012-11-16 11:57:53 +13:00
Sean Harvey
4330ecf083 Removing redundant templates (moved to legacytablefields module) 2012-11-16 11:53:31 +13:00
Sean Harvey
6a868e79e1 Removing deprecated prototype/behaviour libraries 2012-11-16 11:37:56 +13:00
Sean Harvey
4651e9bbc9 BUG Fixing ToggleField to work correctly with jQuery 2012-11-16 11:33:58 +13:00