Commit Graph

10297 Commits

Author SHA1 Message Date
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
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
fbc6e3366b Merge branch '3.0' 2012-11-05 15:11:48 +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
Sean Harvey
aff28eb896 BUG JSONDataFormatter should respect canView() permissions 2012-11-05 14:03:39 +13:00
Sean Harvey
7a7c1a6857 BUG Escape tree title 2012-11-05 13:19:02 +13:00
Ingo Schommer
6bb7a95a6c Merge pull request #925 from adrexia/tabs-remove-line
BUG: Border at top of tabs when no subtabs
2012-11-04 15:06:12 -08:00
Normann Lou
5152164d17 BUGFIX: Multiple HTMLEditorFields not redrawing, fix by storing its container object before setting timeout 2012-11-05 11:56:29 +13:00
Naomi Guyer
7ae73eabdd BUG: Border at top of tabs when no subtabs
This bug reappeared when branches were merged because the 3.0 version
of _style.scss had tabsets defined in different places.

This scss was inserted, but there was no idication that it was new to
master (except in the resulting css file). As these styles are declared
differently elsewhere in _style.scss, I think this declaration must
have been refactored in an earlier commit in master.
2012-11-05 11:48:50 +13:00
Sean Harvey
1861751ff3 Updated translations 2012-11-05 11:42:15 +13:00
Sean Harvey
1cb9c34fc5 Fixing broken references to sprites (probably caused by old Compass version) 2012-11-05 11:21:41 +13:00
Sean Harvey
71c20be997 Updating default en.yml with updated entities 2012-11-05 11:16:14 +13:00
Sam Minnee
2d3c33d400 FIX: Fixed details about version in composer create-project 2012-11-04 21:50:56 +13:00
Simon Welsh
9aa1c29059 Merge pull request #924 from wilr/open7847
BUG Only include processed requirements at the top level. (Fixes #7847)
2012-11-03 23:42:24 -07:00
Will Rossiter
dfd3455802 BUG Only include processed requirements at the top level. (Fixes #7847)
After each sub template was processed Requirements::includeInHTML() is included which appended requirements again.
2012-11-04 17:54:09 +13:00
Justin Martin
d24b586830 NEW: Enable multiple image manipulation back-ends on the Image class 2012-11-03 19:38:09 -07:00
Simon Welsh
39b2818f5f Merge pull request #923 from sminnee/composer-docs
Added docs for composer
2012-11-03 02:25:17 -07:00
Simon Welsh
d8c920285c Merge pull request #917 from TheFrozenFire/feature-DataObjectFromStdClass
API: DataObject::__construct() now accepts stdClass for $record
2012-11-03 02:16:07 -07:00
Simon Welsh
123a742872 Merge pull request #920 from TheFrozenFire/feature-SSListEach
API: Add new method "each" to SS_List
2012-11-03 02:10:23 -07:00
Simon Welsh
5a793990d8 Merge pull request #921 from TheFrozenFire/bug-DataObjectCreated
BUG: DataObject::write overwrites Created on first write
2012-11-03 02:08:35 -07:00
Sam Minnee
c1ae8f9e7a Added docs for composer 2012-11-03 18:00:58 +13:00
Justin Martin
f2a709d849 BUG: DataObject::write overwrites Created on first write 2012-11-02 20:37:17 -07:00
Justin Martin
26e5afc0c4 NEW: Add new method "each" to SS_List and core implementors thereof 2012-11-02 18:21:02 -07:00