Sean Harvey
fbc6e3366b
Merge branch '3.0'
2012-11-05 15:11:48 +13: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
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
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
Simon Welsh
8a0f234acf
Merge pull request #870 from chillu/pulls/datalist-filterany
...
NEW DataList->filterAny()
2012-11-02 16:17:48 -07:00
Saophalkun Ponlu
9fe99cfec9
Batch actions UI enhancement ( #7878 )
2012-11-02 22:57:14 +01:00
Ingo Schommer
70352fba32
Merge pull request #880 from adrexia/fileoverview
...
BUG: File Uploading Notifications (fixes #7883 )
2012-11-02 14:08:16 -07:00
Ingo Schommer
de987b017d
Merge pull request #918 from adrexia/7965-autocomplete
...
BUG: GridField add existing auto complete has no max height (fixes #7965 )
2012-11-02 11:30:02 -07:00
Sean Harvey
2c5c4886b0
Set method visibility to public in FileNameFilterTest
2012-11-02 14:02:22 +13:00
Naomi Guyer
95b5f6541f
BUG: GridField add existing auto complete has no max height ( fixes #7965 )
...
Added a maxheight to the ui-autocompleter, as used in gridfield, and
specified what to do with overflow.
2012-11-02 13:36:51 +13:00
Justin Martin
a651d730f2
BUG: DataObject::__construct() now accepts stdClass for $record
2012-11-01 16:57:07 -07:00
Naomi Guyer
2dabaebad8
BUG: File Uploading Notifications ( fixes #7883 )
...
Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
2012-11-02 12:46:16 +13:00
Stig Lindqvist
a29bca3aa4
Merge pull request #901 from halkyon/filenamefilter_underscores_fix
...
BUG FileNameFilter should remove any amount of underscores from start of...
2012-11-01 13:51:51 -07:00
Sean Harvey
cd29b8c74c
Adding additional tests for special characters in FileNameFilterTest
2012-11-02 09:34:34 +13:00
Sean Harvey
ead563c07f
Merge pull request #916 from chillu/pulls/current-dir-include-path
...
BUG Inspect current directory for include_path
2012-11-01 13:27:04 -07:00
Ingo Schommer
43cd54bb25
Added composer.json
2012-11-01 17:28:51 +01:00
Ingo Schommer
3213a6baa3
Added composer.json
2012-11-01 17:21:12 +01:00
Ingo Schommer
a5fd3cf985
BUG Inspect current directory for include_path
...
This fixes problems where require/include calls rely
on the relative file path, e.g. in i18n.php.
Followup from https://github.com/silverstripe/sapphire/pull/904
2012-11-01 10:10:06 +01:00
Ingo Schommer
18d691b570
Merge pull request #914 from adrexia/refactor-sitetree
...
BUG: Site Tree checkboxes and refactoring
2012-11-01 01:27:24 -07:00
Ingo Schommer
48b93312c4
Merge pull request #908 from chillu/pulls/xmldataformatter-canview
...
API Removed permission checks from XML/JSON data formatters
2012-11-01 01:21:47 -07:00
Simon Welsh
0b279a2cbc
Changes ping to POST and clears Requirements for ping
...
GET requests can, and do, get cached. Using POST forces them not to.
Clears requirements so that the SecurityAdmin JS isn't injected.
2012-11-01 21:15:43 +13:00
Naomi Guyer
eb23f502b5
BUG: Site Tree checkboxes and refactoring
...
* Increased height of site tree checkbox by 3px, so users are less
likely to miss it and load a page by mistake
* Refactored _tree.scss to make better use of SCSS, and stop repetition
of styles
2012-11-01 15:26:46 +13:00
Sam Minnée
7d095a12e9
Merge pull request #912 from chillu/pulls/7980
...
BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load (#7...
2012-10-31 16:36:33 -07:00
Ingo Schommer
bcbf4636fc
BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load ( #7980 )
...
The existence of .ss-tabset triggers JS which applies $.tabs(),
and in turn interprets the first available link as the tab navigation.
jQuery UI subsequently tries to ajax-load this link, which is not
desired. Instead, $.tabs() should *only* be applied to a container
DOM element with .cms-tabset applied.
2012-11-01 00:25:13 +01:00
Ingo Schommer
f861ff9dfa
Merge pull request #874 from adrexia/gridfield-wrap-fix
...
BUG: Force gridfield to wrap on long content
2012-10-31 15:36:34 -07:00
Ingo Schommer
15a092a3e9
Merge pull request #911 from chillu/pulls/formfield-extraclass
...
BUG FormField->removeExtraClass() works on indexed arrays
2012-10-31 15:34:29 -07:00
Ingo Schommer
c090b316d1
Merge pull request #913 from adrexia/fix-style-scss
...
BUG: One too many brackets in _style.scss
2012-10-31 15:29:20 -07:00
Ingo Schommer
80f40c6070
Merge pull request #907 from stojg/docs-forms-7727
...
MINOR: Fixes to the topics/forms.md
2012-10-31 15:19:29 -07:00
Naomi Guyer
2a67715327
BUG: One too many brackets in _style.scss
...
Caused when merging 3.0 back into master
2012-11-01 11:16:13 +13:00
stojg
5ca1d5b228
BUG Fixes to the topics/forms.md documentation
...
- Added an example on how to setup a controller with a form
- Notice about adding form methods to $allowed_actions
- Using the FormField::create() in all examples
- Corrected some errors in the examples that did not work
- Aligned docs to use 120 chars lines
2012-11-01 11:14:06 +13:00
Ingo Schommer
2d04de0377
BUG FormField->removeExtraClass() works on indexed arrays
...
Was assuming an associative map, which isn't the case
in the current implementations.
2012-10-31 15:44:57 +01:00
Ingo Schommer
d342794cfe
BUG Fixed intermittent absence of UploadField "drop" area
...
Only occurs when the UploadField resources are loaded uncached.
Possible cause: Randomized application between UploadField.js
setting "display: block" and UploadField.css setting "display: none". Simply hiding the element before showing it fixes the issue.
2012-10-31 11:34:12 +01:00
Ingo Schommer
d54b1b4d86
API Removed permission checks from XML/JSON data formatters
...
Please handle those checks in the logic using the formatters
instead. Applied permission checks to its primary use case,
the "restfulserver" module.
2012-10-30 23:34:29 +01:00
Ingo Schommer
da4534bda8
Removed duplicate assertion comments in DropdownFieldTest
2012-10-30 22:46:33 +01:00
Ingo Schommer
666a20fde9
Fixed DropdownFieldTest assertions when tidy is not available
...
It was setting a NULL empty string when constructing the field,
which shouldn't call setEmptyField() in the first place.
This logical error somehow just surfaced when the HTML output
wasn't run through tidy.
See https://github.com/silverstripe/sapphire/pull/886
2012-10-30 22:46:33 +01:00
Ingo Schommer
b32e411228
Merge pull request #906 from martinduparc/3.0
...
Update thirdparty/jquery-ui/datepicker/i18n/jquery.ui.datepicker-en.js
2012-10-30 11:28:11 -07:00