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
13,819 Commits 31 Branches 527 Tags 162 MiB
f83c8f0821
Commit Graph

13819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
7c2eee116f BUG Fix 'undefined index 0' 2014-08-14 12:24:56 +12:00
Sean Harvey
f8a77eeace Merge pull request #3385 from mateusz/viewable-data-getter 
API Add a getter for customisedObject property.
 2014-08-14 11:45:35 +12:00
Mateusz Uzdowski
784e292d4e API Add a getter for customisedObject property. 
This is the only way to see if the ViewableData has been customised,
and is useful in situations when you want to further customise an
already-customised object.
 2014-08-14 10:28:00 +12:00
Mateusz Uzdowski
efbc3b3a81 Move the link-tracking into the cms to remove the SiteTree dependency. 
Depends on 8996b67c13a773c3339f45d91bf2378a39e5178a in the cms module.
 2014-08-14 10:13:14 +12:00
Sean Harvey
976efd6fc2 Merge pull request #3383 from dhensby/pulls/fix-send-file-header 
Fixing header case in `send_file`
 2014-08-14 10:06:22 +12:00
Sean Harvey
fcb3f2c13b Merge pull request #3380 from silverstripe-rebelalliance/cwp171 
NEW: Sanitise task name in runTask
 2014-08-14 09:56:35 +12:00
Sean Harvey
5cd85f6496 Merge pull request #3379 from mateusz/merge-back 
Merge 3.1 back
 2014-08-14 09:44:07 +12:00
Mateusz Uzdowski
8bf3853887 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
 2014-08-14 09:08:26 +12:00
Daniel Hensby
4d7c6a206a Fixing header case 2014-08-13 17:28:36 +01:00
Kirk Mayo
62f4fdb651 NEW: Sanitise task name in runTask 2014-08-13 17:29:12 +12:00
Damian Mooyman
0b6c68f903 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-12 16:28:39 +12:00
Damian Mooyman
a8685d0aa6 Fix link 2014-08-12 15:12:44 +12:00
Damian Mooyman
2b25ab37f6 3.1.6-rc2 docs 2014-08-12 15:09:13 +12:00
Damian Mooyman
98907fb35f BUG Fix incorrect parsing of HTML content 2014-08-12 13:02:49 +12:00
Damian Mooyman
a369094db7 BUG Fix issue with generating tree data for missing pages 2014-08-12 13:02:38 +12:00
Michael
8ab12567a8 Update shortcodes.md 
Replaced $args with $arguments as $args wasn't correct
 2014-08-12 13:02:24 +12:00
Elliot Sawyer
ee489582e9 Fix typo in sitetree.md 
Found a typo in the PHP class: StaggPage should be StaffPage
 2014-08-12 13:02:13 +12:00
Michael Parkhill
f19b1ee453 FIX declarations matching PHPUnit_Framework_Assert 
FIX for phpunit error message: ERROR [Strict Notice]: Declaration of SapphireTest::assertNotContains() should be compatible with PHPUnit_Framework_Assert::assertNotContains, and the same error for assertContains()
 2014-08-12 13:02:01 +12:00
colymba
e535c35542 API New JS sprintf and inject replacement functions 
Fix sprintf issues when replacement was at start of string + introduce
new inject function using injection map similar to the PHP version of
_t()
 2014-08-12 13:01:29 +12:00
JorisDebonnet
3b6fc08f0f Update customize-cms-menu.md 
Corrected a few typos.
 2014-08-12 13:00:09 +12:00
JorisDebonnet
af333bd40d Update dataobject.md 
There's no way to make things like [api:DataObject->beforeUpdateCMSFields()] work, is there?

I removed those kind of api tags (the links yielded a 404 page), and corrected a few other link-rendering issues.
 2014-08-12 12:59:44 +12:00
John Milmine
7d97df9db8 adding exclamation mark and question mark to delimiters, made text work the same as HTML Text 2014-08-12 12:59:21 +12:00
John Milmine
3e0d2cb646 Added hasMethod so that you can pass ArrayData to GridField 2014-08-12 12:58:39 +12:00
Shaun de Greeff
953992e896 Update composer.md 
Add a link to the Windows wamp page so that people will find info on how to install composer on windows more readily
 2014-08-12 12:57:51 +12:00
