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,612 Commits 29 Branches 403 Tags 28 MiB
23daa2fbe5
Commit Graph

4612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
e570d4a726 Updating travis provisioner 
Travis will now be more resilient to `composer self-update` failures
 2015-06-15 10:03:40 +01:00
scott1702
ffb6c38e3d Remove 'Filtered Tree' notification when clearing the filter 2015-06-15 16:54:41 +12:00
Daniel Hensby
177ef7d99a Merge branch 'chillu-pulls/localized-urlsegment-creation' into 3 2015-06-13 15:26:20 +01: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
Stan Hutcheon
e2d85b2f88 VirtualPage call init on target controller 2015-06-13 12:38:59 +12:00
Damian Mooyman
e99554fc17 Merge remote-tracking branch 'origin/3.1' into 3 2015-06-09 11:11:39 +12:00
Damian Mooyman
9fcda11969 Merge pull request #1211 from stevie-mayhew/pulls/get-calls 
FIX: explicitly call get functions for site tree checks
 2015-06-05 16:38:37 +12:00
Stevie Mayhew
a819bcfc97 FIX: explicitly call get functions for site tree checks 2015-06-05 11:09:23 +12:00
Sam Minnée
bb68036854 Merge pull request #1203 from tractorcow/pulls/3.2/archive-actions 
API Deprecate delete in favour of archive
 2015-06-04 19:07:19 +12: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
3872b02f65 Merge pull request #1205 from jonom/fix-treedropdown-folders 
FIX: Folder expansion icons
 2015-06-03 10:18:11 +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
Jonathon Menz
dbe2ad4f9f FIX: Folder expansion icons 
This is a companion fix for https://github.com/silverstripe/silverstripe-framework/pull/4202
 2015-05-29 08:43:44 -07:00
Damian Mooyman
0557c0d47b Update translations 2015-05-14 13:52:21 +12:00
Sean Harvey
cded12772c Merge pull request #1200 from tractorcow/pulls/3/filter-page-highlight 
API Enable tree filter highlighting
 2015-05-07 10:14:42 +12:00
Damian Mooyman
c5e0c8f007 API Enable tree filter highlighting 
Decoupling of CMS / Framework
 2015-05-04 17:05:35 +12:00
Ingo Schommer
f4f226927d Merge pull request #1196 from stevie-mayhew/pulls/getrequest 
UPDATE: change all instances of $this->request to use appropriate getter/setter
 2015-04-30 11:57:12 +12:00
Stevie Mayhew
7ddf5fa697 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:02 +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
Ingo Schommer
bb177249ba Merge pull request #1170 from tractorcow/pulls/3.1/cms-test 
BUG Fix CMSMainTest attempting to render page on Security permission error
 2015-04-29 00:12:47 +12:00
Ingo Schommer
221281dade Merge pull request #1181 from dhensby/pulls/injector-searc-form 
FIX Use SearchForm::create to instantiate SearchForm
 2015-04-29 00:11:52 +12:00
Ingo Schommer
c8262f6202 Merge branch 'dhensby-pulls/dataobject-relation-updates' into 3 2015-04-28 23:34:48 +12:00
Ingo Schommer
94d354de4a Fixed BacklinkTracking filter usage 
Previous deprecation fixes made this method error out
when called on the root node (ID=0), so when admin/assets is first called.
 2015-04-28 23:34:26 +12:00
Ingo Schommer
812a921072 Merge branch 'pulls/dataobject-relation-updates' of https://github.com/dhensby/silverstripe-cms into dhensby-pulls/dataobject-relation-updates 2015-04-28 23:17:25 +12:00
Damian Mooyman
81097dfef6 Merge pull request #1195 from flashbackzoo/pulls/used-on-list 
Improve UX of asset management
 2015-04-28 13:28:36 +12:00
David Craig
7bdca7f5cc Added a list of pages where a file is used 2015-04-28 13:15:44 +12:00
Stephen Shkardoon
857ade7d1d Refactor ErrorPage to have static file building in a separate method 2015-04-27 11:56:54 +12:00
Ingo Schommer
a5ef364e67 Merge pull request #1140 from InfinityIo/sitetree-docblock-improvements 
PHPDoc improvements for SiteTree and SiteTreeLinkTracking
 2015-04-26 18:43:43 +12:00
Nik Rolls
5163690bdc PHPDoc improvements for SiteTree and SiteTreeLinkTracking 
- Removed @param/@method references to fields from extensions
- Added @mixin references to extensions
- Fixed incorrect PHPDoc @params and @returns
- Fixed wrapping width on many docblocks
- Added and/or improved method documentation when missing or confusing
- Fixed typos as found
 2015-04-20 20:59:52 +12:00
Michael Strong
5ab15da8fe Concat links in "broken links" report (fixes #1117) 
Fixes operation with any modules that add GET parameters to CMS links,
such as the Translatable module.

Pull request by @micmania1, see https://github.com/silverstripe/silverstripe-cms/pull/1118.
Modified by @chillu based on peer review feedback.
 2015-04-19 22:39:57 +12:00
Ingo Schommer
819954b8b4 Merge pull request #1186 from colintucker/1150-save-delete-buttons-files 
Issue #1150: Removed Save and Delete buttons from regular edit form.
 2015-04-19 22:00:06 +12:00
Colin Tucker
02fcf6429b Issue #1150: Removed Save and Delete buttons from regular edit form. 2015-04-17 09:19:15 +10:00
Daniel Hensby
a71f5f99fa FIX Use SearchForm::create to instantiate SearchForm 2015-03-31 17:03:17 +01:00
Damian Mooyman
36f71270a6 Ensure correct version of siteconfig is required 2015-03-31 19:57:46 +13: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
Hamish Friedlander
8e2ed31453 Merge pull request #1176 from tractorcow/pulls/3.1.11/fix-page-create 
BUG Fix SiteTree / SiteConfig permissions
 2015-03-19 16:36:39 +13:00
Damian Mooyman
a84361e4e8 Ensure SiteConfig::canView 2015-03-19 16:16:54 +13:00
Damian Mooyman
3df41e1176 BUG Fix SiteTree / SiteConfig permissions 2015-03-19 15:29:38 +13:00
Loz Calver
e0afd2f772 Update use of DataObject methods (as per framework #3799) 2015-03-13 22:11:51 +00: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
cabd8bbab9 Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting 
FIX: VirtualPages use correct casting for 'virtual' database fields
 2015-03-06 11:29:18 +13:00
Damian Mooyman
6c92a86d2e BUG Fix CMSMainTest attempting to render page on Security permission error 2015-02-24 17:27:48 +13:00
Damian Mooyman
2fdf9d7320 Fix CORE_RELEASE 2015-02-20 12:48:27 +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
0a8cb64a5c Merge pull request #1165 from dhensby/pulls/fixes 
Pulls/fixes
 2015-02-13 11:54:26 +13:00
Daniel Hensby
fe8cbc89d4 Remove double escaping of report data 2015-02-08 02:11:17 +00:00