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
11,041 Commits 31 Branches 527 Tags 162 MiB
f44d5b311e
Commit Graph

11041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
709f0f5d19 Merge pull request #1248 from kinglozzer/leftandmain_menu_preview_fix 
FIX: Prevent opening preview when clicking the link for current page again
 2013-03-07 09:46:48 -08:00
Ingo Schommer
634ba76353 Merge pull request #1249 from ryanwachtl/patch-1 
Update rich-text-editing.md
 2013-03-07 09:45:39 -08:00
miiihi
5af35a89ce ENHANCEMENT Allow multiline comments in SS3 templates 2013-03-07 18:45:07 +01:00
Ingo Schommer
d83950bc2b Merge pull request #1256 from g4b0/xhtml-xml-schema-not-required-31 
BUGFIX: Removed XHTML XML declaration requirement
 2013-03-07 09:43:20 -08:00
Ingo Schommer
58d0126538 Merge pull request #1257 from Zauberfisch/3.1.0-beta2 
BUGFIX: fixed file icon for uppercase file extensions
 2013-03-07 08:16:13 -08:00
Zauberfisch
00d01aa6e3 BUGFIX: fixed file icon for uppercase file extensions 2013-03-07 16:13:21 +00:00
g4b0
13b7386a2f BUGFIX: Removed XHTML XML declaration requirement 2013-03-07 11:35:24 +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
d57caa6477 Merge pull request #1247 from ajshort/mml-remove-filtered 
BUG: Fix ManyManyList->removeAll() when filters are applied to the query
 2013-03-04 00:55:45 -08: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
Hamish Friedlander
a6f1a200b6 Some micro-optimisations for Config 2013-03-04 09:25:23 +13:00
Ryan Wachtl
3d602998b1 Update rich-text-editing.md 
`HtmlEditorField::add_extension('MyToolbarExtension');` was not working for me. I had to use `HtmlEditorField_Toolbar`.
 2013-03-02 14:37:09 -06:00
ajshort
b537ee28a2 BUG: Fix ManyManyList->removeAll() when filters are applied to the query 
In order to be cross-database compatible and support filters, the IDs to
delete must be retrieved in a sub-query.
 2013-03-02 17:23:15 +11:00
Loz Calver
9a1ccd8a67 FIX: Prevent opening preview when clicking the link for current page again 2013-03-01 11:42:34 +00:00
Will Rossiter
1fef42681a Merge pull request #1246 from g4b0/dataobject-hack-removing 
Removed code "ad personam"
 2013-02-28 11:54:12 -08:00
g4b0
4bd235be8b Removed code "ad personam" 2013-02-28 16:50:53 +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
Daniel Hensby
9258485aeb API Adding setURL to HTTPRequest object 
The current RootURLController needs to be able to change the url of a
request, so I've added it.
 2013-02-28 08:50:53 +00:00
Hamish Friedlander
80bd38e1e9 FIX DataObjectSchemaGenerationTest trying to modify config statics directly 2013-02-28 09:43:34 +13:00
Hamish Friedlander
024a0b90a9 Add ability to create temporary Config copies 2013-02-28 09:43:33 +13:00
Hamish Friedlander
6b986cb17d Extract statics via code analysis rather than introspection 2013-02-28 09:43:33 +13:00
Hamish Friedlander
c98621977c Cache the merged version of any Config value in an in-mem LRU cache 2013-02-28 09:43:33 +13:00
Ingo Schommer
365e8021ba Merge pull request #1239 from ajshort/travis-composer-3.1 
Travis Composer Integration (3.1.x)
 2013-02-27 02:02:58 -08:00
ajshort
9920e5bc45 Update the Travis build versions to 3.1. 2013-02-27 20:36:18 +11:00
Ingo Schommer
39789529d7 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	tests/control/HTTPResponseTest.php
	tests/travis/before_script
 2013-02-27 10:27:22 +01:00
Ingo Schommer
64b465f0cb Merge pull request #1143 from svandragt/3.1 
ENHANCEMENT Sort menu items according to priority descending, then title ascending
 2013-02-27 01:25:49 -08:00
Ingo Schommer
af52de97e9 Merge pull request #1161 from chillu/pulls/uploadfield-replacefile 
NEW Upload->replaceFile setting
 2013-02-27 01:24:27 -08: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
Hamish Friedlander
904fd2d5dc API Make Object::config use late static binding 
Can now be used in instance scope, like:
  $this->config()->db
and in static scope, like:
  Page::config()->db
 2013-02-27 15:13:59 +13: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
bea1b9002d Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/HTTP.php
 2013-02-26 13:28:35 +01:00
Ingo Schommer
d888ea5e67 Updated translations 2013-02-26 13:15:00 +01:00
Sam Minnee
fc3239e2d6 Updated translations 2013-02-26 13:58:28 +13: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
efb4760244 Fixed invalid classname in test 2013-02-25 16:44:54 +13:00
Sam Minnee
88b3901a69 Check for object type before calling method, prevent fatal error in failing test. 2013-02-25 16:33:55 +13:00
Sam Minnee
b2dfa77056 FIX: Ensure that Director::test() doesn't return a string 2013-02-25 16:27:44 +13: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
Sam Minnee
5734c2b3de Merge branch 'refindex' of git://github.com/silverstripe-rebelalliance/sapphire into silverstripe-rebelalliance-refindex 
Conflicts:
	docs/en/reference/index.md
 2013-02-25 15:03:46 +13:00
Sam Minnée
b90e0c0955 Merge pull request #1230 from oddnoc/3.1-restfulservice-error-check 
BUG: Fetch curl_error in RestfulService
 2013-02-24 17:59:32 -08:00
Sam Minnée
da109a07c1 Merge pull request #1231 from oddnoc/3.1-restfulservice-option-merge-fix 
BUG: Correct semantic error regarding cURL options in RestfulService
 2013-02-24 17:59:08 -08:00
Sam Minnée
351f079a7e Merge pull request #1224 from silverstripe-rebelalliance/feature/shortcodes 
Two more small fixes for new Shortcode Parser
 2013-02-24 17:54:22 -08:00