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,176 Commits 31 Branches 527 Tags 162 MiB
74014650ed
Commit Graph

10176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
74014650ed Merge pull request #1205 from UndefinedOffset/3.0 
BUG Fixed issue with cms help toggles not functioning correctly
 2013-03-20 05:47:05 -07:00
Ingo Schommer
c3854e9e4c Merge pull request #1274 from simonwelsh/update-conventions 
Update conventions
 2013-03-20 03:56:45 -07:00
Ingo Schommer
72d5f3cf17 Composer contribution fork/upstream docs (fixes #8332) 2013-03-20 11:37:41 +01:00
Ingo Schommer
52ffb307a7 Fixed ValidationException handling in LeftAndMain 
getResult() isn't always available, and has the same content
as the native Exception->getMessage() anyway
 2013-03-19 14:02:28 +01:00
Ingo Schommer
99ca0471f7 Merge remote-tracking branch 'origin/2.4' into 3.0 
Conflicts:
	control/RequestHandler.php
	core/control/ContentController.php
	dev/CsvBulkLoader.php
	docs/en/changelogs/index.md
	docs/en/reference/execution-pipeline.md
	docs/en/topics/commandline.md
	docs/en/topics/controller.md
	docs/en/topics/form-validation.md
	docs/en/topics/forms.md
	docs/en/topics/security.md
	model/MySQLDatabase.php
	security/Security.php
	tests/control/ControllerTest.php
	tests/control/RequestHandlingTest.php
 2013-03-19 13:56:04 +01:00
Ingo Schommer
5cad7fe9e3 Merge pull request #1308 from ss23/patch-10 
BUG SQL Injection in CsvBulkLoader (fixes #6227)
 2013-03-19 05:03:56 -07:00
Stephen Shkardoon
143317cc86 BUG SQL Injection in CsvBulkLoader (fixes #6227) 
Diff should speak for itself, looks like this will have to be implemented in all supported branches.
 2013-03-20 00:45:05 +13:00
Simon Welsh
00bcdf39d3 Merge pull request #1305 from ss23/patch-8 
FIX $_COOKIES is not un-magic_quotes'd (fixes #6309)
 2013-03-19 02:35:30 -07:00
Stephen Shkardoon
9ac104b8c7 BUG $_COOKIES is not un-magic_quotes'd 
Added stripslashes_recursively to $_COOKIE (fixes #6309)
 2013-03-19 22:13:07 +13:00
Andrew Short
d36f9d6920 Merge pull request #1304 from simonwelsh/skip-sqlite 
Mark SQLite as an allowed failure until it works again
 2013-03-19 01:47:38 -07:00
Simon Welsh
2afa568d7e Mark SQLite as an allowed failure until it works again 2013-03-19 21:45:02 +13:00
Andrew Short
15d325633a Merge pull request #1289 from chillu/pulls/tree-node-limit 
FIX Respect tree node limits, fix search result node display
 2013-03-19 00:45:06 -07:00
Ingo Schommer
dd6f33ab37 FIX Respect tree node limits, fix search result node display 
- Renamed $minNodeCount to more accurate $nodeCountThreshold
- The $minNodeCount attribute wasn't properly respected
during actual querying, so SilverStripe would always traverse
the entire tree (and load all objects into memory),
before then marking nodes as "unexpanded", which prevents
them from actually being rendered.
- Fixes nodes on search results to be expanded by default
- Fixes nodes on search results to correctly ajax-expand
 2013-03-19 00:05:14 +01:00
Andrew Short
4ac9c23702 Merge pull request #1298 from ss23/patch-7 
Fix minor formatting issues
 2013-03-17 18:48:16 -07:00
Stephen Shkardoon
5f08ea3e6a Fix minor formatting issues 
Extra spaces in front of Action.
Removed the out of place text on GridField (is that meant to be a link or what?)
Missing a period on the end of some entries.
 2013-03-18 14:37:26 +13:00
Ingo Schommer
f4d16d01f8 Adjusted docs to "simple" theme (thanks Nadeeth Lansakara) 2013-03-17 20:58:06 +01:00
Ingo Schommer
79ac63c96d Merge pull request #1296 from ss23/patch-6 
Removed invalid characters
 2013-03-17 12:21:55 -07:00
Stephen Shkardoon
2ead2ba60f Removed invalid characters 
No idea what those characters were meant to be, so I removed them.
 2013-03-16 23:17:02 +13:00
Will Rossiter
50b0da9ba4 Merge pull request #1295 from ss23/patch-5 
Typo "nee" -> "need"
 2013-03-15 23:00:57 -07:00
Stephen Shkardoon
ad5a090847 Typo "nee" -> "need" 
Looks like Silverstripe needs the d.
 2013-03-16 17:15:50 +13:00
Simon Welsh
97df009a41 Correct spelling 2013-03-16 00:06:10 +13:00
Simon Welsh
0cc2aeb827 Update examples to match conventions 2013-03-16 00:06:10 +13:00
Simon Welsh
a772eb1528 Update coding conventions to match SilverStripe practices 2013-03-16 00:06:04 +13:00
Simon Welsh
6931073956 Merge pull request #1286 from ss23/patch-4 
Fixing formatting errors
 2013-03-13 15:34:47 -07:00
Stephen Shkardoon
38df64b69d Fixing formatting errors 
The usage of spaces instead of tabs causes the highlighting to display incorrectly on the docs.silverstripe.org site. I replaced them with tabs as they should be
 2013-03-14 11:23:00 +13:00
Ingo Schommer
30c0f82221 Merge pull request #1265 from danrye/patch-2 
Fixed link and added branch direction
 2013-03-09 02:40:31 -08:00
Will Rossiter
f021a0ce86 Merge pull request #1261 from chillu/pulls/validationexception-routing-3.0 
API Handle uncaught ValidationException on CMS controller execution
 2013-03-08 13:12:37 -08:00
Will Rossiter
3168b2c522 Merge pull request #1263 from danrye/patch-1 
Update module-development.md docs
 2013-03-08 13:09:51 -08:00
Dan
7d35d899fb Fixed link and added branch direction 
Broken link to edit docs, perhaps should link to repo instead of directory to avoid having a branch in the URL.  Also added blurb to clarify what branch doc edits should occur in.
 2013-03-08 10:24:49 -05:00
Dan
4a12d6db3c Minor: Two modules are listed as three. 
...for example "framework" and "cms". These three modules... Should be two modules, or perhaps there is a third missing from the list.
 2013-03-08 10:10:04 -05:00
Ingo Schommer
b81f39aee5 API Handle uncaught ValidationException on CMS controller execution 
This removes the need for a lot of boilerplate code
around DataObject->write() logic, and avoids generic 500 errors
on user-level failures. This should really be a per-project choice,
but at the moment request handling doesn't allow to configure
custom exception handling.
 2013-03-08 12:55:30 +01:00
Will Rossiter
693a92f9c9 Merge pull request #1254 from ryanwachtl/patch-2 
Update execution-pipeline.md
 2013-03-05 23:12:14 -08:00
Ryan Wachtl
957f4e75e8 Update execution-pipeline.md 
Corrected naming of SS_HTTPResponse variable. Improved readability of PHP code samples.
 2013-03-05 22:06:52 -06:00
Ingo Schommer
64888c07b7 Partially revert docs commit 7710cf59 
i18n.js doesn't support named parameters (yet)
 2013-03-04 08:48:16 +01:00
Ingo Schommer
2b6d735182 Using composer.lock for LeftAndMain->CMSVersion() 
See https://github.com/silverstripe/silverstripe-cms/pull/289 for context
 2013-02-28 13:38:19 +01:00
Ingo Schommer
e6fffb9ef9 API Remove content-length setting in HTTPResponse 
It's not reliable. Started in c69381c33, but only partially reverted.
 2013-02-27 10:07:54 +01:00
Ingo Schommer
7c0240cec1 Merge pull request #1238 from ajshort/travis-composer-3.0 
Travis Composer Integration (3.0.x)

Conflicts:
	tests/travis/before_script
 2013-02-27 10:02:07 +01:00
ajshort
65b463607e Update versions used in the Travis build. 2013-02-27 00:40:32 +11:00
ajshort
34d524c09f Integrate composer in the Travis build process 
Creates a package definition from the framework version being built,
and uses composer to install it into an installer project, as well
as the required modules for testing.
 2013-02-27 00:38:40 +11:00
Ingo Schommer
a8a10f8a1a BUG Transaction stub methods for better cross 2.x and 3.x compat 
The transactionStart() naming is 3.x, and used by some modules
which are otherwise still 2.x compatible.

Specifically, this was added to avoid branching the payment module
into separate 2.x and 3.x compatible branches.
 2013-02-26 13:49:46 +01:00
Ingo Schommer
d888ea5e67 Updated translations 2013-02-26 13:15:00 +01:00
Ingo Schommer
8423149819 Merge pull request #1233 from drzax/add-datepicker-chinese-locales 
Add zh-CN and zh-TW locale files for jQuery UI datepicker.
 2013-02-25 04:16:55 -08:00
Ingo Schommer
a61f5c1244 Fixed composer docs 2013-02-25 12:23:56 +01:00
Ingo Schommer
44cc467fc7 Note about vendor prefixes 2013-02-25 11:58:12 +01:00
Ingo Schommer
567e39cd19 Updated composer docs 2013-02-25 11:47:11 +01:00
Simon Elvery
384f173a7f Add zh-CN and zh-TW locale files for jQuery UI datepicker. 2013-02-25 16:54:27 +10:00
Sam Minnee
57952977c7 Merge branch 'refindex' of git://github.com/silverstripe-rebelalliance/sapphire into silverstripe-rebelalliance-refindex 
Conflicts:
	docs/en/reference/index.md
 2013-02-25 15:05:15 +13:00
Jeremy Bridson
de641dd544 ENHANCEMENT: updated the reference index on doc.silverstripe.com 3.0 - There were lots of broken and missing links 2013-02-22 12:58:29 +13:00
Ingo Schommer
67b2d3faa0 Added note on module translations 2013-02-20 13:32:27 +01:00
Ingo Schommer
094db0f4ab Fixed composer install instructions 
We've switched the installer to use @stable flags by default,
so those need to be explicitly removed when checking out a dev version.
 2013-02-20 13:25:44 +01:00