Daniel Hensby
6b3ce8c546
Update composer.json
2015-07-03 17:21:04 +01:00
Damian Mooyman
7434ced82c
Merge pull request #4355 from flashbackzoo/pulls/ux-three-column-layout
...
Add three column layout to Page content view
2015-07-02 10:26:51 +12:00
David Craig
ae3fc84181
Add three column layout to Page content view
...
- Content filters included in SiteTree view
- View (tree/list) buttons included in SiteTree view
- Update view button styles for new layout
- Updated breadcrumbs for new layout
2015-07-02 10:22:24 +12:00
Sam Minnee
74d0622d43
Fix docs clobbered by 3.1 -> 3.2 merge.
2015-07-01 10:00:39 +01: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
Daniel Hensby
33d93c2a31
Fixing issues with HTTP cache control
2015-06-29 22:16:02 +01: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
Daniel Hensby
96f87b4140
Merge pull request #4335 from jonom/status-dots-colours-3.2
...
Different status dots for draft and modified
2015-06-28 08:04:01 +01:00
Jonathon Menz
74e6a67cfa
Different status dots for draft and modified
...
Added a colour difference for status dots so status of draft vs modified can be distinguished at a glance
2015-06-26 11:00:48 -07:00
Will Morgan
f4d75df62f
Merge pull request #4350 from SpiritLevel/patch-2
...
Update 07_Code_of_conduct.md
2015-06-26 13:46:09 +01:00
David Alexander
85967b8c16
Update 07_Code_of_conduct.md
...
Missed word...:)
2015-06-26 21:39:54 +12:00
Will Morgan
b6b8ab8c35
Merge pull request #4314 from SpiritLevel/patch-2
...
Update 07_Code_of_conduct.md
2015-06-26 09:14:55 +01:00
Will Morgan
bec7799957
Merge pull request #4345 from phillprice/patch-11
...
DOCS: Link to member custom code change is broken
2015-06-26 09:11:04 +01:00
Will Morgan
3ce51d15bf
Merge pull request #4331 from jason-zz/patch-2
...
Add extension hook for getManyManyComponents()
2015-06-26 09:09:22 +01: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
Jason
b5f88af1f0
Add extension hook for getManyManyComponents()
...
Call extension after DataModel is set
2015-06-26 11:04:31 +10: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
Phill Price
1bbcde908a
Broken link in using custom code for tracking member logging
2015-06-25 14:20:42 +01:00
Daniel Hensby
2e657baede
Merge pull request #4347 from kinglozzer/pulls/spinner-fix
...
Fix background size for spinner @2x
2015-06-25 13:25:08 +01: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
Damian Mooyman
d85590ddb9
Merge pull request #4348 from dhensby/pulls/3.2/fix-orphaned-passwords
...
FIX MemberPassword history removed with with Members
2015-06-25 09:14:09 +12:00
Daniel Hensby
3507ddb0e8
FIX MemberPassword history removed with with Members
...
Currently Members that were deleted would still have their passwords
stored in the DB even though they were deleted. This seems unnecessary
and just increases data that could potentially be compromised later.
2015-06-24 21:04:23 +01:00
Will Morgan
0514605cdc
Merge pull request #4346 from phillprice/patch-12
...
DOCS: Typo in a block
2015-06-24 15:31:35 +01:00
Loz Calver
3ebb73a675
Fix background size for spinner @2x
2015-06-24 12:04:21 +01:00
Phill Price
b2024107a9
DOCS: Typo in a block
2015-06-24 11:57:12 +01:00
Will Morgan
1f6a74cc71
Merge pull request #4344 from SpiritLevel/patch-3
...
DOCS: Corrected version of master in line 22.
2015-06-24 11:16:31 +01:00
David Alexander
fda2ad6600
DOCS: Corrected version of master in line 22.
2015-06-24 21:07:32 +12:00
Damian Mooyman
71249e0869
Merge pull request #4343 from scott1702/quick-fixes
...
Fix padding bug pushing out the 'post options' panel
2015-06-24 14:50:48 +12:00
scott1702
3bdae22f63
Fix padding bug pushing out the 'post options' panel
2015-06-24 11:53:38 +12:00
Will Morgan
21e45eed60
Merge pull request #4339 from SpiritLevel/patch-7
...
DOCS: typos, rewording, updated links.
2015-06-23 09:28:13 +01:00
Will Morgan
b7945eb251
Merge pull request #4338 from SpiritLevel/patch-5
...
DOCS: fixed broken link
2015-06-23 09:24:41 +01:00
Damian Mooyman
0ce92b0728
Merge remote-tracking branch 'origin/3.2' into 3
2015-06-23 17:35:29 +12:00
Damian Mooyman
3e1c156411
Merge pull request #4341 from flashbackzoo/pulls/add-page-nesting
...
Fix new page SiteTree nesting
2015-06-23 17:32:22 +12:00
David Craig
f6745a3feb
Fix new page SiteTree nesting
2015-06-23 16:53:38 +12:00
David Craig
ca039e15ef
BUG Fix regressions in changes to batch action feature
2015-06-23 16:28:25 +12:00
Damian Mooyman
953b518403
Merge pull request #4308 from flashbackzoo/pulls/ux-update-filters
...
UX improvements
2015-06-23 14:49:45 +12:00
David Alexander
71c2729aeb
DOCS: typos, rewording, updated links.
2015-06-23 14:30:41 +12:00
David Craig
a6013ed1d0
Move filters from panel to header
...
- The filter panel has been removed in favour of a search menu in the header.
- The multi-select component has been updated:
- Now called 'Bulk actions'
- Styling updated
- Added placeholder text / removed redundant option
- Now also appears in SiteTree view
2015-06-23 13:08:23 +12:00
David Alexander
2125afb2f5
DOCS: fixed broken link
2015-06-23 11:57:54 +12:00
Daniel Hensby
7cd5cf3d4a
Merge pull request #4273 from stevie-mayhew/pulls/increase_time_limit
...
FIX: increase_time_limit_to work when increase_time_limit_max is not yet set
2015-06-22 21:33:00 +01: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
13df9c4163
Merge pull request #4330 from camfindlay/4329-duplicatecc
...
DOCS Remove duplicate core committers doc
2015-06-22 07:17:28 +01:00
Damian Mooyman
f90c1a8791
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
composer.json
2015-06-22 14:16:02 +12:00
Cam Findlay
449ee6296c
DOCS Remove duplicate core committers doc after forward port of branches for 3.2 beta1 release
2015-06-22 11:35:58 +12:00
Stevie Mayhew
8a4c51893b
FIX: allow for increase_time_limit_to to work if $_increase_time_limit_max is not yet set
2015-06-22 08:17:04 +12:00
