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
11,194 Commits 31 Branches 527 Tags 162 MiB
afb8465d05
Commit Graph

11194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
afb8465d05 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
 2013-03-29 17:37:19 +01:00
Ingo Schommer
9ed8eba253 Simplified travis builds (using external script) 2013-03-28 23:49:32 +01:00
Ingo Schommer
b90eafaf14 More straightfoward travis include/exclude 2013-03-28 23:06:30 +01:00
Ingo Schommer
4da85dc734 Simplified travis builds (external setup scripts) 2013-03-28 22:39:37 +01:00
Ingo Schommer
ace7c04b9e Merge pull request #1345 from ajshort/pulls/modeladmin-tabs 
FIX: Set ModelAdmin tab targets to avoid creating new panels
 2013-03-28 07:56:17 -07:00
Andrew Short
f2b4b95350 FIX: Set ModelAdmin tab targets to avoid creating new panels 2013-03-29 01:41:31 +11:00
Ingo Schommer
05181fce78 Merge pull request #1344 from g4b0/8330-cache-issue-in-CMSVersion 
Solved json obj to array issue
 2013-03-28 06:54:12 -07:00
g4b0
93428bd8f2 Solved json obj to array issue 2013-03-28 14:52:13 +01:00
Ingo Schommer
469eaee4c1 Fixed i18n.common_locales definitions 2013-03-28 09:04:36 +01:00
Andrew Short
93578c8d22 Remove incorrectly added diff file 2013-03-28 08:15:36 +11:00
Ingo Schommer
3c30c36b71 Fixed help_link config usage 2013-03-27 21:48:55 +01:00
Ingo Schommer
e97c034922 API i18n::$common_languages and i18n::$common_locales converted to Config API 
They are now accessed via the Config API, and contain associative rather than indexed arrays.
Before: `array('de_DE' => array('German', 'Deutsch'))`, after: `array('de_DE' => array('name' => 'German', 'native' => 'Deutsch'))`.

Also fixed a i18n.js_i18n config accessor
 2013-03-27 20:42:46 +01:00
Ingo Schommer
c1a543feb2 Merge pull request #1341 from g4b0/8347-getFieldsForImage 
BUGFIX: fixed access to asset_preview_width in getFieldsForImage
 2013-03-27 12:02:23 -07:00
g4b0
c63d840561 BUGFIX: fixed access to asset_preview_width in getFieldsForImage 2013-03-27 17:52:40 +01:00
Ingo Schommer
373da53826 Removed unused DataExtension::$extendable_statics 
Oversight from cleanup in 876f4c5
 2013-03-27 16:09:17 +01:00
Ingo Schommer
3a911ebb00 Fixed Email.admin_email config static naming 2013-03-27 13:41:24 +01:00
Ingo Schommer
538bf01860 Merge remote-tracking branch 'origin/3.1' 2013-03-27 12:12:16 +01:00
Ingo Schommer
ccb0155b8f Config docs improvement: @config and LSB mentions 
Also moved some less important "notes" further down the page.
The doc is still written too much like a technical spec, we need
something that's more accessible to beginners.
 2013-03-27 12:08:12 +01:00
Ingo Schommer
315c03872a Fixed _config.php references and usage in docs 2013-03-27 12:06:57 +01:00
Ingo Schommer
6209d1be6a Merge pull request #1336 from kinglozzer/define-assets-dir 
NEW Allow setting of ASSETS_DIR in _ss_environment.php
 2013-03-27 02:53:05 -07:00
Sam Minnée
8dbdb00400 Merge pull request #1335 from chillu/pulls/config-clone-nest 
FIX Clone Config_LRU incl. objects in array
 2013-03-26 13:46:30 -07:00
Ingo Schommer
8b4fb6ef0f Clarified 3.1 upgrading docs 2013-03-26 19:01:36 +01:00
Loz Calver
64349fefb5 NEW Allow setting of ASSETS_DIR in _ss_environment.php 2013-03-26 15:42:18 +00:00
Ingo Schommer
a415db91d4 FIX Clone Config_LRU incl. objects in array 
Caused key confusions when using Config::nest()/unnest()
 2013-03-26 12:47:52 +01:00
