Matthew Hailwood
|
df0ce184bf
|
Clean up code
Just making it a little clearer what's going on by changing the variable names and removing some redundant code.
|
2017-01-16 13:20:44 +13:00 |
|
Ingo Schommer
|
9f01cce694
|
Merge pull request #1712 from robbieaverill/bugfix/update-page-fixture-for-psr-2
FIX Separate PageController fixture into its own file (PSR-2 compat)
|
2017-01-12 11:34:18 +13:00 |
|
Robbie Averill
|
773c848c0f
|
FIX Separate PageController fixture into its own file (PSR-2 compat)
|
2017-01-12 10:05:05 +13:00 |
|
Daniel Hensby
|
05b5e545e0
|
Merge pull request #1703 from robbieaverill/feature/psr2-compliant-controller-names
API Allow controller discovery without underscore (PSR-2 compliance)
|
2017-01-11 15:28:11 +00:00 |
|
Ingo Schommer
|
5ec902463c
|
Merge pull request #1699 from open-sausages/features/4.0/ui-button-refresh
Refresh CMS UI buttons to new flat style and bootstrap classes
|
2017-01-11 23:00:57 +13:00 |
|
Damian Mooyman
|
ebe09393db
|
Update behat tests for new button styling
|
2017-01-11 17:36:30 +13:00 |
|
Christopher Joe
|
947c1fe156
|
Fix broken unit test
|
2017-01-11 17:36:30 +13:00 |
|
Paul Clarke
|
333b4b3e79
|
add icon to page in menu
|
2017-01-11 17:36:30 +13:00 |
|
Will Rossiter
|
b3896a0ba6
|
Swap out icons on change.
|
2017-01-11 17:36:30 +13:00 |
|
Paul Clarke
|
9f4acfe3bf
|
Main save/publish actions to change icons when state changed
|
2017-01-11 17:36:30 +13:00 |
|
Paul Clarke
|
16e3e40c2b
|
increase search icon size
|
2017-01-11 17:36:30 +13:00 |
|
Will Rossiter
|
2d17f2f33b
|
Tidy up publish and save buttons.
|
2017-01-11 17:36:30 +13:00 |
|
Will Rossiter
|
5bb430ef43
|
Remove references to ss-ui
|
2017-01-11 17:36:30 +13:00 |
|
Robbie Averill
|
cf3a74ec57
|
FIX Remove deprecation tests, bump deprecation version to 5.0
|
2017-01-11 10:02:51 +13:00 |
|
Robbie Averill
|
0927e54780
|
API Allow controller discovery without underscore (PSR-2 compliance)
|
2017-01-11 10:02:51 +13:00 |
|
Daniel Hensby
|
03a17029ef
|
Merge pull request #1709 from colintucker/fix-broken-add-page-menu
FIX: broken "Add new page here" context menu
|
2017-01-10 13:58:58 +00:00 |
|
Colin Tucker
|
9959ef63f2
|
Fix double-escaped ampersands in CMSMain_TreeView and CMSMain::LinkPageAdd
|
2017-01-10 15:41:26 +11:00 |
|
Daniel Hensby
|
f669c6a0b7
|
Merge pull request #1704 from mikenz/page-to-sitetree
ENHANCEMENT: Use SiteTree instead of Page class in more places.
|
2017-01-03 10:43:56 +00:00 |
|
Mike Cochrane
|
2108d8ef08
|
Use SiteTree instead of Page class in more places. Allows developers to extend SiteTree directly.
|
2017-01-03 20:38:45 +13:00 |
|
Daniel Hensby
|
a8732efd7a
|
Merge pull request #1702 from robbieaverill/feature/php7.1-builds
BUILD Run PHP 7.1 as default 7.x
|
2016-12-29 11:56:31 +00:00 |
|
Robbie Averill
|
6759f5a135
|
BUILD Run PHP 7.1 as default 7.x
|
2016-12-30 00:49:38 +13:00 |
|
Daniel Hensby
|
36900a651b
|
Updating travis.yml
|
2016-12-28 17:57:21 +00:00 |
|
Daniel Hensby
|
fc45e9e0ab
|
Fixing tests
|
2016-12-28 17:24:54 +00:00 |
|
Daniel Hensby
|
916d7f3815
|
Fixing tests
|
2016-12-28 17:10:45 +00:00 |
|
Daniel Hensby
|
7a296a541b
|
Merge branch '3'
|
2016-12-28 17:00:32 +00:00 |
|
Damian Mooyman
|
a26607ca56
|
Merge 3.5 into 3
# Conflicts:
# lang/en.yml
# lang/fa_IR.yml
# lang/fi.yml
# lang/hr.yml
# lang/it.yml
|
2016-12-22 13:24:17 +13:00 |
|
Damian Mooyman
|
6060af45c1
|
Merge 3.4 into 3.5
|
2016-12-22 13:18:30 +13:00 |
|
Damian Mooyman
|
e4ff310a62
|
Merge 3.5.1 into 3.5
|
2016-12-22 13:17:16 +13:00 |
|
Damian Mooyman
|
483cda95a6
|
Merge 3.4.3 into 3.4
|
2016-12-22 13:16:07 +13:00 |
|
Dan Hensby
|
9db49bfd62
|
Update translations
|
2016-12-19 12:21:38 +00:00 |
|
Daniel Hensby
|
0b952e277e
|
Merge branch '3.5' into 3
|
2016-12-19 11:56:55 +00:00 |
|
Dan Hensby
|
36287b09d0
|
Update translations
|
2016-12-16 20:49:04 +00:00 |
|
Daniel Hensby
|
f833bb53c3
|
Merge branch '3.4' into 3.5
|
2016-12-16 16:46:28 +00:00 |
|
Damian Mooyman
|
bf58c5aef4
|
API Update to use new form submission handling (#1691)
|
2016-12-09 16:00:46 +13:00 |
|
Ingo Schommer
|
981ca17695
|
Merge pull request #1675 from mikenz/patch-3
FIX Page History 'Comparing versions' banner missing
|
2016-12-08 21:29:20 +13:00 |
|
Ingo Schommer
|
4fea439139
|
Merge branch 'master' into patch-3
|
2016-12-08 21:28:21 +13:00 |
|
Daniel Hensby
|
e90715d6c6
|
Merge branch '3.4' into 3.5
|
2016-12-07 13:43:34 +00:00 |
|
Daniel Hensby
|
b3e79239aa
|
Merge pull request #1692 from tractorcow/pulls/3.4/fix-localisation-strings
BUG Fix localisation issues in CMS
|
2016-12-06 23:27:31 +00:00 |
|
Damian Mooyman
|
224b2a4cba
|
BUG Fix localisation issues in CMS
|
2016-12-07 12:15:54 +13:00 |
|
Damian Mooyman
|
d018d2ca2e
|
Merge pull request #1694 from dhensby/pulls/3.4/travis-simplification
Move travis env vars out of .travis.yml and into travis CI dashboard
|
2016-12-07 12:08:21 +13:00 |
|
Daniel Hensby
|
95995adc98
|
Move travis env vars out of .travis.yml and into travis CI dashboard
|
2016-12-06 22:29:48 +00:00 |
|
Daniel Hensby
|
669a7e6945
|
Merge pull request #1689 from ninty9notout/master
Removed dud Requirements breaking the RedirectorPage
|
2016-11-30 13:16:33 +00:00 |
|
hirenpatel
|
0dd81fcbe8
|
Removed dud Requirements breaking the RedirectorPage
Also removed the dependency
|
2016-11-30 12:51:04 +00:00 |
|
Daniel Hensby
|
203756f94d
|
Merge pull request #1274 from kinglozzer/pulls/1273-cancreate-can-select
Ensure we have a ParentID before trying to limit children by page type (fixes #1273)
|
2016-11-30 12:38:51 +00:00 |
|
Loz Calver
|
94697e1281
|
Ensure we have a ParentID before trying to limit children by page type (fixes #1273)
|
2016-11-30 11:49:13 +00:00 |
|
Daniel Hensby
|
4a1cf3d4fb
|
Merge branch '3.5' into 3
|
2016-11-28 14:02:13 +00:00 |
|
Daniel Hensby
|
ca76b9488f
|
Merge branch '3.4' into 3.5
|
2016-11-28 14:01:01 +00:00 |
|
Daniel Hensby
|
caab36068f
|
Merge tag '3.5.0' into 3.5
Release 3.5.0
|
2016-11-28 13:57:54 +00:00 |
|
Daniel Hensby
|
21d9b7cdf1
|
Merge branch '3.3' into 3.4
|
2016-11-28 13:57:38 +00:00 |
|
Daniel Hensby
|
5d3519976e
|
Merge tag '3.4.2' into 3.4
Release 3.4.2
|
2016-11-28 13:57:34 +00:00 |
|