tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-23 21:19:24 +02:00
Code Issues Projects Releases Wiki Activity
5,898 Commits 30 Branches 398 Tags 25 MiB
7b8c2c1449
Commit Graph

2721 Commits

Author SHA1 Message Date
Daniel Hensby
b653ebfe7a
Merge branch '4.1' into 4.2 2018-07-23 14:50:50 +01:00
Robbie Averill
e80c7e712b FIX Restore button now has warning colour and correct icon 2018-07-13 12:11:33 +12:00
Maxime Rainville
d2f4ded3ef 🐛 Adjust deleteinstallfiles to use PUBLIC_PATH. 2018-05-31 10:12:08 +12:00
Robbie Averill
0f27e9696b Merge branch '4.1' into 4 
# Conflicts:
  #	.travis.yml
 2018-05-28 18:22:07 +12:00
Robbie Averill
7479907333 Merge remote-tracking branch 'origin/4.0' into 4.1 2018-05-28 18:20:46 +12:00
Daniel Hensby
a393de8d8d
Updating code style 2018-05-02 11:54:59 +01:00
Daniel Hensby
ed17eb2bd8
Revert "FIX Correct SilverStripeNavigator correctly in templates" 
This reverts commit cf5a0984ad.
 2018-05-01 13:00:11 +01:00
Daniel Hensby
80a8e9033e
Move navigator casting to static 2018-05-01 12:59:53 +01:00
Damian Mooyman
8c11f83ed4
Merge remote-tracking branch 'origin/4.1' into 4 
# Conflicts:
#	.travis.yml
 2018-04-13 10:25:28 +12:00
Damian Mooyman
61429c17a6
Merge remote-tracking branch 'origin/4.0' into 4.1 
# Conflicts:
#	.travis.yml
 2018-04-13 10:03:47 +12:00