Stefan Neuser
f0ed9e78a9 Update customize-cms-tree.md 2014-08-12 12:57:16 +12:00
Sean Harvey
971449832c Merge pull request #3374 from tractorcow/pulls/3.1/fix-leftandmain-response 
BUG Fix incorrect parsing of HTML content
 2014-08-11 13:29:30 +12:00
Damian Mooyman
69de7e3fce BUG Fix incorrect parsing of HTML content 2014-08-11 11:47:14 +12:00
Sean Harvey
55dca6eec6 Merge pull request #3369 from tractorcow/pulls/3.1/fix-updatetreenodes 
BUG Fix issue with generating tree data for missing pages
 2014-08-09 11:57:37 +12:00
Will Rossiter
855e700689 Merge pull request #3372 from MichaelCSLWeb/patch-1 
Update shortcodes.md
 2014-08-09 10:09:28 +12:00
Michael
52624e7505 Update shortcodes.md 
Replaced $args with $arguments as $args wasn't correct
 2014-08-08 16:02:10 +01:00
Simon Welsh
95097a4a0e Merge pull request #3370 from silverstripe-elliot/patch-1 
Fix typo in sitetree.md
 2014-08-08 14:18:04 +10:00
Elliot Sawyer
c09638f057 Fix typo in sitetree.md 
Found a typo in the PHP class: StaggPage should be StaffPage
 2014-08-08 15:53:03 +12:00
Damian Mooyman
fbc7e7c264 BUG Fix issue with generating tree data for missing pages 2014-08-08 15:29:28 +12:00
Simon Welsh
61395b5618 Merge pull request #3238 from mparkhill/3.1 
FIX declarations matching PHPUnit_Framework_Assert
 2014-08-07 21:30:04 +10:00
Simon Welsh
9b8d07ca5b Merge pull request #3180 from colymba/i18n-js-injection-fix 
API New i18n JS sprintf and inject replacement functions
 2014-08-07 21:24:52 +10:00
Simon Welsh
5283700ae0 Merge branch 'JorisDebonnet-3.1' into 3.1 
Closes #3170
 2014-08-07 21:07:48 +10:00
JorisDebonnet
bde5301e41 Update customize-cms-menu.md 
Corrected a few typos.
 2014-08-07 21:05:08 +10:00
Simon Welsh
b3994cd456 Merge pull request #3168 from JorisDebonnet/patch-2 
Update dataobject.md
 2014-08-07 21:04:05 +10:00
Simon Welsh
a0211b5f50 Merge branch 'dnadesign-FirstSentancePunctationFix' into 3.1 
Closes #3159
 2014-08-07 21:01:40 +10:00
John Milmine
0a36951ab1 adding exclamation mark and question mark to delimiters, made text work the same as HTML Text 2014-08-07 21:01:23 +10:00
Simon Welsh
b9d306b07d Merge branch 'dnadesign-GridFieldFix' into 3.1 
Closes #3154
 2014-08-07 20:56:18 +10:00
John Milmine
e7d5537f34 Added hasMethod so that you can pass ArrayData to GridField 2014-08-07 20:55:34 +10:00
Shaun de Greeff
f64715b4c9 Update composer.md 
Add a link to the Windows wamp page so that people will find info on how to install composer on windows more readily
 2014-08-07 20:55:20 +10:00
Stefan Neuser
d4ad902aaf Update customize-cms-tree.md 2014-08-07 20:55:19 +10:00
Simon Welsh
a0a2aac6df Merge pull request #3094 from dhensby/patch-3 
Use Config nesting in `SapphireTest::useTestTheme()`
 2014-08-07 20:50:16 +10:00
Simon Welsh
54c93d432d Merge branch 'OpticBlaze-patch-1' into 3.1 
Closes #3330
 2014-08-07 20:19:30 +10:00
Shaun de Greeff
079e86163b Update composer.md 
Add a link to the Windows wamp page so that people will find info on how to install composer on windows more readily
 2014-08-07 20:19:14 +10:00
Simon Welsh
e92896016f Merge branch 'stefanX201-patch-3' into 3.1 2014-08-07 20:16:29 +10:00
Stefan Neuser
4be04921de Update customize-cms-tree.md 2014-08-07 20:16:11 +10:00
Simon Welsh
d7d7cf0280 Merge pull request #2703 from nyeholt/3.1 
AspectProxy updates
 2014-08-07 17:03:37 +12:00