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
9,115 Commits 31 Branches 527 Tags 162 MiB
45b2cbfddd
Commit Graph

9115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
45b2cbfddd Using new template controls in docs 2012-06-27 16:09:31 +02:00
Ingo Schommer
868d3697fd Fixed usage of DataList etc in docs (fixes #7518) 2012-06-27 16:09:31 +02:00
Ingo Schommer
cb145a0094 "dmyplaceholders" setting for DateFields 2012-06-27 10:12:42 +02:00
ARNHOE
81c085f777 Fixed width of DateField with dmyfields=true 2012-06-27 10:11:39 +02:00
Sam Minnée
993fc90ef8 Merge pull request #579 from silverstripe-rebelalliance/open/7523 
Open/7523
 2012-06-26 21:07:22 -07:00
Sam Minnee
05861437bd Added RC3 changelog 2012-06-27 14:42:23 +12:00
Kirk Mayo
2a976066eb MINOR: open/7523 added a note relating to versions and added a missing quote to the changelog for 3.0 2012-06-27 10:50:17 +12:00
Ingo Schommer
0dfc82342a Merge pull request #574 from mightycoco/master 
Improving oEmbed insertion of direct image urls
 2012-06-26 15:43:41 -07:00
Kirk Mayo
fc2cbcce52 MINOR: Updating the configuration module with the default database option and corrected a out of date link 2012-06-27 10:21:16 +12:00
Ingo Schommer
2b31f4aa15 API New commit tagging rules in contrib guidelines 2012-06-27 00:07:47 +02:00
Ingo Schommer
218037b8cf Add .dropdown class to CountryDropdownField to make it use chosen.js 2012-06-26 17:56:07 +02:00
Ingo Schommer
a9fa281723 Form field docs update (fixes #7521) 2012-06-26 15:03:11 +02:00
Ingo Schommer
56a3777c42 MINOR Improved upgrading docs (fixes #7508) 2012-06-26 13:49:06 +02:00
Naomi Guyer
d935a74e31 ENHANCEMENT: Modify GridFieldLevelup to be more reusable 2012-06-26 13:34:49 +02:00
Sam Minnée
c3877075b9 Merge pull request #541 from ajshort/custompagination 
ENHANCEMENT: Add method to disable automatic limiting on PaginagedLists.
 2012-06-25 15:15:52 -07:00
mightycoco
84d97b6d2a BUGFIX updated oembedUrl app_category check 2012-06-25 17:23:26 +02:00
mightycoco
e582935582 BUGFIX insertion of images (trac #7438) 
Allow insertion of images via oEmbed dialog using a direct url
 2012-06-25 17:19:15 +02:00
mightycoco
e2d7352c81 ENHANCEMENT File::get_app_category() 
Adding File::get_app_category to be in line with
File::get_file_extension
 2012-06-25 17:13:18 +02:00
Ingo Schommer
6dc108ac3e Merge pull request #570 from adrexia/7528-insert-link 
BUGFIX: Insert link styling inconsistent with Insert media (fixes #7528)
 2012-06-25 06:24:30 -07:00
Ingo Schommer
3a54d4a209 Merge pull request #571 from adrexia/7541-dialog 
BUGFIX: Min-width on html dialog box (fixes #7541)
 2012-06-25 06:15:08 -07:00
Ingo Schommer
340a161e90 MINOR Updated translations 2012-06-25 09:23:32 +02:00
Naomi Guyer
5c6ec68389 BUGFIX: Min-width on html dialog box (fixes #7541) 2012-06-25 17:35:05 +12:00
Naomi Guyer
e51bf760e9 BUGFIX: Insert link styling broken, and inconsistent with Insert media (fixes #7528) 2012-06-25 15:31:39 +12:00
Sam Minnée
609eaba0ca Merge pull request #568 from simonwelsh/applyRelation-fixor 
FIX DataQuery::applyRelation was returning the base class.
 2012-06-24 16:57:34 -07:00
Simon Welsh
070ba56104 FIX DataQuery::applyRelation was returning the base class. 
If the applyRelation() was passed a relation that went to a class with a parent
class with a database table, applyRelation would return the name of the parent
class, rather than the class the relation was actually too.
 2012-06-25 11:34:02 +12:00
Ingo Schommer
8c5c9228cf MINOR Changelog 2012-06-25 01:12:37 +02:00
Ingo Schommer
5d39c4d7b0 MINOR Updated translations 2012-06-25 00:23:50 +02:00
Ingo Schommer
9b22eb06fc Merge branch 'master' into translation-staging 2012-06-25 00:08:00 +02:00
Sam Minnée
2c5f4201b7 Merge pull request #566 from pitchandtone/patch-4 
Added nginx buffer size
 2012-06-24 15:05:41 -07:00
Sam Minnee
7685a0b59d Merge branch '3.0' 2012-06-25 10:01:34 +12:00
Ingo Schommer
ba9c3c7b8e BUGFIX Type checking in CMS URL params (fixes #7187) 
Nasty issue where nested requests to sub-controllers within LeftAndMain->EditForm() would fail because of
LeftAndMain->currentPageID() being taken from the URL, even though it was a field action name.
Example: POST /admin/pages/edit/EditForm/field/MyGridField/item/1/ItemEditForm/field/MyUploadField/upload
The current ID would be detected as "field" in this case.
Bug was previously fixed for AssetAdmin.
 2012-06-22 17:47:45 +02:00
Ingo Schommer
3e7bf77a70 MINOR Translation process docs 2012-06-22 15:07:25 +02:00
Ingo Schommer
f7cec02c3c MINOR Updated translations master 2012-06-22 11:30:52 +02:00
John Milmine
a997099120 I found that I needed to increase nginx buffer size to accommodate the size of the ajax requests 2012-06-22 21:09:48 +12:00
Ingo Schommer
682a6a0d1b BUGFIX "Insert media" loading indicator (fixes #7542) 
No "working" indicator in insert media from web button.
Returning the $.ajax object to allow for deferred callbacks
on events other than 'success'
 2012-06-22 10:25:15 +02:00
Naomi Guyer
5713a37a32 BUGFIX: Alignment of http label in insert media 2012-06-22 18:11:00 +12:00
Sam Minnée
f17bb8f52c Merge pull request #561 from adrexia/7497-file-upload-fixes 
BUGFIX: Make alignment of step 1 consistent in Insert Media panel (fixes #3 of #7497)
 2012-06-21 23:09:39 -07:00
Naomi Guyer
f01c1640c7 BUGFIX: Alignment of http label in insert media 2012-06-22 18:04:13 +12:00
Sam Minnee
4aa4cd2c28 Merge branch '3.0' 
Conflicts:
	admin/scss/ie7.scss
 2012-06-22 17:20:07 +12:00
Naomi Guyer
cffb95280f BUGFIX: Tab colour htmleditor in IE7 2012-06-22 17:10:52 +12:00
Naomi Guyer
f3933aa3fb BUGFIX: Make entire tab clickable in htmleditor (fixes #7407) 2012-06-22 17:10:52 +12:00
Sam Minnée
e169fdc6c2 Merge pull request #565 from adrexia/7407-insert-media-tabs 
BUGFIX: Make entire tab clickable in htmleditor (fixes #7407)
 2012-06-21 22:09:45 -07:00
Naomi Guyer
89bd7ebfba BUGFIX: Tab colour htmleditor in IE7 2012-06-22 16:55:40 +12:00
Sean Harvey
32913d47f0 Merge pull request #564 from sminnee/trac-7529 
BUG: exclude() clears previously selected filters() (Trac #7529)
 2012-06-21 21:45:34 -07:00
Sam Minnee
1b5768975c BUG: exclude() clears previously selected filters() (Trac #7529) 
This bug was caused by the fact that SQLQuery::whereAny() removed existing filters.  In line with addWhere() and setWhere(), I split this into addWhereAny() and setWhereAny().  Strictly speaking, this drops the method SQLQuery::whereAny(), but it was really just an internal function for exclude, and so I think that's acceptable.
 2012-06-22 16:31:29 +12:00
Naomi Guyer
c2e8c2450d BUGFIX: Make entire tab clickable in htmleditor (fixes #7407) 2012-06-22 16:23:01 +12:00
Sam Minnée
f3b8469f33 Merge pull request #559 from silverstripe-rebelalliance/feature/countrydropdownfield 
ENHANCEMENT: Add back CountryDropdownField
 2012-06-21 19:29:59 -07:00
Sam Minnée
bafda93957 Merge pull request #563 from silverstripe-rebelalliance/trac/7427-add-responses 
BUGFIX: Add batch handler status messages (fixes #7427)
 2012-06-21 19:29:41 -07:00
Hamish Friedlander
03469230ff BUGFIX: Add batch handler status messages (fixes #7427) 
7427 was mostly fixed by Ingos previous patch. But two batch actions, delete from draft site and delete from published site werent returning
status messages. Abstracted out the status preperation code that the batch actions that were returning status messages were using, and
used that to add status messages to the problem two
 2012-06-22 13:59:08 +12:00
Sam Minnée
5e47159a52 Merge pull request #562 from silverstripe-rebelalliance/bugfix/themedcss 
Make themedCSS use {theme}_{module}/css/{name}.css files if they exist
 2012-06-21 18:41:07 -07:00