Damian Mooyman
87d69ba753
ENHANCEMENT Use i18n template for page tree title 2018-04-10 10:30:49 +12:00
Jason Korth
e554e82afa
adjustment to show Page Type title on SiteTree mouseover 2018-04-09 21:52:07 +01:00
Damian Mooyman
6c616f5f7a API Implement polymorphic sitetree link tracking (#2123) 
* WIP Implement polymorphic sitetree link tracking

* Update unit tests
Merge SiteTreeTrackedPage into SiteTree directly

* Fix bugs and issues

* Fix support for file link tracking

* Add missing use

* Add back deprecated extension

* Remove obsolete belongs_many_many

* Update deprecations

* BUG Ensure non-SiteTree records support link tracking

* Safer changed check

* Shift file tracking test to assets module

* Better check for live stage on versioning

* Deprecate method

* Cleanup virtualpage

* Clear records on delete

* Ensure upgrade task occurs on draft

* fix linting
 2018-04-06 15:53:57 +12:00
Damian Mooyman
48f53a522a
Merge remote-tracking branch 'origin/4.1' into 4 2018-04-05 08:38:24 +12:00
Damian Mooyman
c6af8856c8
Merge remote-tracking branch 'origin/4.0' into 4.1 
# Conflicts:
#	code/Controllers/ContentController.php
 2018-04-05 08:37:48 +12:00
Daniel Hensby
cf5a0984ad
FIX Correct SilverStripeNavigator correctly in templates 2018-03-22 14:40:14 +00:00
Daniel Hensby
dd0a46f5ba
Merge branch '4.1' into 4 2018-03-18 09:18:19 +00:00
Daniel Hensby
7dea009ad8
Merge branch '4.0' into 4.1 2018-03-18 09:17:51 +00:00
Daniel Hensby
00fea26be9
Merge branch '3.6' into 4.0 2018-03-18 09:17:20 +00:00
Steve Dixon
d096eb7c36 FIX: Remove SearchForm results() function from allowed_actions 2018-03-15 11:53:12 +11:00
Damian Mooyman
354d72165e Update CMS for versioned enhancements (#2122) 2018-03-14 16:34:46 +13:00
Damian Mooyman
90723a2f07
Merge remote-tracking branch 'origin/4.1' into 4 2018-03-13 14:35:13 +13:00
Damian Mooyman
7fc50ef2ed Merge remote-tracking branch 'origin/4.0' into 4.1 2018-03-13 14:34:14 +13:00
Damian Mooyman
2b9faf46fe
BUG Fix InSection failing on non-page controllers 
Fixes #2119
 2018-03-12 10:31:40 +13:00
Damian Mooyman
dde1349368
BUG Fix invalid css classname in virtualpage 2018-03-05 14:58:32 +13:00
Daniel Hensby
0fd7e63057
Merge branch '4.1' into 4 2018-02-27 11:00:03 +00:00
Rick Hambrook
012bfec5bf FIX Bug field help text translations no longer need to be HTML encoded 2018-02-27 11:12:50 +13:00
Rick Hambrook
289522ba0c
FIX Bug field help text translations no longer need to be HTML encoded 2018-02-22 21:41:11 +13:00
Daniel Hensby
d02c15150b
Merge branch '4.1' into 4 2018-02-21 14:02:52 +00:00
Daniel Hensby
47fdc4c589
Merge branch '4.0' into 4.1 2018-02-21 14:02:17 +00:00
Damian Mooyman
289d6a87a2
MINOR Simplify i18n keys 2018-02-21 10:32:13 +13:00
Robbie Averill
9ebea37b33 NEW Add extension point to CMSMain::Breadcrumbs 2018-02-20 14:28:25 +13:00
Damian Mooyman
3be0478e1c
BUG Fix behaviour towards versioned but unstagable records 2018-02-20 11:03:23 +13:00
Daniel Hensby
9d77d32dea
Merge pull request #2099 from creative-commoners/pulls/4.0/dont-alias-this 
MINOR Stop aliasing $this in history controller callbacks
 2018-02-15 10:01:52 +00:00
Robbie Averill
e3a7a1ffed MINOR Stop aliasing $this in history controller callbacks 2018-02-15 13:38:29 +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
Christopher Joe
e05c47a550 Remove passing in record 2018-02-14 14:00:04 +13:00
Chris Joe
a3873a6422
Merge pull request #2093 from open-sausages/pulls/4.1/mind-if-i-button 
Replace save draft / save & publish buttons with save, publish
 2018-02-12 10:47:14 +13:00
Christopher Joe
01514490fe Feature remove File extension for backlink tracking in favour of UsedOnTable form field 2018-02-09 15:33:32 +13:00
Aaron Carlino
ca8b728580 replace save draft / save & publish buttons with save, publish 2018-02-09 12:18:57 +13:00
Robbie Averill
b084fe8177 NEW Convert page history notice to use Bootstrap 4 info alert 2018-02-07 16:47:24 +13:00
Chris Joe
98d1456384
Merge pull request #2088 from open-sausages/pulls/4.0/daft-draft 
Add missing button styles to restore draft action
 2018-02-07 15:51:48 +13:00
Luke Edwards
168b899917 BUG Add missing button styles to restore draft action 2018-02-07 14:06:21 +13:00
Loz Calver
fb30448033
Merge pull request #2085 from creative-commoners/pulls/4.1/warning-classes 
NEW Use Bootstrap alerts instead of legacy message classes for install.php warning
 2018-02-02 09:08:49 +00:00
Robbie Averill
f582954aea NEW Use Bootstrap alerts instead of legacy message classes for install.php warning 2018-02-02 13:02:47 +13:00
Chris Joe
07e70148da BUG Add some exist check for tabsets which may not be there (#2079) 2018-01-31 10:45:31 +13:00
Damian Mooyman
e99bd6f49e
ENHANCEMENT Ensure all base folders are excluded 
ENHANCEMENT Controller names are now allowed as urlsegments
Fixes #2059
 2018-01-25 15:33:10 +13:00
Damian Mooyman
cb2745c737
Refactor and cleanup SiteTreeFileFormFactoryExtension 2018-01-16 16:53:11 +13:00
Mike Cochrane
8b19afe235 File Form missing CMS Usage information 2018-01-16 15:48:15 +13:00
Daniel Hensby
5a77ec8cea
Merge branch '4.0' into 4 2018-01-15 16:19:22 +00:00