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

10537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
c11b3918fc Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	core/PaginatedList.php
	email/Mailer.php
 2013-01-21 11:14:57 +01:00
Ingo Schommer
89176e8f5d Unescaped breadcrumbs for inline groups display (fixes #7936) 2013-01-21 08:51:16 +01:00
Kirk Mayo
d12ae82f70 Bug fix for open/8181 which stops the HTML source editor window saving/publishing 2013-01-21 08:26:19 +01:00
Tony Air
e1517044cf Application Name fix 2013-01-21 08:09:47 +01:00
Will Rossiter
3d921e7459 Update docs/en/reference/form-field-types.md 2013-01-20 19:51:18 +13:00
Ingo Schommer
fa35f3eb67 Merge pull request #1110 from sunnysideup/patch-9 
Update admin/code/ModelAdmin.php
 2013-01-19 01:39:53 -08:00
Nicolaas
7523fe4ef7 Update admin/code/ModelAdmin.php 
Changed "Clear Database before import" - which is incorrect (not the whole database gets wiped, only the data in the model at hand) with the simpler: "replace data".
 2013-01-19 22:38:55 +13:00
Sam Minnee
0c9b216894 FIX: Escape the -f argument passed to mail() 2013-01-18 11:24:23 +13:00
Ingo Schommer
e74ec57756 BUG Permission checkbox display on members (fixes #8193) 2013-01-17 19:36:53 +01:00
Ingo Schommer
432ff753c2 Wider side panel to fit "add" and "edit" button 
Moved "edit tree" button into same DOM structure so
we can layout them more easily through inline-block.

Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
 2013-01-16 00:38:24 +01:00
Ingo Schommer
dc43a6b0f6 Wider sidebar to accommodate "add" and "edit" buttons 
Conflicts:
	admin/css/screen.css
 2013-01-16 00:38:24 +01:00
Sean Harvey
5bd0f0accd Merge pull request #1102 from jthomerson/fix_paginatedlist_settotalitems 
BUG PaginatedList deprecated method was calling non-existent method
 2013-01-15 12:02:00 -08:00
Jeremy Thomerson
a70df3e472 BUG PaginatedList deprecated method was calling non-existent method 2013-01-15 13:25:16 -06:00
Ingo Schommer
014f541a89 BUG Regression in Form->clearMessage() (fixes #8186) 
See 729bcc9
 2013-01-15 14:25:07 +01:00
Ingo Schommer
64d3a3dafc BUG Don't double unescape URLs in history.js (fixes #8170) 
Merged in pull request https://github.com/balupton/history.js/pull/108.
This has been a serious problem with the library for more than a year,
see https://github.com/balupton/history.js/issues/228.
 2013-01-15 13:27:11 +01:00
Ingo Schommer
2ad56e1d52 Merge pull request #1100 from ajshort/grid-field-save-handler 
ENHANCEMENT: Add grid field save handler.
 2013-01-15 04:19:18 -08:00
Ingo Schommer
dadd9e1b98 Merge pull request #1098 from patbolo/fix/model-admin-spec 
FIX #8188 Properly show link for showing and hiding class spec in model admin
 2013-01-15 04:00:35 -08:00
Andrew Short
16efd7402e ENHANCEMENT: Add grid field save handler. 2013-01-15 22:41:25 +11:00
Ingo Schommer
dc4b2a4479 Merge pull request #1099 from uniun/patch-4 
Impossible to unselect TreeDropdownField
 2013-01-15 03:06:02 -08:00
uniun
e9ba54dec7 Impossible to unselect TreeDropdownField 
It was impossible to unselect TreeDropdownField.
'!' operator should not be used at all and identical comparison (===) was too "strict" (self.getValue() returns string but $(node).data('id') returns number).
 2013-01-15 11:29:35 +02:00
Ingo Schommer
2e6e0de44d Clarified DataList->limit() docs 2013-01-15 10:14:55 +01:00
jean
420c639e7b FIX Properly show link for showing and hiding class spec in model admin 2013-01-15 18:52:05 +13:00
Ingo Schommer
27d2f75d9d Added test for DataList filters with array and modifiers (see #8162) 2013-01-15 01:11:35 +01:00
Jeremy Bridson
a93f8841d7 BUGFIX:fixed broken styling of iframe in IE for member and group import 2013-01-15 00:57:47 +01:00
Ingo Schommer
80feb8c0b4 Respect displayFields in GridFieldPrintButton 
Provides more coherent and expected default behaviour
 2013-01-15 00:55:24 +01:00
Ingo Schommer
703c10aa0e Restored inlined styling of .fieldgroup (same UI as in 2.x) 2013-01-14 17:01:08 +01:00
Ingo Schommer
0a00fea334 Removed .fieldgroup styles specific to one UI use case 2013-01-14 16:59:22 +01:00
Ingo Schommer
f30277c3cf Split out getLinkAttributes() in .htmleditor JavaScript for more flexibility 
Saves us from overwriting the whole insertLink() method just
to add another option.
 2013-01-14 16:54:58 +01:00
Nathan Cox
fd80c4fb3e Issue #7818: Making sure UploadField can find the form/SecurityID on direct page load/refresh 2013-01-11 16:42:20 +01:00
micschk
7f605cfb54 NEW Disable items in DropdownField and GroupedDropdownField 2013-01-11 16:32:20 +01:00
Ingo Schommer
317495f8ef Merge pull request #1035 from zoao/3.0 
tinymce language portuguese is not working
 2013-01-11 07:11:54 -08:00
Ingo Schommer
3a1df46743 Merge pull request #1055 from stojg/bug-relField 
BUG Calling DataObject::relField() on a object with an empty relation list
 2013-01-11 07:09:55 -08:00
Fred Condo
4b182d3fad Update documentation of nginx configuration 
- Avoid using "if" to check for file existence (use try_files instead)
- Replicate the behavior of the .htaccess files
- TODO: get static error pages to work
 2013-01-11 15:54:49 +01:00
uniun
e020c7be57 BUG doSave() and doDelete() should use translated singular name 2013-01-11 15:50:09 +01:00
Ingo Schommer
e66408b0a7 Merge pull request #1044 from uniun/3.0 
BUG Hardcoded project name in include_by_locale()
 2013-01-11 06:46:20 -08:00
Ingo Schommer
42a73715cf Merge pull request #1051 from uniun/patch-3 
BUG removeRequiredField() should use array_splice() instead of unset()
 2013-01-11 06:45:35 -08:00
Ingo Schommer
1dcd9514f9 Merge pull request #1056 from kopymark/patch-2 
BUG: Accordion widget doesn't actually accept 'true' for 'active'
 2013-01-11 06:43:41 -08:00
Ingo Schommer
9b42dec932 Merge pull request #1072 from sunnysideup/patch-2 
adding extension hook in GridFieldDetailForm.php
 2013-01-11 06:37:27 -08:00
Ingo Schommer
7dda38742e Merge pull request #1071 from sunnysideup/patch-1 
Update forms/TextareaField.php: small edit to description of the field
 2013-01-11 06:37:01 -08:00
Ingo Schommer
e7e6c45aee Merge pull request #1082 from sminnee/form-improvements 
Form improvements
 2013-01-11 02:29:14 -08:00
Ingo Schommer
acc616b2ca Merge pull request #1080 from sminnee/caching-improvements 
Caching improvements
 2013-01-11 02:00:51 -08:00
Ingo Schommer
4f39af1a85 Merge pull request #1090 from sminnee/fix-get-one-case 
FIX: Fix DataObject::get_one() when the classname is passed with imprope...
 2013-01-11 01:42:29 -08:00
Ingo Schommer
f3c0669fec Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	_config/uploadfield.yml
	css/UploadField.css
	forms/UploadField.php
	scss/UploadField.scss
	templates/UploadField.ss
	tests/forms/uploadfield/UploadFieldTest.php
 2013-01-11 10:02:39 +01:00
Ingo Schommer
9e82d8e857 Fixed line lengths 2013-01-11 09:59:33 +01:00
Ingo Schommer
212c4f1e51 Fixed UploadField regression from 4da1af9c3 2013-01-11 09:30:21 +01:00
Sam Minnee
f8758bad6a FIX: Fixed margins so that margin is displayed between preview images and their title. 
Previously the margin was erroneously only shown for a drop zone.  It's possible that this bug only affects single-image uploads.
 2013-01-11 09:29:09 +01:00
Sam Minnee
5b450f7fea NEW: Added replaceExistingFile setting for UploadField. 
Sometimes has-one UploadFields can get confused about whether or not there is an existing file that needs deleting.  This setting lets you make a more robust has-one UploadField, where any existing file will be replaced.  It more closely mimics simple single-file upload fields.
 2013-01-11 09:29:06 +01:00
Sam Minnee
cc7318fde4 NEW: Added canAttachExisting config option for UploadField. 
This is the companion setting to canUpload, letting you control whether existing files from the asset store can be referenced.  It's particularly useful when using UploadField on the front-end.
 2013-01-11 09:29:02 +01:00
Sam Minnee
2fdd9a3b13 FIX: Allow images attached to UploadFields to be unlinked without File::canEdit() or File::canDelete() permission. 
Although editing meta-data or deleting permanently would require File editing/deleting permissions, merely linking to a record does not.  This change is important for allowing front-end use of UploadField; or, more importantly, use of UploadFile by people without CMS rights.
 2013-01-11 09:07:42 +01:00
Ingo Schommer
4da1af9c3f Show label-less input#file field in UploadField with canUpload=false 
The field carries the configuration, and some non-upload functionality
like "attach files" still relies on the fileupload jQuery plugin
being initialized.

Conflicts:
	templates/UploadField.ss
 2013-01-11 09:07:42 +01:00