Commit Graph

6176 Commits

Author SHA1 Message Date
Robbie Averill
b4dfefd97d
Merge pull request #2238 from pine3ree/patch-2
use identity operator + code consistency
2018-08-18 09:28:01 +12:00
maks
599e198e89
simplify code using !empty
Hello @robbieaverill, please check my assumption...it's been a long time since I have last used SS (v3.2 was my last, if i remember correctly)
in the following lines 438:
```php
        if (isset($this->templates[$action]) && $this->templates[$action]
            || (isset($this->templates['index']) && $this->templates['index'])
            || $this->template
        ) {
            return parent::getViewer($action);
        }
```
it looks like the 1st two (same-line) condition should be wrapped inside `()` while checking for a non-index action template .... if not just kill this PR at once. :-)
if the answer is yes then we can just use `!empty(...)` which is the same as 'isset(...) + truthy check'

kind regards, 
maks
2018-08-17 14:51:36 +02:00
maks
75bc2da406
use identity operator + code consistency
- use identity operator === to check string
- use single quotes for consistency 
- simplify code using the ternary operator
2018-08-17 14:38:24 +02:00
Robbie Averill
13625547d3 Merge branch '4.2' into 4 2018-08-17 21:54:24 +12:00
Robbie Averill
4c8a76f21e
Merge pull request #2226 from creative-commoners/pulls/4.2/uncatch-all
FIX Separating ModelAsController catch-all route
2018-08-17 21:35:27 +12:00
Robbie Averill
66ba34889e Merge branch '4.2' into 4 2018-08-16 11:47:49 +12:00
Robbie Averill
7b8c2c1449 Merge branch '4.1' into 4.2 2018-08-16 11:47:19 +12:00
Maxime Rainville
8ec551e57b BUGFIX: Broken "show as list" (#2232)
* Various refactoring to support viewing list view in context menu and suppressed tree node

* Bugfixes per Maxime review

* Fix URL param collision

* Fix show in list on detail view

* Remove AJAX for show in list. Use hard refresh to keep URL state
2018-08-14 16:08:36 +12:00
Maxime Rainville
a6c8e153c8
Merge pull request #2221 from creative-commoners/pulls/4.2/update-latest-draft
FIX Use LatestDraftVersion in GraphQL query to determine latest draft version
2018-08-13 15:03:43 +12:00
Guy Marriott
d4995f5204
FIX Separating ModelAsController catch-all route to apply after all other configuration 2018-08-10 12:21:25 +12:00
Robbie Averill
e7cb0156c6 FIX Use LatestDraftVersion in GraphQL query to determine latest draft version 2018-08-08 14:05:28 +12:00
Luke Edwards
98ca0c3026
Merge pull request #2223 from creative-commoners/pulls/4.2/afterrr
FIX CMS routes are now run after #coreroutes without re-including itself
2018-08-07 14:15:44 +12:00
Robbie Averill
df7396e884 FIX CMS routes are now run after #coreroutes without re-including itself 2018-08-07 11:51:49 +12:00
Maxime Rainville
15fc464a28
Merge pull request #2211 from open-sausages/pulls/4/pyramid-schema
Add multi-schema support
2018-08-07 10:35:01 +12:00
Daniel Hensby
f99d0d7990
Merge branch '4.2' into 4 2018-07-30 17:10:37 +01:00
root
c611c981e4 Update translations 2018-07-30 14:12:45 +00:00
Daniel Hensby
b7f2904904
Merge branch '4.2' into 4 2018-07-30 11:10:21 +01:00
Daniel Hensby
aacb405b41
Merge tag '4.2.0' into 4.2
Release 4.2.0
2018-07-30 11:10:04 +01:00
root
d970d57ed9 Update translations 2018-07-24 19:07:48 +00:00
Robbie Averill
0495ff20f5
Update Postgres version in Travis builds for 4.2.x 2018-07-23 19:26:34 +01:00
Daniel Hensby
83e5689b94
Merge branch '4.2' into 4 2018-07-23 15:58:14 +01:00
Daniel Hensby
b653ebfe7a
Merge branch '4.1' into 4.2 2018-07-23 14:50:50 +01:00
Daniel Hensby
df5042dc0f
Merge branch '4.0' into 4.1 2018-07-23 14:48:49 +01:00
Ingo Schommer
262236c3e2
Merge pull request #2115 from andrewandante/pulls/4/add_controller_name_config_var
add controller_name config var to SiteTree for easier override
2018-07-23 14:09:47 +12:00
Robbie Averill
d1112f25b9
Merge pull request #2214 from wilr/patches/anchor-extension
NEW add SiteTree::updateAnchorsOnPage() for defining content anchors
2018-07-16 10:07:03 +12:00
Will Rossiter
f2ebdb7f5e NEW add SiteTree::updateAnchorsOnPage() for user defining additional page anchors 2018-07-15 14:19:14 +12:00
Loz Calver
9dce915d78
Merge pull request #2212 from creative-commoners/pulls/4.1/revert-button-class
FIX Restore button now has warning colour and correct icon
2018-07-13 09:28:21 +01:00
Robbie Averill
e80c7e712b FIX Restore button now has warning colour and correct icon 2018-07-13 12:11:33 +12:00
Maxime Rainville
c23473103e BUG URLSegment field styling fixes #2193
Squashed commit of the following:

commit 6ee00358f70e26ef5faf622b8f23fc4419698ed5
Author: Maxime Rainville <maxime@silverstripe.com>
Date:   Wed Jul 11 13:22:07 2018 +1200

    Remove debug statement.

commit 8e80300244a19e84d638ffd151b236b846c35b77
Author: Luke Edwards <luke@silverstripe.com>
Date:   Wed Jul 11 10:55:04 2018 +1200

    Only remove actions for readonly rather than only display link

commit 1d3693432bb1ca403d3eefc648cfddb8372b82bd
Author: Luke Edwards <luke@silverstripe.com>
Date:   Wed Jul 11 09:12:21 2018 +1200

    Stop button wrapping when 'Cancel' is longer in another language

commit 5495992b22a0546aaa87e5ea1b2fa9c79f6e119d
Author: Luke Edwards <luke@silverstripe.com>
Date:   Tue Jul 10 16:02:27 2018 +1200

    Use link as the readonly representation of the URLSegment

commit 5737e152424281dbea480872900d735cc43f5fd3
Author: Luke Edwards <luke@silverstripe.com>
Date:   Mon Jun 18 11:07:34 2018 +1200

    Improve readonly styling of URLSegement field

commit 272da9361452843fbb368bfc67e13e6d9540faf2
Author: Luke Edwards <luke@silverstripe.com>
Date:   Mon Jun 18 10:18:33 2018 +1200

    Use input-addon style for URLSegment field
2018-07-11 15:13:22 +12:00
Aaron Carlino
d99cd10f29 Add multi-schema support 2018-07-09 14:02:11 -05:00
Luke Edwards
2d9432789b MINOR: Formatting and revert label 2018-07-04 14:05:08 +12:00
Luke Edwards
6ebd8aba3f MINOR: Show 'Inherit from site access settings' if there is no parent 2018-07-04 14:05:08 +12:00
Maxime Rainville
e1e92db672
Update travis to target 4.3.x-dev (#2203) 2018-07-02 10:19:53 +12:00
Robbie Averill
7e361c8595
Update Postgres version in Travis configuration for SilverStripe 4.2.x onwards 2018-06-29 15:24:08 +12:00
Robbie Averill
21d18951f0
Update Postgres version in Travis builds for 4.2.x 2018-06-25 14:42:02 +12:00
Robbie Averill
019bb52a24 Merge branch '4.2' into 4 2018-06-25 13:46:00 +12:00
Robbie Averill
5b8242c596
Merge pull request #2198 from creative-commoners/pulls/4.2/update-illegal-extensions
Update illegal extensions
2018-06-20 13:38:01 +12:00
Raissa North
6b2a9e4f77 Update class references and array syntax 2018-06-20 13:18:29 +12:00
Robbie Averill
e515423c26
Merge pull request #2197 from creative-commoners/pulls/4.2/update-class-references-and-array-syntax
Update class references and array syntax in VirtualPageTest
2018-06-20 10:37:41 +12:00
Raissa North
5f3e95cd64 Update class references and array syntax in VirtualPageTest 2018-06-20 10:17:38 +12:00
Damian Mooyman
6acaa0cd27 Update translations 2018-06-19 16:50:07 +12:00
Damian Mooyman
7c3dba283c
Merge pull request #2192 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:13:00 +12:00
Dylan Wagstaff
481d166dfb Add supported module badge to readme 2018-06-15 17:32:15 +12:00
Damian Mooyman
2417b12185
Merge remote-tracking branch 'origin/4.2' into 4 2018-06-15 16:25:06 +12:00
Damian Mooyman
85c5edd523 Update translations 2018-06-15 15:39:15 +12:00
Damian Mooyman
130c28bc86 Remove obsolete branch-alias 2018-06-15 15:29:57 +12:00
Ingo Schommer
471ecd1148
Merge pull request #2190 from open-sausages/pulls/4/update-recipe-branch
Update recipe branching
2018-06-14 16:45:36 +12:00
Damian Mooyman
609b4208bf
Update recipe branching 2018-06-14 13:50:26 +12:00
Damian Mooyman
932eb2b22d BUG Fix CMS components failing to register on other CMS sections (#2182)
Fixes https://github.com/silverstripe/silverstripe-framework/issues/7996
2018-06-13 13:11:06 +12:00
Maxime Rainville
d2f4ded3ef 🐛 Adjust deleteinstallfiles to use PUBLIC_PATH. 2018-05-31 10:12:08 +12:00