Commit Graph

9881 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Ingo Schommer
96acd50681 Update composer contributing instructions 2012-11-22 15:10:10 +01:00
Sam Minnee
ecd921cc0a Fixed glitches in the sample composer.json shown in the docs 2012-11-22 17:03:11 +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
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
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
Ingo Schommer
8c2e3230c8 Added ModelAdmin customization docs 2012-11-15 22:14:15 +01:00
Andrew O'Neil
b6017a7c90 BUGFIX: ArrayList now discards keys of the array passed in and keeps the numerically indexed array sequential.
This fixes FirstLast and EvenOdd in templates, and makes ArrayList more consistent, as several methods already discarded the keys.
2012-11-16 09:39:01 +13:00
Ingo Schommer
8f27e7a7a5 Merge pull request #940 from chillu/pulls/phpunit-composer
Fetch PHPUnit dependency through composer
2012-11-15 08:05:53 -08:00
Ingo Schommer
4fcdfe8d64 Testing docs recommend "phpunit" over "sake"
- Moved some docs around to reflect this change
- Described how to symlink from vendor/bin/phpunit
- Added note about browser-runs not being recommended
- Added more examples on how to run through "sake",
  to complement the existing descriptions for "phpunit"
2012-11-15 14:15:46 +01:00
Ingo Schommer
e4d71c2a20 Add Composer autoloader
Mainly to get PHPUnit going as a composer requirement
rather than through PEAR (which is easier to set up).
2012-11-15 13:40:09 +01:00
Ingo Schommer
0a580deb3f Documenting PHPUnit install through composer 2012-11-15 13:40:07 +01:00
Ingo Schommer
6d17995a88 Merge pull request #952 from stojg/open-8033-video-embed
BUG Video embed from Add Media Feature no longer works (open #8033)
2012-11-15 04:23:31 -08:00
stojg
c6fcb080a9 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-15 15:49:03 +13:00
Stig Lindqvist
84692bf499 Corrections to composer docs for update and install 2012-11-13 22:57:02 +13:00
Stig Lindqvist
cf11892ab2 Updated license in readme to include year 2012 2012-11-13 22:32:31 +13:00
Sam Minnee
875e01ff1c Added composer docs for update and install 2012-11-12 11:58:41 +13:00
Sam Minnee
cc96b4d0ff More clarification of composer docs 2012-11-12 11:48:49 +13:00
Ingo Schommer
05a44e8bfc Correct branch for Travis build status image 2012-11-09 13:21:28 +01:00
Mateusz Uzdowski
a8b0e44d98 API Hash autologin tokens before storing in the database.
Refactor the code to make it clear the distinction is made between a
plaintext token and a hashed version. Rename fields so it is more
obvious what is being written and what sent out to the user.

This reuses the salt and algorithm from the Member, which are kept
constant throughout the Member lifetime in a normal scenario. If they do
change, users will need to re-request so the hashes can be regenerated.
2012-11-09 11:29:42 +01:00
Loz Calver
ea2dc9da0e ENHANCEMENT: Add ability to change URL for SS logo in CMS Menu 2012-11-09 11:06:04 +01:00
Ingo Schommer
e9a544b719 Merge branch 'patch-2' of git://github.com/icecaster/sapphire into icecaster-patch-2 2012-11-09 10:29:38 +01:00