Ingo Schommer
b0d3f7f3a2 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	api/RSSFeed.php
	dev/SapphireTest.php
	tests/control/RequestHandlingTest.php
 2013-03-26 10:46:41 +01:00
Ingo Schommer
04c3b5ee94 Fixed static config in BBCodeParser (fixes #8340) 2013-03-26 10:15:17 +01:00
Ingo Schommer
880702fc74 Fixed static config access in Currency and i18n (fixes #8341) 2013-03-26 10:13:51 +01:00
Ingo Schommer
a1c5951d83 Merge pull request #1334 from wilr/5611 
FIX: Groups should be able to have titles longer than 50 characters
 2013-03-26 02:09:47 -07:00
Will Rossiter
70144ad549 FIX: Groups should be able to have titles longer than 50 characters (Fixes: open/5611) 2013-03-26 22:05:37 +13:00
Ingo Schommer
4ea98ae440 Removed Object::*_extension() non-LSB deprecation 
Its just a simplication, and unnecessarily complicates
module compatibilities.
 2013-03-26 00:31:25 +01:00
Ingo Schommer
1916a6e8f4 Fixed config API usage (unknown call to set()) 2013-03-26 00:04:01 +01:00
Ingo Schommer
07d99a5136 FIX Fallback for Session.cookie_path 
Regression introduced by Config API static changes.
Effectively meant that you can no longer log in to the CMS
since the cookie path is set for each URL individually...
 2013-03-25 23:03:34 +01:00
Ingo Schommer
7470f5e0b6 More upgrading notes about 3.1 and statics 2013-03-25 22:09:21 +01:00
Simon Welsh
f175d0bf66 Merge pull request #1275 from Zauberfisch/hierarchy 
API: Hierarchy class cleanup
 2013-03-25 13:03:04 -07:00
Zauberfisch
215628a1ea API: re factored Hierarchy class to use new ::get() syntax 
API: removed broken & unused method Hierarchy->partialTreeAsUL()
 2013-03-25 19:55:19 +00:00
Ingo Schommer
c8f26e673a 3.1 changelog improvements 2013-03-25 09:52:55 +01:00
Simon Welsh
a2c64c68e2 Corrects MySQL 'ALTER TABLE' check 2013-03-25 07:53:42 +13:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:20:53 +01:00
Ingo Schommer
f55bd9d3af Allow for short versions in Deprecation::notification_version() 2013-03-24 17:20:36 +01:00
Ingo Schommer
183396a8ab Disable RequestHandler->handleAction() deprecation until we have fixed LeftAndMain usage 2013-03-24 17:20:36 +01:00
Ingo Schommer
00fb8cf679 Formatting and docs changes to configuration.md 2013-03-24 17:20:36 +01:00
Ingo Schommer
69ae1f338f FIX Clean cache on Config->remove() 2013-03-24 17:20:36 +01:00
Ingo Schommer
bb52f2a214 FIX Allow FALSE in Config API, call remove() will NULL key on update() 2013-03-24 17:20:36 +01:00
Andrew Short
222e554ce6 Merge pull request #1328 from a2nt/html_tabs_fix 
FIX Localized HtmlEditorField Tabs
 2013-03-24 04:20:24 -07:00
Simon Welsh
a6e8169d00 Merge pull request #1319 from ss23/853-alter-table 
Check for ALTER TABLE in installer (fixes #853)
 2013-03-24 03:06:34 -07:00
a2nt
27b0cda054 FIX Localized HtmlEditorField Tabs 
Tabs can have only lattin characters in it's name
 2013-03-24 15:19:45 +06:00
Stephen Shkardoon
3ecc840572 Check for ALTER TABLE in installer (fixes #853) 2013-03-24 20:08:19 +13:00
Simon Welsh
7ce010928d Merge pull request #1327 from ss23/patch-2 
BUG Database config values aren't escaped
 2013-03-23 12:16:13 -07:00
Simon Welsh
12ed83f88b Merge pull request #1326 from ss23/patch-1 
Missing closing <a> tag in installer
 2013-03-23 12:13:39 -07:00
Stephen Shkardoon
9b9f367e93 BUG Database config values aren't escaped 
Causes minor UI issues if you try use database configuration values that happen to have " or other values in them.
 2013-03-24 01:05:33 +13:00