Simon Welsh
5768e421dc
Merge branch '3.0'
2012-10-05 14:40:32 +13:00
Simon Welsh
8153326360
Merge branch 'tinymce_fancy_selectts' of https://github.com/halkyon/sapphire into 3.0
...
Conflicts:
admin/_config.php
2012-10-05 14:39:27 +13:00
Simon Welsh
b1902008a3
Merge pull request #843 from halkyon/tinymce_fixes
...
BUG Non-breaking space added automatically by TinyMCE on anchors
2012-10-04 18:33:45 -07:00
Sean Harvey
7901b02333
Use TinyMCE fancy selects for better usability selecting styles
...
This was previously disabled because of a bug in TinyMCE on
SilverStripe 2.3, but appears to have been resolved since then.
2012-10-05 14:18:30 +13:00
Sean Harvey
113545d177
BUG Non-breaking space added automatically by TinyMCE on anchors
...
Everytime TinyMCE is saved, it adds characters immediately
after anchors, e.g. <a name="test"></a> - this fix stops
TinyMCE from adding those extraneous after the anchors.
2012-10-05 14:14:59 +13:00
Ingo Schommer
daaa1b3147
Merge pull request #841 from drzax/log-enhancement
...
ENHANCEMENT Make it possible to extend SS_Log
2012-10-03 23:40:22 -07:00
Simon Elvery
de36063d15
ENHANCEMENT Make it possible to extend SS_Log
...
Using late static binding makes it possible to override SS_Log to create
logs which are separate to the main Silverstripe log but still use the
built in functionality.
Add test for SS_Log subclassing.
2012-10-04 16:34:20 +10:00
Sam Minnée
5d127e1254
Merge pull request #840 from silverstripe-rebelalliance/config_system_docs
...
NEW Add documentation for the new config system in 3.0
2012-10-03 20:37:31 -07:00
Hamish Friedlander
11f1c0a5c3
NEW Add documentation for the new config system in 3.0
2012-10-04 16:34:57 +13:00
Ingo Schommer
fb5e488103
Line length fixes
2012-10-03 18:11:31 +02:00
Ingo Schommer
56f7ce1dcf
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
control/Cookie.php
control/Director.php
control/HTTPResponse.php
model/Database.php
model/MySQLDatabase.php
model/SQLQuery.php
view/Requirements.php
view/SSViewer.php
2012-10-03 16:16:19 +02:00
Sam Minnee
323fd4aa0f
FIX: Fixed ef81318aea for PostgreSQL by quoting fields.
2012-10-03 15:34:39 +13:00
Sam Minnee
4e1b6af10f
Fixed long line.
2012-10-03 15:15:21 +13:00
Ingo Schommer
ef81318aea
BUG Retaining join extraFields on ManyManyList->add()
2012-10-03 14:58:28 +13:00
Damian Mooyman
4d392098a5
FIX: GridFieldPageCount now throws an exception if added to a gridfield with no gridfieldpaginator
2012-10-03 14:54:37 +13:00
Damian Mooyman
f265595c1e
NEW: GridFieldPageCount control for displaying the current page count/total in the gridview header. Designed to complement a functional pager in the grid footer.
...
NEW: GridFieldPageCount widget to default config settings
FIX: @extend .col_buttons in GridField.scss which was raising a warning
2012-10-03 14:54:37 +13:00
Ingo Schommer
b22a7afc03
BUG TreeDropdownField panel positioning
...
See https://github.com/silverstripe/sapphire/pull/809 , thanks martinduparc
2012-10-02 12:02:42 +02:00
Ingo Schommer
4684601c38
Fixed markdown whitespace usage
2012-10-02 11:38:16 +02:00
Ingo Schommer
fe4f0c92e2
Markdown line endings
2012-10-02 00:02:44 +02:00
Ingo Schommer
b3d4951a88
Merge pull request #836 from sminnee/line-endings-fix-3.0
...
Line endings fix
2012-10-01 14:59:04 -07:00
Sam Minnee
b7e7c165ff
NEW Amend Travis build to run a simple PHP_CodeSniffer test.
...
At this stage, the test just checks line-length and line-endings, but previous commits have ensured that framework actually passes those tests. We can add more tests as we actually correct the code to pass those tests, and grow the test suite, as we had for unit tests.
2012-09-30 17:28:46 +13:00
Sam Minnee
1f7fc1f76a
FIX Remove instances of lines longer than 120c
...
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit. This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
2012-09-30 17:18:13 +13:00
Sam Minnee
28bd939580
FIX: Ignore charset when checking mime types in LeftAndMain ajax responses.
...
This is partly a fix to #7574 , although quite different from the work Ingo did on Content-length. The text/json mime type occasionally gets a charset suffixed to it by the webserver, which broke everything.
A follow-on fix from this would be to get the PHP code to supply charsets more consistently, so that webservers don't have to make things up.
Additionally, the 2nd interpretation - which treats the response as text/html - should probably only happen if the response is text/html, and throw a more helpful error otherwise.
2012-09-30 16:32:22 +13:00
Sam Minnée
1a1740e563
Merge pull request #835 from chillu/pulls/7574
...
BUG Setting response length directly before output (fixes #7574 )
2012-09-29 18:15:00 -07:00
Ingo Schommer
356a367eb5
BUG Setting response length directly before output ( fixes #7574 )
...
Complying to HTTP1.1/RFC2616 in terms of when to
set 'Content-Length' in the first place
2012-09-29 17:24:33 +02:00
Ingo Schommer
b75c4b84ec
Localization for PermissionCheckboxSetField
2012-09-28 16:41:25 +02:00
Jeremy Bridson
07bc75c281
ENHANCEMENT: open/7881 - removed disabled checkboxes and replaced them with green ticks. Added help text above the list of permissions. Removed action buttons by fade out when user goes to users permissions tab.
2012-09-28 16:37:35 +02:00
Ingo Schommer
91e4fde96f
ENHANCEMENT "Readonly" behaviour for CMS tabs
2012-09-28 16:37:35 +02:00
Ingo Schommer
d504e9e634
Add .cms-tabset on all GridFieldDetailForm instances
...
This allows us to add cms behaviour consistently
2012-09-28 16:37:35 +02:00
Ingo Schommer
d50341d8cd
Rendering attributes for CMSTabSet.ss
...
Make behaviour consistent with parent template, Tabet.ss
2012-09-28 16:37:34 +02:00
Ingo Schommer
ea86b96fbb
Merge pull request #832 from halkyon/sitetree_children_disabled
...
BUG If a nested page editable but parent not, user can't expand tree
2012-09-28 06:38:26 -07:00
Ingo Schommer
ecbdab90ee
Merge pull request #834 from Firesphere/patch-2
...
Translation possible for clear before import
2012-09-28 05:44:09 -07:00
Simon Erkelens
f991401a52
Translation possible for clear before import
...
I couldn't figure out why it wouldn't translate...
2012-09-28 09:45:16 +03:00
Sam Minnée
d6b4606087
Merge pull request #831 from frankmullenger/3.0
...
BUGFIX: Old version of SimpleTest does not recognise input fields of type 'email'.
2012-09-27 17:28:17 -07:00
Sean Harvey
b186626b73
BUG If a nested page editable but parent not, user can't expand tree
...
If you're logged in as a specific user in a group who has view/edit
permissions of a page that has a parent page which doesn't have
permissions, you can't expand the tree node to get access to that
nested page.
This fixes LeftAndMain.Tree.js to allow expanding if there are
immediate children tree nodes that are not disabled. Also fixes
styling so that only immediate children nodes are greyed out.
Fixes this ticket: http://open.silverstripe.org/ticket/7913
2012-09-28 12:18:34 +12:00
Frank Mullenger
a602ba5941
BUGFIX: Old version of SimpleTest does not recognise input fields of
...
type 'email'.
2012-09-28 12:07:54 +12:00
Will Rossiter
a86b54b3ed
Update tutorial to include RSS feed API change.
2012-09-27 18:46:48 +12:00
Sam Minnée
de8f06b711
Merge pull request #828 from tractorcow/3.0-win-compatibility-fixes
...
3.0 win compatibility fixes
2012-09-26 21:14:38 -07:00
Damian Mooyman
d54ef36b47
FIXED: CSV Test cases now use platform-correct linebreak characters
2012-09-27 13:54:19 +12:00
Damian Mooyman
5ea2c3dc5a
FIXED: Unnecessarily strict comparison of path separators in windows filenames
2012-09-27 13:41:28 +12:00
Simon Welsh
7bd36eba66
Merge pull request #827 from sminnee/http-error-catching
...
API: Added 'onBeforeHTTPError' and 'onBeforeHTTPError<code>' extension p...
2012-09-26 18:00:17 -07:00
Sam Minnee
39952f4a5c
API: Added 'onBeforeHTTPError' and 'onBeforeHTTPError<code>' extension points to RequestHandler::httpError().
...
These APIs are primarily intended to let developers write custom 404 handlers. They can define an onBeforeHTTPError404() method on an Extension that gets added to Controller or RequestHandler.
The SS_HTTPResponse_Exception object has also been tidied up to override the status info of any SS_HTTPResponse object that might get passed. This is mainly to make it easier for callers (such as ContentController and ModelAsController) to use RequestHandler::httpError() more consistently.
2012-09-27 12:26:25 +12:00
Sean Harvey
e9ce89e1a0
Fixing broken FulltextSearchableTest
2012-09-27 12:06:04 +12:00
Sean Harvey
e4ab02e1c3
Merge branch '3.0'
2012-09-27 10:39:31 +12:00
Ingo Schommer
61148834f2
Merge pull request #824 from nyeholt/tab_null_pointer
...
BUG Fixed possible reference to null string
2012-09-26 02:31:13 -07:00
Ingo Schommer
33f67e1ad8
Fixed FulltextSearchable regression from 21a6390d
2012-09-26 11:28:25 +02:00
Howard Grigg
aa6f345d1d
API FormField::name_to_label() for unlabelled fields
...
Will convert camel case to spaces, e.g. "TotalAmount"
to "Total Amount".
2012-09-26 11:20:34 +02:00
Ingo Schommer
21a6390d7f
Merge pull request #817 from tractorcow/3.0-file-index-update
...
FIXED: Minor adjustment to order of file fulltext search fields.
2012-09-26 02:15:05 -07:00
Marcus Nyeholt
da70dc469c
BUG Fixed possible reference to null string
...
Hashlink for tabs in the backend didn't check the existence of
the href value before trying to .replace it.
2012-09-26 16:27:50 +10:00
Ingo Schommer
93c00ec80a
Merge pull request #819 from howardgrigg/patch-3
...
Correct brush name in template docs to avoid js popup
2012-09-25 05:33:04 -07:00
