Commit Graph

407 Commits

Author SHA1 Message Date
Damian Mooyman 9d873db976
Fix paths in Install_successfullyinstalled.ss 2017-10-10 11:23:21 +13:00
Aaron Carlino 359179025d Reorganise i18n keys 2017-05-08 17:57:24 +12:00
Damian Mooyman 424008cff4 BUG Fix installer for 4.0 (#1644) 2016-10-26 14:44:25 +13:00
Damian Mooyman 90aff08df7 API remove obsolete template 2016-08-12 11:00:49 +12:00
Damian Mooyman cb946508cf Move CMS classes and templates to namespaced locations 2016-08-10 16:09:23 +12:00
Paul Clarke 1c2228f508 Template reorder and adjust step styles 2016-07-28 10:24:06 +12:00
Daniel Hensby dc8d4ffe0b API Refactor usages of HTMLText -> HTMLFragment
API Revert hack in VirtualPage
API Respect default_cast
2016-07-13 18:48:46 +12:00
Damian Mooyman 59d4b51d8e BUG Fix missing tabs layout in pages view 2016-07-06 16:56:30 +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
Damian Mooyman 90397c945d
BUG fix missing install image
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5528
2016-05-20 17:22:11 +12:00
David Craig 85fb080319 Fix font-icon regression on tree view 2016-04-22 10:44:40 +12:00
Damian Mooyman 0a2456e71e Merge remote-tracking branch 'origin/3' 2016-01-25 16:16:53 +13:00
Damian Mooyman 19c24bb2df Merge remote-tracking branch 'origin/3.3' into 3 2016-01-25 15:58:35 +13:00
Damian Mooyman f80467a748 BUG Don't keep stale treeview data when refreshing Content area
Fixes https://github.com/silverstripe/silverstripe-framework/issues/4945
2016-01-22 16:56:18 +13:00
Damian Mooyman abc5556520 BUG Fix legacy breadcrumbs appearing on page save
Fixes #1358
2016-01-20 15:29:51 +13:00
Damian Mooyman 7dfe145412 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	code/controllers/CMSFileAddController.php
#	code/controllers/CMSPageAddController.php
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/CMSSiteTreeFilter.php
#	code/controllers/ContentController.php
#	code/controllers/LeftAndMainPageIconsExtension.php
#	code/controllers/SilverStripeNavigator.php
#	code/model/SiteTreeFileExtension.php
#	code/model/VirtualPage.php
#	composer.json
#	tests/model/ErrorPageTest.yml
#	tests/model/FileLinkTrackingTest.yml
#	tests/model/VirtualPageTest.yml
2016-01-20 13:16:43 +13:00
Sam Minnee bbc3aaaf9f MINOR: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:32:05 +13:00
Damian Mooyman 18e368448a Merge remote-tracking branch 'origin/3'
Conflicts:
	code/controllers/AssetAdmin.php
	code/controllers/CMSMain.php
	code/controllers/CMSSiteTreeFilter.php
	code/controllers/LeftAndMainPageIconsExtension.php
	code/controllers/ModelAsController.php
	code/controllers/SilverStripeNavigator.php
	code/model/ErrorPage.php
	code/model/SiteTreeFileExtension.php
2015-11-03 14:23:04 +13:00
scott1702 6dc3fc1f26 Update asset admin toolbar 2015-10-30 10:05:51 +13:00
Patrick Nelson 332e490147 FIX (partial) for #1288 where non-submit buttons are being activated on "enter" key press (relates to framework issue at https://github.com/silverstripe/silverstripe-framework/issues/3181). 2015-10-06 15:08:29 -04:00
David Craig 1ea22c766c Move UI to main assets area 2015-09-29 09:35:28 +13:00
Loz Calver 2a7a5ac9fc Merge pull request #1268 from scott1702/font-icons
Update font icons to use new library
2015-08-28 10:31:18 +01:00
scott1702 c028278957 Update font icons to use new library 2015-08-25 15:08:09 +12:00
scott1702 4f05c4c4f8 Update the filtered tree styling 2015-08-25 13:02:20 +12:00
scott1702 b976dc8f78 Update button styles 2015-07-07 14:46:27 +12:00
David Craig 41ce038c8f Add three column layout to Page content view
- Content filters included in SiteTree view
 - View (tree/list) buttons included in SiteTree view
 - Update view button styles for new layout
 - Updated breadcrumbs for new layout
2015-07-02 10:23:37 +12:00
David Craig cc3385b9f8 Move filters from panel to header
- The filters panel has been removed in favour of a search panel in the header
- Multi-select updated
  - Renamed to Bulk actions
  - Styles updated
  - Added placeholder text / removed redundant option
  - Now appears in SiteTree view too
2015-06-24 09:58:48 +12:00
Damian Mooyman 8de0106fea Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:35:00 +12:00
scott1702 bf25dd9492 Increase click-size of multi-selection button 2015-06-17 22:12:00 +12:00
Damian Mooyman c5e0c8f007 API Enable tree filter highlighting
Decoupling of CMS / Framework
2015-05-04 17:05:35 +12:00
Damian Mooyman cf4d9edafb Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	code/model/SiteConfig.php
	javascript/CMSMain.AddForm.js
	tests/model/SiteConfigTest.php
	tests/model/SiteTreeTest.php
2015-03-31 19:54:43 +13:00
Damian Mooyman 3df41e1176 BUG Fix SiteTree / SiteConfig permissions 2015-03-19 15:29:38 +13:00
Will Rossiter 18d6c538a7 API: Extract siteconfig out to an external module. 2014-08-09 17:29:50 +12:00
Ingo Schommer 0b296b3665 Merge remote-tracking branch 'origin/3.1' 2014-06-15 22:50:35 +12:00
Rodney Way e5579511d4 Ensure ajax call includes query parameters so that SitreeFilters function as expected. Required for subtree branch loading. 2014-06-10 15:01:12 +10:00
Ingo Schommer 9ca336bea3 Merge remote-tracking branch 'origin/3.1' 2013-12-02 20:44:57 +01:00
Ingo Schommer bd5f631af6 Reload "Settings" form on save (fixes #895)
Regression from 920da0d120
2013-12-02 16:38:46 +01:00
Ingo Schommer dd29936fee Merge remote-tracking branch 'origin/3.1' 2013-10-10 12:10:20 +02:00
Andrew Short b7476f2a46 BUG: Fix add new button not passing the correct parent ID.
The `%s` parent ID placeholder was being URL encoded, so it was not being
replaced properly when adding a new page. This fix separately adds
placeholder parameters to the URL to avoid this issue.

The fix is not ideal, but there is no easy way to indicate that some
URL parameters should be URL encoded and others should not while still
correctly constructing the URL.
2013-10-10 13:09:24 +11:00
Ingo Schommer 32478ab512 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
2013-09-27 19:07:13 +02:00
Ingo Schommer 9b15c8c16d Merge pull request #842 from ARNHOE/3.1-siteconfigfix
FIX SiteConfig scrollbars visible
2013-08-29 04:52:31 -07:00
Arno Poot 9ba92a7bc5 FIX SiteConfig scrollbars visible 2013-08-28 20:54:06 +02:00
Ingo Schommer 6d694a550a Merge pull request #837 from ARNHOE/3.1-siteconfigfix
SiteConfig updated to modeladmin style and fixed ajax switching
2013-08-28 02:20:47 -07:00
Arno Poot 920da0d120 SiteConfig updated to modeladmin style and fixed ajax switching 2013-08-24 12:33:38 +02:00
Ingo Schommer c62f992dc3 Merge remote-tracking branch 'origin/3.1' 2013-08-22 13:56:28 +02:00
Ingo Schommer 26bca388e8 Revert "Updated siteconfig layout to be more like modeladmin"
This reverts commit afd9f28279.
See https://github.com/silverstripe/silverstripe-cms/issues/830
2013-08-20 15:20:44 +02:00
Ingo Schommer 7ad9712f05 Merge remote-tracking branch 'origin/3.1' 2013-08-16 13:37:49 +02:00
Ingo Schommer 44fdf66834 Merge pull request #809 from ARNHOE/3.1-siteconfig
Updated siteconfig layout to be more like modeladmin
2013-08-15 13:45:50 -07:00
Ingo Schommer 07cccc8e95 Translations: Switch to Transifex format
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
  which SilverStripe's i18n system can't handle
  (needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
  issues with unknown locales in Zend's CLDR database
2013-08-04 12:31:29 +02:00