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
4,754 Commits 29 Branches 403 Tags 28 MiB
ee3158183f
Commit Graph

864 Commits

Author SHA1 Message Date
Ingo Schommer
b4c4c636f2 Merge remote-tracking branch 'origin/3' 2016-03-04 17:07:23 +13:00
scott1702
204fde89d9 Correctly require thirdparty JavaScript modules 2016-02-01 09:39:10 +13:00
scott1702
66f6ecc57e Implement RFC-7 JavaScript module loader in CMS 2016-01-27 14:56:47 +13: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
e364fdb794 BUG Fix incorrect "Add Page" button selector 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/4540
 2016-01-22 11:13:21 +13:00
Damian Mooyman
93acf4b39a Update translations 2016-01-21 14:22:35 +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
Damian Mooyman
c3e82a4838 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	javascript/lang/src/fi.js
 2016-01-19 17:10:41 +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
d387d4f311 Update translations 2015-12-23 13:22:38 +13:00
Damian Mooyman
ad1c058616 Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 17:07:30 +13:00
Damian Mooyman
15685d85ab Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 14:10:52 +13:00
Loz Calver
97e90b8ebd FIX: RedirectorPage toggles not working (fixes #1328) 2015-11-17 16:22:49 +00:00
Damian Mooyman
ebed1d22e5 Update translations 2015-11-11 16:07:20 +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
Damian Mooyman
748866ec0f Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	code/controllers/CMSMain.php
	code/model/ErrorPage.php
 2015-11-03 13:11:26 +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
Damian Mooyman
d8915115f8 Update translations 2015-10-06 18:33:16 +13:00
David Craig
1ea22c766c Move UI to main assets area 2015-09-29 09:35:28 +13:00
Loz Calver
052aba17ac FIX: Incorrect field IDs breaking SiteTree settings toggles (fixes #1280) 2015-09-23 14:53:07 +01:00
Damian Mooyman
b7ad568644 Merge remote-tracking branch 'origin/3.2' into 3 2015-09-09 14:50:28 +12:00
scott1702
4f05c4c4f8 Update the filtered tree styling 2015-08-25 13:02:20 +12:00
Damian Mooyman
a3f789c2b5 Update translations 2015-08-24 16:29:40 +12:00
Daniel Hensby
39ee2ec634 Merge branch '3.2' into 3 
Conflicts:
	lang/en.yml
 2015-08-17 14:23:16 +01:00
Damian Mooyman
a1b9e99342 Update localisation 2015-08-04 13:02:52 +12:00
Damian Mooyman
f38402bee3 Merge pull request #1254 from scott1702/update-alerts 
Update archive warning to include children pages
 2015-08-03 18:14:12 +12:00
scott1702
3566e4ed87 Update archive warning to include children pages 2015-08-03 16:10:10 +12:00
Damian Mooyman
a6677b1653 API respect custom attributes on OptionsetField and CheckboxSetField 
Must be merged with https://github.com/silverstripe/silverstripe-framework/pull/4390
 2015-08-03 16:08:56 +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
12bcf382ad Update translations 2015-06-19 18:25:53 +12:00
Daniel Hensby
715cd9ab4e Merge branch 'pulls/localized-urlsegment-creation' of https://github.com/chillu/silverstripe-cms into chillu-pulls/localized-urlsegment-creation 
Conflicts:
	tests/model/SiteTreeTest.php
 2015-06-13 15:23:22 +01:00
Damian Mooyman
b169823a00 API Deprecate delete in favour of archive 
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug preventing side-by-side preview of archived pages
Fix bug in reporting publishing of error pages
Restoring a page without an available parent will restore to root
 2015-06-03 14:46:16 +12:00
Damian Mooyman
1f9fc33349 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	code/model/SiteTree.php
	code/model/SiteTreeLinkTracking.php
	tests/controller/CMSMainTest.php
 2015-06-02 19:23:48 +12:00
Damian Mooyman
0557c0d47b Update translations 2015-05-14 13:52:21 +12:00
Ingo Schommer
36ac61115a Fix auto-setting of URL from localized page titles 
Replace the hardcoded check for english locale ("new-page")
with a localized version.

See https://github.com/silverstripe/silverstripe-translatable/issues/180
 2015-04-29 00:16:53 +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
7f1f615634 Merge remote-tracking branch 'origin/3.1.11' into 3.1 2015-03-19 17:51:25 +13:00
Damian Mooyman
3df41e1176 BUG Fix SiteTree / SiteConfig permissions 2015-03-19 15:29:38 +13:00
Damian Mooyman
9d7a640205 Merge remote-tracking branch 'origin/3.1' into 3 2015-03-11 11:43:56 +13:00
Damian Mooyman
c0a44db56b Merge pull request #1154 from uniun/missing-translations-entity 
FIX. Missing translation entity
 2015-03-10 22:50:26 +13:00
Damian Mooyman
c238e1e15b Update translations 2015-03-09 17:11:50 +13:00
Damian Mooyman
21e2bc7258 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	code/reports/Report.php
 2015-02-20 10:16:37 +13:00
Damian Mooyman
c7814cffc9 Update translations 2015-02-16 11:54:06 +13:00
Damian Mooyman
475b6d18e5 Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 17:48:11 +13:00
Elvinas L.
9da7e90bf4 FIX. Missing translation entity 
Missing translation entity on Update URL button.
 2015-01-13 12:36:09 +02:00
Damian Mooyman
ee4639ed74 Update translations 2015-01-12 17:52:29 +13:00
Damian Mooyman
d01883a5f8 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	code/model/SiteConfig.php
 2014-11-18 12:45:42 +13:00