TeamCity
d447526947
Merge remote branch 'origin/master' into translation-staging
2012-10-05 15:54:56 +13:00
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
TeamCity
95057bba1e
Updated translations
2012-10-05 03:04:39 +13:00
TeamCity
e9ece6a908
Updated translations
2012-10-05 00:30:01 +13:00
TeamCity
f148dca8ca
Updated translations
2012-10-04 23:31:10 +13:00
TeamCity
90932ee5aa
Updated translations
2012-10-04 22:19:47 +13:00
TeamCity
83bae90b08
Updated translations
2012-10-04 21:21:09 +13:00
TeamCity
1171060442
Updated translations
2012-10-04 20:21:53 +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
TeamCity
e358eac22f
Updated translations
2012-10-04 19:19:53 +13:00
TeamCity
4d7512c541
Updated translations
2012-10-04 18:27:07 +13: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
TeamCity
9746aa85d5
Updated translations
2012-10-04 16:21:48 +13:00
TeamCity
b090081ca8
Updated translations
2012-10-04 15:19:32 +13:00
TeamCity
252cba912a
Updated translations
2012-10-04 13:19:40 +13:00
TeamCity
efa676e16f
Updated translations
2012-10-04 11:19:49 +13:00
TeamCity
936f78a079
Merge remote branch 'origin/master' into translation-staging
2012-10-04 05:14:11 +13:00
Ingo Schommer
fb5e488103
Line length fixes
2012-10-03 18:11:31 +02:00
TeamCity
ff6326b507
Updated translations master
2012-10-04 04:28:07 +13:00
TeamCity
1e31e4d2c1
Merge remote branch 'origin/master' into translation-staging
2012-10-04 04:27:42 +13: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
TeamCity
fc9433f4c7
Updated translations
2012-10-03 23:18:30 +13:00
TeamCity
098c461f3c
Updated translations
2012-10-03 22:18:23 +13: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
TeamCity
745533f676
Updated translations
2012-10-03 02:55:44 +13:00
TeamCity
444356e8d4
Updated translations
2012-10-03 00:18: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
TeamCity
a0ca1f6707
Updated translations
2012-10-01 00:18:23 +13:00
TeamCity
7e059a70d3
Updated translations
2012-09-30 23:18:44 +13: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
