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,344 Commits 31 Branches 527 Tags 162 MiB
c0a122613e
Commit Graph

10344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Harvey
fe65da7250 Merge pull request #863 from tractorcow/3.0-security-DI-fixes 
BUG: Fixed use of DI in the Security controller
 2012-10-10 18:04:43 -07:00
Damian Mooyman
c99991ba7a BUG Dummy Page_Controller initiated during login now is correctly initialised via dependency injection 2012-10-11 13:45:54 +13:00
Sam Minnée
7023669754 Merge pull request #775 from simonwelsh/exclude-filter 
Exclude filter
 2012-10-09 15:58:19 -07:00
Sean Harvey
fca9831e66 Remove end php tag from TemplateIteratorProvider 2012-10-10 11:15:55 +13:00
Simon Welsh
c49f7566c3 API Allow use of :not, :nocase and :case modifiers to SearchFilters. 
More modifiers can be added to each class as desired.
 2012-10-10 10:26:47 +13:00
Ingo Schommer
e9cf4affc7 Merge remote-tracking branch 'origin/3.0' 2012-10-09 09:32:43 +02:00
Simon Welsh
40276fdd32 Merge pull request #859 from sminnee/break-up-contributing-docs 
Break up contributing docs
 2012-10-08 19:08:37 -07:00
Sam Minnee
9e7b8baecf Point people at silverstripe-dev and not the forum for discussing patches. 2012-10-09 14:53:48 +13:00
Sam Minnee
7d203a9af1 Moved all translator-targeted documentation to contributing/translation and left translation-process for advanced topics relating to module maintainers and the core team. 2012-10-09 14:53:47 +13:00
Sam Minnee
c4d2f9e6b2 Corrected a number of inbound links pointing to the documentation. 2012-10-09 14:53:47 +13:00
Sam Minnee
c28dd4c24b Make the copyright assignment clearer, and gave some explanation of why we do this. 2012-10-09 14:53:45 +13:00
Sam Minnee
65d20e4acc Simplified some of the code contribution guidelines. 
The current guides have a few areas where they recommend an approach that is more complex than what most people take.

 - Rebase straight onto upsteam/msaster
 - Force push a rebased branch

I also fixed the conflict resolution help to be relevant to rebase commands, and kept the push instruction out of the rebase instruction.
 2012-10-09 14:53:45 +13:00
Sam Minnee
433d29ce7b Removed 'release candidate branch' step of contributing. 
I don't know what that release candidate branch stuff is, but:

 * I've never seen any of the core team do it
 * I think it's overkill for most patches
 * I think it's being too prescriptive: if contributors want to do that, that's cool, but it doesn't affect the core team.
 * It makes our contributing guidelines more complex than they need to be.
 2012-10-09 14:53:44 +13:00
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 &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