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
Stig Lindqvist
edb8964722
Merge pull request #3348 from tractorcow/pulls/revert-3345-3323
...
Revert #3345 #3323
2014-07-31 17:34:51 +12:00
Damian Mooyman
c93e752abe
Merge pull request #3346 from mateusz/tdf-synthetic
...
BUG Add a synthetic event to workaround IE8 issues.
2014-07-31 17:28:06 +12:00
Damian Mooyman
a89dbd29e1
Revert #3345 #3323
2014-07-31 17:05:57 +12:00
Mateusz Uzdowski
d8302a0ab7
BUG Add a synthetic event to workaround IE8 issues.
...
Without this event it's not possible to hook into the value change in a
reliable way (panelhide event is called too many times to rely on it).
2014-07-31 15:38:47 +12:00
Damian Mooyman
c02ff14db8
Merge pull request #3345 from dhensby/pulls/test-for-3323
...
TEST Empty absolute urls - tests for #3323
2014-07-31 14:23:35 +12:00
Daniel Hensby
04e5c11ed9
TEST Empty absolute urls - tests for #3323
2014-07-30 23:22:37 +01:00
Damian Mooyman
37f88c8e1a
Merge pull request #3337 from jeffreyguo/pulls/expand-sitetree-node
...
Pulls/expand sitetree node
2014-07-31 08:38:43 +12:00
Jeffrey Guo
5519a026e8
expand a tree node and check a CMS tab
2014-07-30 17:17:08 +12:00
Sean Harvey
76f719c94b
Merge pull request #3323 from dhensby/patch-2
...
FIX Handle empty URLs that are made absolute
2014-07-30 15:42:34 +12:00
Sean Harvey
ab6bfa3800
Merge pull request #3332 from jedateach/fixes/image-backend-yaml
...
FIX: Allow configuring Image backend via yaml.
2014-07-30 15:40:12 +12:00
Sean Harvey
bab4a24f4b
Merge pull request #3344 from tractorcow/pulls/3.2/sslist
...
API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List
2014-07-30 15:38:07 +12:00
Damian Mooyman
26a0e91553
API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List
2014-07-30 11:07:01 +12:00
Simon Welsh
dd0e8f5cdb
Merge pull request #3341 from halkyon/summary_error_on_forbidden
...
BUG Fixing incorrect error message on failed UploadField upload
2014-07-29 11:50:09 +10:00
Simon Welsh
fb9f1bf35a
Merge pull request #3340 from halkyon/generic_error_missing
...
BUG AssetUploadField hides "generic" file upload messages.
2014-07-29 11:49:23 +10:00