Loz Calver
903bbd5ae4
Merge pull request #4386 from tractorcow/pulls/3.1/fix-cli-errors
...
BUG Fix cookie errors when running in CLI
2015-07-14 09:48:39 +01:00
Loz Calver
11f9fe943c
Merge pull request #4395 from SpiritLevel/3.1
...
DOCS : added lesson 18 to index.md
2015-07-14 09:37:32 +01:00
David Alexander
7a1d370038
DOCS : added lesson 18 to index.md
2015-07-14 19:13:57 +12:00
Sam Minnée
48dfd0b64f
Merge pull request #4373 from tractorcow/pulls/3.1/textcollector
...
BUG Fix of multiple i18nTextCollector issues: #3797 , #3798 , #3417
2015-07-13 13:32:06 +01:00
Will Morgan
2c98ac7911
Merge pull request #4358 from tractorcow/pr/2978
...
Pr/2978
2015-07-13 10:47:00 +01:00
Damian Mooyman
c7bd50427a
BUG Fix cookie errors when running in CLI
2015-07-09 10:46:13 +12:00
Damian Mooyman
a556b4854a
BUG Fix of multiple i18nTextCollector issues: #3797 , #3798 , #3417
2015-07-09 10:45:08 +12:00
Loz Calver
0012bc68c4
Merge pull request #4379 from tractorcow/pulls/3.1/fix-allowed-hosts
...
BUG Fix issue when SS_ALLOWED_HOSTS is used in CLI
2015-07-08 14:32:18 +01:00
Damian Mooyman
5fa50039b9
Merge pull request #4381 from SpiritLevel/patch-2
...
Typo.
2015-07-08 17:15:00 +12:00
David Alexander
644b6b344f
Typo.
2015-07-08 14:40:42 +12:00
Damian Mooyman
5ace4905c9
BUG Fix issue when SS_ALLOWED_HOSTS is run in CLI
2015-07-08 11:01:06 +12:00
Ingo Schommer
31db269f71
Merge pull request #4285 from jonom/docs-contributing-cleanup
...
DOCS Contributing code cleanup
2015-07-08 09:10:06 +12:00
Daniel Hensby
d5e594fbd5
Merge pull request #4365 from tractorcow/pulls/3.1/travis
...
Use container-based travis
2015-07-07 12:02:16 +01:00
Damian Mooyman
2036f7e6c2
Use container-based travis
2015-07-07 16:50:40 +12:00
Damian Mooyman
6fabd0122b
BUG Fix potential XSS injection
2015-07-01 17:41:32 +12:00
Sean Harvey
fd755a7ff9
BUG ChangePasswordForm validation message should render HTML correctly.
...
HTML shows up in the form message escaped, but it shouldn't be.
2015-07-01 17:41:32 +12:00
Ingo Schommer
34539691f6
Merge pull request #4356 from jakxnz/patch-1
...
Define function as static (line 59)
2015-07-01 09:25:50 +12:00
Jackson
9cb64d48e3
Define function as static (line 59)
...
Not defining function on line 59 as static triggers php error: [Strict Notice] call_user_func() expects parameter 1 to be a valid callback, non-static method Page::ShortcodeColumns() should not be called statically
Note: PHP 5.5.12
2015-06-30 11:29:26 +12:00
Jonathon Menz
a39c2bd473
DOCS Contributing code cleanup
...
Fixed a few typos and formatting issues, and made git workflow diagram easier to read by hyperlinking it to itself. Also included a few lines from 3.2 branch.
2015-06-28 13:19:04 -07:00
Will Morgan
dcd378c539
Merge pull request #4349 from camfindlay/patch-27
...
DOCS Missing closing perenthesis
2015-06-26 09:05:31 +01:00
Cam Findlay
bee638eb6a
DOCS Missing closing perenthesis
2015-06-26 15:36:49 +12:00
Damian Mooyman
8e1da86bf1
Merge pull request #3982 from dhensby/pulls/safe-unnesting
...
Safe unnesting of Config and Injector
2015-06-26 10:08:29 +12:00
Hamish Friedlander
f5d6f20113
Merge pull request #4333 from sminnee/shortcode-fix
...
Allow shortcodes inside script tags. Fixes #4332 .
2015-06-25 14:51:03 +12:00
Sam Minnee
d7241958ff
Performance/reliability improvement for leaving unrecognised tags.
...
error_behaviour = self::LEAVE is the default behaviour. In this case,
we don’t even need to bother recognising such tags. Rather than
replacing with marker images and re-inserting the original text after
we’re done, we can leave them alone.
This should make the code faster and more reliable.
2015-06-22 11:31:12 +01:00
Sam Minnee
6d05c57881
Ensure that shortcodes inside script tags are parsed. Fixes #4332 .
...
The problem is that the marker images aren’t picked up by DOMDocument
if they are inserted into a <script> tag, due to the semantics of HTML.
This fix does an additional replacement after the marker images are
replaced in this way to pick up any leftover tags.
2015-06-22 11:29:12 +01:00
Daniel Hensby
ebeea242fe
Merge pull request #4125 from assertchris/clean-up-form-field
...
Clean up FormField
2015-06-20 16:30:44 +01:00
Christopher Pitt
4ba051409d
Cleaned up FormField
2015-06-20 13:55:58 +01:00
Daniel Hensby
aa3871d716
Merge pull request #4306 from gregsmirnov/pulls/3.1/fixed-datetimefield-setname-issue-4305
...
Issue #4305 : fixed DatetimeField::setName()
2015-06-18 22:10:13 +01:00
Daniel Hensby
20ebd88fb8
Merge pull request #4307 from gregsmirnov/pulls/3.1/test-timefield-value-at-12am-issue-1713
...
Test TimeField value at 12:00 am
2015-06-18 22:06:16 +01:00
Gregory Smirnov
5b22e3afc5
Test TimeField value at 12:00 am
2015-06-18 18:53:44 +02:00
Gregory Smirnov
66b1dd9154
Issue 4305: fixed DatetimeField::setName()
2015-06-18 18:36:02 +02:00
Daniel Hensby
4dec821f63
Merge pull request #4297 from SpiritLevel/patch-2
...
DOCS Update 03_Documentation.md
2015-06-18 12:00:49 +01:00
Daniel Hensby
8e96ea3f0f
Merge pull request #4302 from SpiritLevel/patch-6
...
Update index.md
2015-06-18 11:41:30 +01:00
Daniel Hensby
d3bcefba3f
Merge pull request #4304 from SpiritLevel/patch-5
...
Update 00_Issues_and_Bugs.md
2015-06-18 11:38:34 +01:00
David Alexander
a4ec9b5d4f
Update 00_Issues_and_Bugs.md
...
Corrected Documentation mailing list link.
2015-06-18 20:04:07 +12:00
David Alexander
0b7f24537f
Update index.md
...
Rewording.
2015-06-18 19:40:04 +12:00
Daniel Hensby
61b6776c99
Merge pull request #4298 from SpiritLevel/patch-4
...
Update 05_Translation_Process.md
2015-06-18 08:22:01 +01:00
David Alexander
dfc1c8df34
Update 05_Translation_Process.md
...
Typos.
2015-06-18 17:50:29 +12:00
David Alexander
08d8865704
Update 03_Documentation.md
...
Typos.
2015-06-18 17:42:55 +12:00
Damian Mooyman
21e891e28c
Merge pull request #4200 from cwchong/3.1
...
Bug fix: File->setName()
2015-06-18 16:37:56 +12:00
Damian Mooyman
5d9fa3d7fe
Merge pull request #4253 from swilsonalfa/fixcheckbox
...
Issue with empty CheckboxSetField value
2015-06-18 11:05:36 +12:00
Damian Mooyman
83c4ffda52
Merge pull request #4276 from hailwood/patch-2
...
Add 0 Based Position tip.
2015-06-18 11:04:11 +12:00
Damian Mooyman
9852676696
Merge pull request #4180 from assertchris/clean-up-grid-field
...
Clean up GridField
2015-06-18 10:47:36 +12:00
Damian Mooyman
438ee49cda
Merge pull request #4114 from assertchris/clean-up-nullable-field
...
Clean up NullableField
2015-06-18 10:28:57 +12:00
Damian Mooyman
a4aa0646f8
Merge pull request #4113 from assertchris/clean-up-numeric-field
...
Clean up NumericField
2015-06-18 10:25:54 +12:00
Daniel Hensby
4d855401bc
Merge pull request #4293 from scott1702/quick-fixes
...
Update styles for multi-selection button
2015-06-17 16:20:56 +01:00
Christopher Pitt
4ddc2d231c
Clean up GridField
2015-06-18 00:51:20 +12:00
Christopher Pitt
efcd64a314
Clean up NullableField
2015-06-18 00:44:04 +12:00
Christopher Pitt
47ae8ac7e9
Clean up NumericField
2015-06-18 00:42:24 +12:00
scott1702
6cc1c4580c
Update styles for multi-selection button
2015-06-17 22:22:59 +12:00
