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

13541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcus Nyeholt
2ca94e9869 DOC Added aspect oriented proxy documentation 2014-08-06 13:48:26 +10:00
Marcus Nyeholt
b273f3b524 API Updated aspect proxy service 
- Updated AspectProxyService to handle multiple handlers for each proxied
  object's methods.
- Changed BeforeCallAspect to allow for providing a return value that
  should be returned to the caller instead of the proxied return value
- Changed AfterCallAspect behaviour to allow for returning the value of
  the aspect to the caller instead of the proxied return value
 2014-08-06 13:48:26 +10:00
Marcus Nyeholt
b8f4576647 API Use injector to create database class 2014-08-06 13:48:25 +10:00
Damian Mooyman
9912410e7b Update documentation links 2014-08-05 16:14:39 +12:00
Damian Mooyman
259850477c Update release docs 2014-08-05 15:50:03 +12:00
Damian Mooyman
d42edae617 Added 3.1.6-rc1 changelog 2014-08-05 15:38:41 +12:00
Damian Mooyman
e3d4e79bba Update translations 2014-08-05 15:02:18 +12:00
Sean Harvey
28147c4a90 Merge pull request #3363 from tractorcow/pulls/3.1/maori 
Correct "Māori" to "te reo Māori"
 2014-08-05 08:56:25 +12:00
Damian Mooyman
8ff1a36de7 Correct "Māori" to "te reo Māori" 2014-08-05 08:26:22 +12:00
Hamish Friedlander
ca68f585cc Merge pull request #3361 from halkyon/number_type_numericfield 
API Use "number" HTML5 type for NumericField by default
 2014-08-04 16:02:13 +12:00
Sean Harvey
1759d5d017 API Use "number" HTML5 type for NumericField by default 2014-08-04 14:27:35 +12:00
Sean Harvey
dc06bd9239 Merge pull request #3360 from tractorcow/pulls/3.1/revert-3358 
Revert #3358
 2014-08-04 12:15:58 +12:00
Damian Mooyman
2c24d51c0b Revert #3358 2014-08-04 12:13:19 +12:00
Damian Mooyman
5503c1d7d9 Merge pull request #3359 from halkyon/escape_missing_att 
Fixed usage of .XML with .ATT for attributes in CheckboxSetField
 2014-08-04 10:31:25 +12:00
Sean Harvey
8c56e54a47 Fixed usage of .XML with .ATT for attributes in CheckboxSetField 2014-08-04 10:18:34 +12:00
Damian Mooyman
1e427a2509 Merge pull request #3358 from halkyon/escaping_options_in_fields 
BUG Fixed escaping of name/value in options of form fields
 2014-08-04 10:08:39 +12:00
Sean Harvey
b2dac644a0 BUG Fixed escaping of name/value in options of form fields 
DropdownField was currently escaping options, but CheckboxSetField and
OptionsetField were not. This fixes them to be consistent.
 2014-08-04 09:55:35 +12:00
Ingo Schommer
fc1eb1cfbc Merge pull request #3353 from tractorcow/pulls/3.2/fix-pdo 
BUG Fix PDOConnector issues
 2014-08-02 11:35:31 +12:00
Ingo Schommer
441a0c03f7 Merge pull request #3352 from mateusz/anchor-defer 
BUG Return the promise instead of the whole deferred object.
 2014-08-02 11:34:25 +12:00
Damian Mooyman
b0239f4330 BUG Fix PDOConnector issues 
Travis support for PDO
ATTR_EMULATE_PREPARES = false breaks some test cases
Enable username sans password
Remove unnecessary semicolons delimiting queries
 2014-08-01 18:17:51 +12:00
Mateusz Uzdowski
92810898ba BUG Return the promise instead of the whole deferred object. 2014-08-01 16:25:28 +12:00
Damian Mooyman
94f70a24cb Merge pull request #3347 from mateusz/plat-61 
Fix the anchor selector to load anchors from other internal pages.
 2014-08-01 12:11:24 +12:00
Mateusz Uzdowski
31c9fb52d1 BUG Fix the anchor selector to work for internal pages. 
Currently it will only default to pulling in anchors from the current
page, from the editor.
 2014-08-01 10:36:34 +12:00