tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
5,941 Commits 29 Branches 403 Tags 28 MiB
6e7bc38aad
Commit Graph

5941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andre Kiste
6e7bc38aad
Merge pull request #2258 from open-sausages/pulls/4/image-inary-edit 
Fix 'Insert links into a page' test
 2018-09-21 16:43:56 +12:00
Luke Edwards
13947244c5
Merge pull request #2264 from open-sausages/pulls/4/proppa-pig 
All proptypes replaced with external lib
 2018-09-19 13:13:35 +12:00
Aaron Carlino
c7ae231650 All proptypes replaced with external lib 2018-09-19 08:47:59 +12:00
Luke Edwards
aa3760ed66
Merge pull request #2247 from open-sausages/pulls/4.2/2227-show-link-tracking 
API: Add `show_link_tracking` config to `SiteTreeLinkTracking` extension
 2018-09-13 14:23:54 +12:00
bergice
115ed92e0a API: Add show_sitetree_link_tracking config to SiteTreeLinkTracking extension to control visibility of the Link Tracking tab 2018-09-13 11:01:33 +12:00
Robbie Averill
c75c629eb1 Merge branch '4.2' into 4 2018-09-12 14:12:15 +02:00
Robbie Averill
eea9127e70 Merge branch '4.1' into 4.2 2018-09-12 14:11:56 +02:00
Luke Edwards
41c0b8fb85 Fix 'Insert links into a page' test 2018-09-12 13:14:06 +12:00
Robbie Averill
6bdf9a8ccc
Merge pull request #2253 from open-sausages/pulls/4/date-languish 
Set locale on datefields from current user
 2018-09-10 16:05:18 +02:00
Luke Edwards
6dac09a03e
Merge pull request #2248 from open-sausages/pulls/4.1/hire-our-quay 
MINOR: Add CMS specific hierarchy config
 2018-09-10 14:43:44 +12:00
Robbie Averill
d0cd066ab8
Merge pull request #2255 from open-sausages/pulls/4/a-test-for-another-time 
Disable page search test scenarios involving date due to localisation issue
 2018-09-07 09:21:32 +02:00
Luke Edwards
f3da10119e Disable page search test scenarios involving date due to bug 2018-09-07 12:11:57 +12:00
Aaron Carlino
0f00de78ad Set locale on datefields from current user 2018-09-06 09:41:52 +12:00
Luke Edwards
2fbeda1564
ADD New search component for SiteTree (#2224) 2018-09-04 13:13:33 +12:00
Aaron Carlino
463319e52b Add CMS specific hierarchy config 2018-09-03 16:31:15 +12:00
Robbie Averill
eae155a228
Merge pull request #2239 from pine3ree/patch-3 
simplify code using !empty
 2018-08-18 09:28:15 +12:00
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