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,320 Commits 31 Branches 527 Tags 162 MiB
d795b191ec
Commit Graph

10320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnee
cc96b4d0ff More clarification of composer docs 2012-11-12 11:48:49 +13:00
Will Rossiter
af2ac1d8c5 FIX: include ImagickBackend only when Imagick installed 2012-11-11 15:13:36 +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
Ingo Schommer
bde6344abf Composer branch alias from dev-master to 3.1 
Satisfies the "3.*" requirements added to most modules
 2012-11-08 17:00:24 +01: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
c89f56f1cb Merge pull request #932 from clarkepaul/master 
ENHANCEMENT message colours updated #7976
 2012-11-07 06:29:05 -08:00
Ingo Schommer
edb4ecd4d9 Note about backtick in entwine shortcuts 2012-11-07 13:05:48 +01:00
Ingo Schommer
91b69bfb52 Fixed tab alignment and padding 
See discussion at https://github.com/silverstripe/sapphire/pull/934#issuecomment-10136236
 2012-11-07 12:41:01 +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
Sam Minnée
8e6ad8c856 Merge pull request #935 from chillu/pulls/tabs-docs 
Tabs docs for CMS
 2012-11-06 15:27:40 -08:00
Ingo Schommer
ada42103ed Tabs docs for CMS 2012-11-06 23:59:35 +01: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
Sean Harvey
f4a4465873 Merge branch '3.0' 2012-11-07 11:12:01 +13:00
Sean Harvey
078a8e9c2b Adding note about Object::add_extension() and has_extension() changes 2012-11-07 11:07:56 +13:00
Andrew O'Neil
0c8de0a1de APICHANGE: Use late static binding for Object::has_extension() 2012-11-07 11:07:55 +13:00
Andrew O'Neil
6dd6a5c188 APICHANGE: Use late static binding for Object::remove_extension() 2012-11-07 11:07:55 +13:00
Andrew O'Neil
fdea5321c7 APICHANGE: add_extension() is now called directly on the class, instead of on Object 2012-11-07 11:07:55 +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
Sean Harvey
96a408029b Merge pull request #934 from chillu/pulls/tab-consolidation 
ENHANCEMENT Tab style consolidation and design consistency
 2012-11-06 13:36:24 -08:00
Ingo Schommer
2d075671c3 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:28:19 +01:00
Ingo Schommer
3214a0a756 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	admin/css/screen.css
 2012-11-06 19:56: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
Paul Clarke
f988ae3163 ENHANCEMENT Message colours updated 2012-11-06 13:23:20 +13:00
Sean Harvey
169366a011 Merge branch '3.0' 2012-11-06 13:04:21 +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 Minnée
3fb3dc476e Merge pull request #930 from clarkepaul/master 
ENHANCEMENT general interface enhancements
 2012-11-04 21:59:43 -08:00
Sam Minnee
cf7f51a826 Removed unnecessary step in composer instructions. 2012-11-05 18:33:01 +13:00
Paul Clarke
411673ed43 ENHANCEMENT general css enhancements 
Remove arrow from sitetree next to site name  #7972
Remove 1px gap from above main tabs and enhance css
Replace loading logo
Adjust main link colour to have more contrast
Add more contrast to main edit panel - made bg slightly lighter
 2012-11-05 17:51:38 +13:00
Sam Minnée
0238db4182 Merge pull request #898 from TheFrozenFire/feature-ImageBackend 
ENHANCEMENT: Enable multiple image manipulation back-ends on the Image class
 2012-11-04 20:03:57 -08:00
Sean Harvey
0f55a11a5a Merge pull request #872 from chillu/pulls/file-permission 
API File->canEdit() returns TRUE by default (not checking CMS perms)
 2012-11-04 19:33:18 -08:00
Sam Minnee
3f6740f185 Improved module installation docs for composer. 2012-11-05 16:30:35 +13:00