tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-16 06:26:27 +02:00
Code Issues Projects Releases Wiki Activity
11,588 Commits 30 Branches 526 Tags 154 MiB
41974b9632
Commit Graph

11588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Shipman
f88fcec2a4 Update composer.md 
Fixed small typos
 2013-04-03 15:16:35 +13:00
Joseph Madden
df4d7428fa FIX Saving of custom meta tags (fixes #8288) 
This should allow custom meta tags to be saved in the admin panel.

Also, if you use html5 video or audio the source sub tag
would have been stripped two these are all the tags that may be empty
and are valid.
 2013-04-02 12:02:56 +02:00
Ingo Schommer
f0d92f7bcc Merge pull request #1094 from silverstripe-big-o/pulls/3.1-versioned-relfield 
BUGFIX Versioned_Version->relField()
 2013-04-02 02:49:27 -07:00
Ingo Schommer
ebca1a64ed Merge pull request #1299 from silverstripe/user-specific-temp-folder 
NEW: Move temp data into a user-specific subfolder, to stop temp-permission bugs from occurring.
 2013-04-02 02:44:53 -07:00
Ingo Schommer
47e02216fa Merge pull request #1342 from chillu/pulls/i18n-common-languages 
API i18n::$common_languages and i18n::$common_locales converted to Confi...
 2013-04-02 02:44:06 -07:00
Ingo Schommer
0b54b284bc Updated i18n docs 2013-04-02 11:43:36 +02:00
Nik Rolls
5143c8149a Form now loads correctly when ClassName is changed. 2013-04-02 11:03:49 +02:00
Ingo Schommer
ef3d974821 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
 2013-04-02 02:05:58 +02:00
Ingo Schommer
c08ab18c03 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	.travis.yml
	admin/javascript/LeftAndMain.AddForm.js
	docs/en/reference/requirements.md
 2013-04-02 02:00:50 +02:00
Ingo Schommer
f5754c11aa Contribution guidelines, new bugtracker links 2013-04-02 01:51:40 +02:00
Ingo Schommer
1b83e489ef Updated bugtracker links 2013-04-02 01:19:28 +02:00
Andrew Short
cc5cfed1e5 Merge pull request #1346 from ajshort/pulls/tab-panel-padding 
Include padding on padded edit form panels inside a tabset
 2013-03-30 04:16:54 -07:00
Ingo Schommer
94ea56b604 Merge pull request #1349 from ajshort/pulls/urlsegment-filter-dots 
API: Don't allow dots in URL segments
 2013-03-30 02:30:20 -07:00
Ingo Schommer
41039cc8d3 Merge pull request #1348 from danrye/patch-3 
Minor: Update "Editing Online"
 2013-03-30 02:21:21 -07:00
Andrew Short
5ec85d06f6 API: Don't allow dots in URL segments 2013-03-30 19:47:17 +11:00
Dan
9b056456a1 Minor: Update "Editing Online" 
Adding emphasis to the "Edit this page" feature, and ensuring it comes before the more difficult option of locating the .md file manually.
 2013-03-30 03:03:50 -03:00
Ingo Schommer
afb8465d05 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
 2013-03-29 17:37:19 +01:00
Stig Lindqvist
3aced1151f BUG: GridFieldFilterHeader only filters on last filter 
GridFieldFilterHeader only filters on the last filter argument because it keeps recloning the original datalist
 2013-03-29 20:06:57 +13: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
3ff103a04c More straightfoward travis include/exclude 2013-03-28 22:53:55 +01:00
Ingo Schommer
4da85dc734 Simplified travis builds (external setup scripts) 2013-03-28 22:39:37 +01:00
Ingo Schommer
31f5e00a56 Simplified travis builds (external setup scripts) 2013-03-28 22:24:03 +01:00
Ingo Schommer
43d4224286 Require cms in 2.4 composer.json (which is used in travis) 2013-03-28 22:18:08 +01:00
Ingo Schommer
05d1305497 Simplified travis builds (external setup scripts) 2013-03-28 22:10:35 +01:00
g4b0
f033321adc Solved json obj to array issue 2013-03-28 22:06:37 +01:00
Andrew Short
10f46ba08e Include padding on padded edit form panels inside a tabset 2013-03-29 02:23:43 +11: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
Naomi Guyer
19a8545076 BUG: update deprecated 'live' jquery to 'on' 
'live' has been deprecated since jquery v 1.7.0, and has been removed
in the latest 2 versions of jquery
 2013-03-27 15:09:49 +13: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