Sam Minnee
439339d4fc
Broke up contributing docs into 4 sections and unified code contribtion guide.
...
The guidelines for contributing code were scattered across a section of contributing.md and collaboration-on-git.md. I've updated this to have separate contributing/code.md page with all the content in a single cohesive page. We also have contributing/documentation.md, contributing/issues.md and contributing/translation.md.
2012-10-09 14:53:39 +13:00
Simon Welsh
2faf7d112d
API Allow using SearchFilters in DataList::exclude()
2012-10-09 14:47:22 +13:00
Simon Welsh
79b3f8ac45
API Add exclude() method to SearchFilters that excludes items that match the filter.
2012-10-09 14:43:47 +13:00
Ingo Schommer
423f1844bd
Merge pull request #855 from kentvv/patch-1
...
Update docs/en/howto/extend-cms-interface.md
2012-10-08 14:30:03 -07:00
Sean Harvey
8351dc8c9c
Merge pull request #858 from chillu/pulls/tinymce-delayed-show
...
BUG Delay HTMLEditorField showing (TinyMCE workaround)
2012-10-08 13:00:13 -07:00
Ingo Schommer
680baab925
BUG Delay HTMLEditorField showing (TinyMCE workaround)
...
Delayed show because TinyMCE calls hide() via
setTimeout on removing an element,
which is called in quick succession with adding a new editor
after ajax loading new markup
See e0378ceb77
and https://github.com/silverstripe/sapphire/pull/847
2012-10-08 21:44:03 +02:00
Ingo Schommer
38e7df2e91
NEW Enable SiteTree::$nested_urls by default
2012-10-08 17:05:05 +02:00
Ingo Schommer
d1ee7612f5
Merge remote-tracking branch 'origin/3.0'
2012-10-08 16:48:52 +02:00
Saophalkun Ponlu
e3a27ea7da
CMS member profile now is no longer in a popup ( #7880 )
2012-10-08 12:57:55 +02:00
Ingo Schommer
b38cb39256
BUG Prevent CMS submission on disabled buttons ( #7928 )
...
Thanks @jbarrios for triggering this fix
2012-10-08 09:29:08 +02:00
kentvv
ef0cd7b428
Update docs/en/howto/extend-cms-interface.md
...
Minor changes to file links.
2012-10-08 13:11:33 +13:00
Simon Welsh
c782e00178
Merge pull request #854 from Juanitou/patch-3
...
Update docs/en/howto/simple-contact-form.md
2012-10-07 16:09:18 -07:00
Juan Molina
ab065b41bd
Update docs/en/howto/simple-contact-form.md
...
Minor code highlighting fix.
2012-10-08 00:11:57 +03:00
Sean Harvey
0cce58040a
BUG Fix deprecated use of dataFieldByName() in Member_Validator
2012-10-08 09:26:28 +13:00
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 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