Commit Graph

207 Commits

Author SHA1 Message Date
Daniel Hensby
b62a474ac1
Merge branch '4.1' into 4 2018-03-16 15:14:54 +00:00
Damian Mooyman
9bf05b397f Update translations 2018-03-14 09:45:54 +13:00
Luke Edwards
5735beeb90 ENHANCEMENT Upgrade to Bootstrap 4.0.0-stable and change to reactstrap 5.0.0-beta (#2101) 2018-02-28 14:03:01 +13:00
Damian Mooyman
b291306c03
Merge remote-tracking branch 'origin/4.1' into 4
# Conflicts:
#	client/dist/js/bundle.js
2018-02-15 09:24:08 +13:00
Damian Mooyman
165b6e1400
Merge remote-tracking branch 'origin/4.0' into 4.1
# Conflicts:
#	client/dist/js/bundle.js
2018-02-15 09:21:41 +13:00
Dylan Wagstaff
d86e5dfc88 FIX remove now superfluous print action destroyer
There exists functionality in the CMS to print various pages via the
`printable` action on `SilverStripe\Admin\LeftAndMain` - however this
appears to be no longer activated by default. The accompanying legacy
(entwine) javascript dynamically accesses this action by chaning the
HTML form `action` attribute whenever a `FormAction` named `print` is
clicked on an EditForm. Unfortunately this is almost all of them - which
blocks the correct functionality of
`SilverStripe\Forms\GridField\GridFieldPrintButton`
which provides it's own action handling via proper SilverStripe routing.
Since print buttons are no longer a part of the various parts of the CMS
any longer, it appears easiest to simply remove this legacy javascript.
2018-02-09 11:26:32 +13:00
Christopher Joe
b5f68ebed2 Fix warning appearing when button is disabled for rollback 2018-02-07 15:53:57 +13:00
Damian Mooyman
4450d150e8
Merge remote-tracking branch 'origin/4.0' into 4 2018-02-05 18:03:03 +13:00
Damian Mooyman
e84e0236f1 Update translations 2018-02-05 16:58:21 +13:00
Damian Mooyman
cdc0aa8a5b
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
#	client/dist/js/bundle.js
2018-01-22 15:16:14 +13:00
Sacha Judd
f282df89ea FIX Add bootstrap styles to url segment field 2018-01-18 12:28:01 +13:00
Daniel Hensby
5a77ec8cea
Merge branch '4.0' into 4 2018-01-15 16:19:22 +00:00
Daniel Hensby
a77a7cfe35
Merge branch '3.6' into 4.0 2018-01-15 15:49:47 +00:00
Damian Mooyman
227ce39414
Merge branch '4.0' into 4 2017-12-18 16:16:20 +13:00
Damian Mooyman
210213a455
Fix search behaviour 2017-12-13 18:16:34 +13:00
Saophalkun Ponlu
8a04e9c46b Fix wrong/confusing url segment 2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
b391db4977 Fix search view 2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
042dbbb13d Remember pages view type 2017-12-13 17:10:39 +13:00
Damian Mooyman
b5f64aebec Update translations 2017-12-07 11:08:26 +13:00
Christopher Joe
694d258957 BUG Fix allowed children types now load properly 2017-11-20 09:17:22 +13:00
Christopher Joe
1b190de7e1 BUG Fix regression to cancel draft changes 2017-11-03 10:44:05 +13:00
Robbie Averill
23d00fb9f1 Separate logic for whether to show the link text from the renderModal method 2017-10-25 12:11:23 +13:00
Christopher Joe
689c198fbe FIX revert to this button after archiving 2017-10-20 09:26:35 +13:00
Christopher Joe
78f39e6b11
FEATURE hide tree view icon when searching 2017-10-17 15:54:41 +13:00
Damian Mooyman
496b9c8c04 API Implement insert-anchor modal 2017-09-20 13:35:25 +12:00
Sacha Judd
2dde777132 FIX Add styles for url segment field 2017-09-12 14:37:03 +12:00
Damian Mooyman
3669f30e4e BUG Fix race condition with change detection / loading animation
Fixes #1859
2017-09-07 11:54:03 +12:00
Sacha Judd
eaa0a2a4cb FIX Update unused button classes for url segment field 2017-09-06 09:30:11 +12:00
Christopher Joe
04f795c665
Tweak add form to use React TreeDropdownField
Enhancement Shift groups in SiteTree to use TreeMultiselectField
2017-09-04 13:38:14 +12:00
Christopher Joe
1c321019c4 Fix icons in right click menu 2017-08-31 14:42:37 +12:00
Reid Hokai
b0512abfb6
fixes load indicator position (fixes #1625) 2017-08-24 14:24:54 +12:00
Damian Mooyman
6efb35fbcf BUG Fix “Show unpublished versions” (#1930)
Update CMSPageHistoryController.js to fit coding conventions
Fixes #1648
2017-08-24 13:31:40 +12:00
Saophalkun Ponlu
2bbb21a450 Add priority to internal link action (#1924) 2017-08-18 15:38:34 +12:00
Damian Mooyman
68d6307c6d Upgrade to bootstrap@4.0.0-beta.1 2017-08-16 10:52:36 +12:00
Saophalkun Ponlu
417caf2972 ENHANCEMENT Allow insert links with display link text 2017-08-03 13:32:14 +12:00
Damian Mooyman
1fe13dcdb7 Rebuild dist files 2017-07-25 12:57:46 +12:00
Saophalkun Ponlu
fca3ba73f5 FIX Pages search now defaults to list view 2017-07-25 12:57:46 +12:00
Saophalkun Ponlu
6fc1491f0b Enhancement Add edit command and its url test for page insert 2017-07-18 13:11:58 +12:00
Damian Mooyman
184ec65b7f Update translations 2017-07-03 17:17:41 +12:00
Saophalkun Ponlu
4fb6e70bb8
Visual updates to page view toggle 2017-06-27 11:39:35 +01:00
Chris Joe
b34519e7e8 Fix insert link modal to work with new injector API (#1860) 2017-06-27 11:06:39 +12:00
Christopher Joe
844420df40 Enhancement Translation strings updated 2017-05-31 16:08:54 +12:00
Damian Mooyman
f82f0844c1
API Add insert internal link modal 2017-05-30 11:00:32 +12:00
Damian Mooyman
eb06646aa8 Rename json lang source files to .json extension 2017-05-29 17:27:41 +12:00
Chris Joe
d2a5d073e2 Upgrade to webpack2 and cleanup config file (#1833)
* Enhancement switch to the shared webpack config

* upgrade to new webpack-config
2017-05-29 17:24:48 +12:00
Christopher Joe
e2b7ca2e79 Fix for save and publish buttons shrinking 2017-05-16 12:49:51 +12:00
Aaron Carlino
5bd3440e61 Move who-can-view toggle to Admin module 2017-05-15 11:33:18 +12:00
Damian Mooyman
0980c62c7c
Rebuild dist files 2017-05-03 17:17:51 +12:00
Damian Mooyman
ef6bc6e2af
Sync with transifex 2017-05-03 17:17:36 +12:00
Aaron Carlino
00f699b99b Update translations 2017-05-02 10:46:54 +12:00
Damian Mooyman
9147fa44ba
Fix source file encoding 2017-04-28 14:06:29 +12:00
Damian Mooyman
88c8a2d2f9
Rebuild js dist files 2017-04-28 14:02:46 +12:00
Aaron Carlino
e8e11d618e Migrate new JS keys to all langs 2017-04-27 11:43:05 +12:00
Aaron Carlino
b6d4eb3e77 New module-based JS translation keys 2017-04-27 11:43:04 +12:00
Uncle Cheese
29805ee446 New namespaced i18n keys 2017-04-27 11:43:04 +12:00
Uncle Cheese
6fb1012eb8 Ran upgrader for lang files 2017-04-27 11:43:04 +12:00
Christopher Joe
4b19987ad2 FIx tweak visibility around the slideDown/slideUp animation 2017-04-21 16:38:34 +12:00
Ishan Jayamanne
3b69a47158 fix Hidden listbox #1785 2017-04-21 14:59:27 +12:00
Chris Joe
3c00c437f4 Merge pull request #1774 from open-sausages/pulls/4.0/6258-update-archive-warning-msg
ENHANCEMENT Update archive warning message
2017-04-06 09:20:08 +12:00
Damian Mooyman
8f8553a737 Update translations 2017-04-05 16:08:16 +12:00
Christopher Joe
e12a2709d0 Fix syntax error in selector 2017-04-05 15:14:12 +12:00
Saophalkun Ponlu
5b90141c03 ENHANCEMENT Update archive warning message 2017-04-04 11:26:46 +12:00
Christopher Joe
828e0e973a update webpack settings and switch to yarn 2017-03-06 15:24:19 +13:00
Christopher Joe
0c47bc3e62 Fix viewer and editor groups to only show when the last option is selected
Fix update package.json for linting and building
2017-02-28 10:35:13 +13:00
Daniel Hensby
8a89876658
Building JS bundle 2017-01-24 13:00:16 +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
Ingo Schommer
cfe23dd5aa Update translations 2017-01-17 16:11:43 +13:00
Will Rossiter
b3896a0ba6 Swap out icons on change. 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
Daniel Hensby
7a296a541b
Merge branch '3' 2016-12-28 17:00:32 +00:00
Damian Mooyman
35b38ff29c Update translations 2016-11-03 13:36:56 +13:00
Paul Clarke
17ef686f61 Fix for History versions extending outside collapsed panel 2016-10-31 11:56:20 +13:00
Paul Clarke
d0619c1f0f Fix for double scroll in history area 2016-10-28 16:34:26 +13:00
Paul Clarke
7969f70c25 images in history to limit size to panel 2016-10-28 16:28:30 +13:00
Paul Clarke
3e256ddd58 Build 2016-10-28 16:28:30 +13:00
Paul Clarke
df9b73725a Make minor buttons smaller, change conflicting class (used elsewhere) 2016-10-28 15:44:31 +13:00
Damian Mooyman
e5550dd680 BUG Fix search not respecting view mode 2016-10-27 17:05:36 +13:00
Damian Mooyman
8c87ea6b79 API Update listview / treeview to use pjax instead of deferred loading
Fixes #1645
2016-10-27 17:05:36 +13:00
Damian Mooyman
424008cff4 BUG Fix installer for 4.0 (#1644) 2016-10-26 14:44:25 +13:00
Paul Clarke
6762f43511 Add scroll to panel for filtered results 2016-10-25 15:07:51 +13:00
Paul Clarke
172072df03 Remove JS from filter height and replace with flexbox 2016-10-25 14:38:58 +13:00
Damian Mooyman
d54ae8bb26 API Consolidate "Delete from draft" and "Archive" actions into a consistent behaviour (#1653)
API Update to support new versioned dataobject behaviour
2016-10-25 13:22:31 +13:00
Christopher Joe
2b00bdfdd6 adjust toggle to not display block when showing 2016-10-11 13:51:44 +13:00
Damian Mooyman
6524d60f75 Update translations 2016-09-23 14:02:58 +12:00
Ingo Schommer
4b2c6b0503 FIX: Break dist javascript and onto newlines.
This doesn’t have much impact on resulting JS size, but it will
hopefully make merge conflicts much less frequent.

The CSS growth is a little higher (6.5% increase in size) but is not
material.

If this materially reduces the number of merge conflicts we have, by
letting the git merge tools resolve some dist file mergers, I think it
would be worth it.

See https://github.com/silverstripe/silverstripe-framework/pull/6051
2016-09-22 14:39:02 +12:00
Ingo Schommer
5c31bf357b Remove framework bundle include
This is now handled through one combined bundle
which is included through LeftAndMain.php (in framework module)
Rename bundle-legacy.js to bundle.js: It'll contain more than legacy stuff eventually
Remove leftover dist artefacts: These weren't part of the webpack build any more
Building SilverStripeNavigator separately (and rename bundle)
2016-09-21 15:00:26 +12:00
Sam Minnee
beef8fa072 FIX Switch gulp JavaScript generation to Webpack
See https://github.com/silverstripe/silverstripe-framework/pull/5918
2016-09-14 21:12:39 +12:00
Daniel Hensby
91444b8016
Merge branch '3' 2016-09-07 11:28:05 +01:00
Ingo Schommer
b599095a50 API Remove AssetAdmin (moved to asset-admin module) 2016-08-31 23:15:12 +12:00
Paul Clarke
89aba7d146 Remove unwanted spacing 2016-08-03 12:10:54 +12:00
Paul Clarke
e6b31aaf04 Remove horizontal scroll on old asset admin grid 2016-08-03 12:10:54 +12:00
Paul Clarke
43ceeebb82 Gridfield updates for new styling. Mainly class update 2016-08-03 12:10:54 +12:00
Damian Mooyman
48a2aecaab Merge pull request #1537 from silverstripe-terraformers/fix/menuitems-fix
When page is disabled, rename "Edit" label in contextmenu and …
2016-08-02 17:01:07 +12:00
Damian Mooyman
7c151321b4 BUG Fix issue with old asset-admin repeating "level up" button
BUG Fix incorrectly built dist files
2016-08-01 17:38:22 +12:00
Damian Mooyman
d7fa00267e
Fix field casting 2016-07-28 12:06:05 +12:00
Damian Mooyman
ff07a2e264 API Convert CMS forms to bootstrap
API Update to cms-forms theme

This commit is required by and depends on https://github.com/silverstripe/silverstripe-framework/pull/5826 in framework.
2016-07-25 17:25:22 +12:00
Christopher Joe
adcc5251b5 added translation to src file 2016-07-19 10:04:24 +12:00
Christopher Joe
49e5cd54fa When page is disabled, rename "Edit" label in contextmenu and hide duplicate options 2016-06-30 17:28:17 +12:00
Paul Clarke
f4e080e046 Converted all south toolbars to use new toolbar component styles, content and preview styles for scrollbars adjusted where required 2016-05-24 12:28:38 +12:00
Paul Clarke
11192b0207 Swap out .Actions class for bootstrap .btn-toolbar 2016-05-24 12:28:38 +12:00
Daniel Hensby
a507c80d15 Merge pull request #1492 from open-sausages/pulls/linting
Linting and CodeClimate support
2016-05-12 17:51:15 +01:00
Damian Mooyman
c58d8bdedc Update translations 2016-05-12 15:37:09 +12:00
Ingo Schommer
fff84a5e13 Add SCSSLint
Not validating any files since it's all in legacy folders, but future proofing for new code
2016-05-11 09:47:03 +12:00
Damian Mooyman
59ca068806 Rebuild dist files for merge 2016-04-29 18:02:30 +12:00
Damian Mooyman
d7d6fd8758 Merge 3 into master
# Conflicts:
#	code/controllers/CMSPageAddController.php
#	code/model/ErrorPage.php
#	composer.json
#	css/screen.css
#	tests/behat/features/insert-a-link.feature
2016-04-29 14:34:29 +12:00
Ingo Schommer
e4861bdc79 Adjust file paths for new static file structure in framework 2016-04-20 21:13:20 +12:00