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,667 Commits 31 Branches 527 Tags 162 MiB
54237d5b10
Commit Graph

10667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
62adea5882 Merge pull request #851 from Juanitou/patch-2 
Update docs/en/reference/dataextension.md
 2012-10-07 12:32:28 -07:00
Juan Molina
2c480ed94e Update docs/en/reference/dataextension.md 
Removed ForumRole broken link and minor typo.
 2012-10-07 18:11:40 +03:00
Ingo Schommer
2034927d31 Merge pull request #850 from willmorgan/patch-2 
Fixed grammatical error for Form.FIELDISREQUIRED
 2012-10-05 10:28:07 -07:00
Will Morgan
1c7b7d0ab5 Fixed grammatical error for Form.FIELDISREQUIRED 2012-10-05 18:04:38 +02:00
Ingo Schommer
be13ba3ef9 Removed 'built-in page controls' links from docs 
See https://github.com/silverstripe/sapphire/pull/842, thanks Juanitou!
 2012-10-05 17:39:19 +02:00
Ingo Schommer
890bac8de3 Docs: GridFieldDeleteAction 2012-10-05 17:39:19 +02:00
Ingo Schommer
a259eaee53 Merge pull request #846 from normann/ea_cherry_pick 
commits that has been cherry picked from custom project
 2012-10-05 08:14:45 -07:00
Normann Lou
9aaa6b1a7b ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty. 2012-10-05 17:00:39 +13:00
Normann Lou
1fca4911e1 BUGFIX: replace 'sapphire' with 'framework' in those legacy fields: TableField, TableListField and ComplexTableField. 2012-10-05 16:54:14 +13:00
Jeremy Bridson
ad7383a58d ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change. 2012-10-05 16:30:47 +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 &nbsp; characters immediately
after anchors, e.g. <a name="test"></a>&nbsp; - this fix stops
TinyMCE from adding those extraneous &nbsp; 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