Commit Graph

5288 Commits

Author SHA1 Message Date
Dan Hensby
ce9b05d21d Update translations 2017-01-26 21:02:38 +00:00
Dan Hensby
94cdea8e65 Update translations 2017-01-26 18:30:10 +00:00
Daniel Hensby
554bbc90a2 Merge pull request #1724 from open-sausages/pulls/4.0/i18n-symfony
Upgrade cms for new i18n backend
2017-01-26 09:06:16 +00:00
Damian Mooyman
fa2b87172c
Upgrade cms for new i18n backend 2017-01-26 11:39:20 +13:00
Dan Hensby
47b6b2cd0e Update translations 2017-01-25 16:46:33 +00:00
Daniel Hensby
36de854707 Merge pull request #1726 from open-sausages/pulls/4.0/fix-install-template
BUG Fix reference to Install_deleteinstallfiles
2017-01-25 10:59:04 +00:00
Damian Mooyman
732b1f0a57
BUG Fix reference to Install_deleteinstallfiles
Fixes #1719
2017-01-25 18:03:18 +13:00
Daniel Hensby
8a89876658
Building JS bundle 2017-01-24 13:00:16 +00:00
Daniel Hensby
3659704f75 Merge pull request #1725 from mikenz/patch-4
FIX: Javascript .addAttr() doesn't exist
2017-01-24 12:14:23 +00:00
Mike Cochrane
00de0989f4 FIX: Javascript .addAttr() doesn't exist
When there's no templates that can be added in the root /admin/pages/add/ hits a JS error and never completes loading
2017-01-24 16:28:26 +13:00
Daniel Hensby
afd98a2ac0 Merge pull request #1720 from colintucker/fix-controller-init-visibility
Changed init() visibility to protected
2017-01-23 16:37:45 +00:00
Colin Tucker
00c81d8672 Changed init() visibility to protected 2017-01-22 09:35:14 +11:00
Daniel Hensby
3f53da050c
Merge branch '3' 2017-01-17 12:33:26 +00:00
Daniel Hensby
6f05242e3b
Merge branch '3.5' into 3 2017-01-17 12:33:03 +00:00
Daniel Hensby
cb3008956f
Merge branch '3.4' into 3.5 2017-01-17 12:31:18 +00:00
Ingo Schommer
cfe23dd5aa Update translations 2017-01-17 16:11:43 +13:00
Damian Mooyman
540a80766d Merge pull request #1713 from hailwood/patch-1
Clean up code for url-segment checks
2017-01-16 17:44:12 +13:00
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
Loz Calver
f26ecb2a9c Merge pull request #1711 from dhensby/pulls/3.4/allowed-children-fix2
FIX Dont attempt to iterate over null in SiteTree::allowedChildren
2017-01-10 16:46:48 +00:00
Daniel Hensby
5bba7264c6
FIX Dont attempt to iterate over null in SiteTree::allowedChildren 2017-01-10 16:20:22 +00: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
577a024109
Remove redundant label 2017-01-04 15:55:32 +00: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