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
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
Ingo Schommer
b1d090e798
Merge pull request #938 from halkyon/dataobject_db_cache
...
Improve performance of DataObject::db() with caching
2012-11-09 01:24:23 -08:00
Ingo Schommer
06ad5f5c69
Added Simplifie Chinese to i18n::$common_locales
...
See https://github.com/silverstripe/silverstripe-translatable/issues/66
2012-11-09 10:13:01 +01:00
Stig Lindqvist
e43a4f22fb
Update docs/en/installation/composer.md
...
DOC Corrected a spelling error on the example of advanced usage.
2012-11-09 19:08:13 +13:00
Tim Klein
f0f5dcb966
fixed mediaform urls in modeladmin
...
see http://open.silverstripe.org/ticket/8013
2012-11-09 16:44:48 +13:00
Sean Harvey
68826357cc
BUG Fixing non-object on file upload
...
Upload::load() assumes that a parent Folder always exists for a file
upload, but that's not always the case, and a non-object error is
given if no parent folder.
Check the folder exists first before getting the ID.
2012-11-08 21:28:05 +13:00
Sean Harvey
f69c2b0495
Improve performance of DataObject::db() with caching
...
In a usual CMS request, DataObject::db() is called potentially
thousands of times, calling Config::get() constantly for the same
uninherited statics, which is slow. This improves performance
by caching those into DataObject::$_cache_db
2012-11-08 10:38:16 +13:00
Ingo Schommer
edb4ecd4d9
Note about backtick in entwine shortcuts
2012-11-07 13:05:48 +01:00
Ingo Schommer
19a4e8a704
Merge pull request #936 from halkyon/custom_database_fields_cache
...
Fixing performance of DataObject::custom_database_fields()
2012-11-07 02:58:54 -08:00
Sean Harvey
fdcd7a2e60
Fixing performance of DataObject::custom_database_fields()
...
On sites with lots of modules, and pages with plenty of database
queries, DataObject::custom_database_fields() can be called
thousands of times, and slow down page render times. This fixes
it so the fields are cached by class in a static variable, and
are cleared when reset() is called on the DataObject.
2012-11-07 17:23:36 +13:00
Sean Harvey
50d6296a7d
Updating default en.yml translations
2012-11-07 11:42:08 +13:00
Sean Harvey
aec59de955
Adding title to CMSProfileController so translations get default
2012-11-07 11:41:48 +13:00
Sean Harvey
6ff5e8f39d
Adding ability to translate "Edit" text in GridFieldEditButton
2012-11-07 11:34:51 +13:00
Sean Harvey
88366bf3c8
Adding additional test for populateDefaults() in DataObjectTest
2012-11-07 11:28:36 +13:00
Ingo Schommer
a7efc76c36
Removed usage of deprecated jQuery UI 1.9 features
...
See http://jqueryui.com/upgrade-guide/1.9 for details.
Fixes fade effect on changing toplevel tabs
(semantics for "show" option in $.tabs() changed).
2012-11-06 22:53:34 +01:00
Ingo Schommer
ff39f9ad38
Upgrade jQuery UI to 1.9
...
- Fixed jQuery.tabs remote tabs loading behaviour (see http://forum.jquery.com/topic/tabs-api-redesign )
2012-11-06 19:45:56 +01:00
Ingo Schommer
bcee252c2f
Fixed sapphiredocs references
2012-11-06 11:01:48 +01:00
Sam Minnee
c1ae13ffb0
Added docs about composer branch names and forks.
2012-11-06 16:48:03 +13:00
Sam Minnee
10f34f43d5
Tidy up formatting of composer docs.
2012-11-06 12:30:45 +13:00
Sam Minnee
4e72ae8667
Added composer documentation for using project forks.
2012-11-06 12:26:43 +13:00
Sam Minnee
3013fa013f
Removed 'from-source' documentation
2012-11-06 11:48:39 +13:00
Sean Harvey
34f9c8e866
adding 3.0.3-rc1 to changelog index
2012-11-06 10:58:55 +13:00
Sean Harvey
896ce60432
Adding changelog for 3.0.3-rc1
2012-11-06 10:41:24 +13:00
Sean Harvey
532699c2ac
Merge pull request #877 from UndefinedOffset/3.0
...
FIX 7906 Regression: GridFieldConfig_RelationEditor: Removing relation d...
2012-11-05 11:53:25 -08:00
Sam Minnee
cf7f51a826
Removed unnecessary step in composer instructions.
2012-11-05 18:33:01 +13:00
Sam Minnee
3f6740f185
Improved module installation docs for composer.
2012-11-05 16:30:35 +13:00
Stig Lindqvist
6a4b8cb6ef
Merge pull request #929 from halkyon/3.0
...
BUG Fixing session keep alive for non-ADMIN users
2012-11-04 18:56:53 -08:00
Sean Harvey
3451da001a
BUG Fixing session keep alive for non-ADMIN users
...
SecurityAdmin isn't always available for CMS users, as they might
not have permission to view that section. This fixes the problem
with session keep alive by moving the ping to Security/ping, which
is available for all users.
2012-11-05 15:41:10 +13:00
Sean Harvey
42a5065199
Merge pull request #926 from normann/ea_cherry_pick
...
Multiple HTMLEditorFields not redrawing fix
2012-11-04 17:07:16 -08:00
