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,692 Commits 29 Branches 403 Tags 28 MiB
3cefb2edad
Commit Graph

4692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
80aca3a511 Merge branch '3.1' into 3.2 2015-08-17 14:20:58 +01:00
Loz Calver
718503edb1 Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children 
* antons--773-nested-virtual-pages-allowed_children:
  Issue #773 - $allowed_children not allowing nested virtual pages
 2015-08-06 10:51:56 +01:00
Anton Smith
c6684559f6 Issue #773 - $allowed_children not allowing nested virtual pages 
Additional check to see if a 'VirtualPage' has a page attached to it
 2015-08-06 10:47:23 +01:00
Damian Mooyman
a1b9e99342 Update localisation 2015-08-04 13:02:52 +12:00
Sam Minnée
fd457fe93e Merge pull request #1256 from tractorcow/pulls/3.2/batch-restore-beta 
API batch restore action (ALTERNATE SOLUTION)
 2015-08-03 22:08:13 +12:00
Damian Mooyman
e22b653e06 API batch restore action 2015-08-03 20:57:30 +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
Sam Minnée
fa8aa8f92e Merge pull request #1241 from tractorcow/pulls/3.2/predictable-ids 
API respect custom attributes on OptionsetField and CheckboxSetField
 2015-08-03 17:23:24 +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
Damian Mooyman
e45ef93aa7 Merge pull request #1250 from jonom/choose-file-thumbnails-3.2 
Moved image thumbnail style rules to Framework
 2015-08-03 08:40:21 +12:00
Damian Mooyman
3790273ae7 Merge remote-tracking branch 'origin/3' 
Conflicts:
	composer.json
 2015-07-31 15:49:46 +12:00
Damian Mooyman
71b23b622c Merge remote-tracking branch 'origin/3.2' into 3 2015-07-31 14:34:04 +12:00
Damian Mooyman
f6752c5ce9 Merge remote-tracking branch 'origin/3.1' into 3.2 2015-07-31 11:42:20 +12:00
Jonathon Menz
7041a43684 Moved image thumbnail style rules to Framework 
for consistent styling of image thumbnails in GridFields
 2015-07-30 16:15:35 -07:00
Daniel Hensby
aa913dd1d5 Merge pull request #1248 from kinglozzer/pulls/1244-contentcontroller-templates 
FIX: ContentController::getViewer() not returning all found templates (fixes #1244)
 2015-07-27 13:00:38 +01:00
Loz Calver
af4150312c Update .travis.yml to match framework 2015-07-24 15:27:13 +01:00
Daniel Hensby
6050cc5403 Move to new travis containerised infrastructure 2015-07-24 11:50:12 +01:00
Loz Calver
10b2fdc318 FIX: ContentController::getViewer() not returning all found templates (fixes #1244) 2015-07-24 11:50:09 +01:00
Daniel Hensby
2408c16b0a Move to new travis containerised infrastructure 2015-07-20 15:54:56 +01:00
Dan Hensby
a94881372f Merge remote-tracking branch 'origin/3.2' into 3 2015-07-20 14:14:28 +00:00
Daniel Hensby
f55b22bd75 Merge branch '3.1' into 3.2 
Conflicts:
	CONTRIBUTING.md
	code/reports/BrokenLinksReport.php
	code/reports/SideReport.php
	tests/model/RedirectorPageTest.php
	tests/reports/ReportTest.php
 2015-07-20 11:09:29 +01:00
Damian Mooyman
8bb09086fe Merge pull request #1246 from chillu/pulls/fix-behat-image-hotlink 
Behat tests hotlinking to non-existant image
 2015-07-20 19:39:12 +12:00
Ingo Schommer
ce85764292 Behat tests hotlinking to non-existant image 
Caused by silverstripe.com redesign. Ideally we'd
have a permanent asset hosted there which is clearly marked as a test dependency.
Or create a placeholder for images linked served localhost within the Behat tests,
in which case we wouldn't require a network connection to execute Behat.
 2015-07-18 15:38:44 +12:00
Ingo Schommer
e4bdd0fd72 Merge pull request #1233 from scott1702/cms-styling 
Update button styles
 2015-07-16 21:56:18 +12:00
Ingo Schommer
d5043ed5c8 Merge pull request #1245 from torleif/patch-2 
Update CONTRIBUTING.md
 2015-07-15 09:23:17 +12:00
torleif
4c050b727b Update CONTRIBUTING.md 
[Fix] dead links for 3.1
 2015-07-15 09:17:29 +12:00
Damian Mooyman
2771f2708b Merge pull request #1239 from oddnoc/broken-links-report-broken-link-31 
Correct doubly-escaped " marks
 2015-07-14 15:29:57 +12:00
Daniel Hensby
2371830790 Merge pull request #1243 from torleif/patch-1 
[fix] update dead links
 2015-07-13 14:28:04 +01:00
torleif
1975511c63 [fix] update dead links 2015-07-13 12:39:45 +12:00
scott1702
b976dc8f78 Update button styles 2015-07-07 14:46:27 +12:00
Fred Condo
f9cceaada0 Correct doubly-escaped " marks 
The links in the Broken Links Report had extraneous " marks that made
them unusable. This fixes the links.
 2015-07-01 17:42:26 -07:00
Damian Mooyman
0b76bd4678 Merge pull request #1234 from flashbackzoo/pulls/ux-three-column-layout 
Add three column layout to Page content view
 2015-07-02 10:26: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
Ingo Schommer
cb0fa4263e Merge pull request #1236 from tractorcow/pulls/3.2/fix-behat 
BUG fix behat tests
 2015-07-01 14:38:31 +12:00
Damian Mooyman
3b90fef04f BUG fix behat tests 
Fixes #1223
 2015-07-01 13:24:44 +12:00
Daniel Hensby
2f624299f2 Merge pull request #1228 from JayDevlin/3.2-CMSSettingsController 
Increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain
 2015-06-28 08:03:12 +01:00
Daniel Hensby
284a0f0e13 Merge pull request #1231 from kinglozzer/pulls/redirectorpage-finished-response 
FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished (fixes #1230)
 2015-06-26 16:46:52 +01:00
Loz Calver
d78d325073 FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished (fixes #1230) 2015-06-26 10:47:39 +01:00
Daniel Hensby
524b36b75c Merge pull request #1213 from nglasl/3.1 
FIX Enforced the published/draft selection for SS reports, which was bein…
 2015-06-24 08:08:37 +01:00
Damian Mooyman
c162b50c37 Merge pull request #1221 from flashbackzoo/pulls/ux-update-filters 
UX improvements
 2015-06-24 10:39:06 +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
3ac29817ba Merge pull request #1206 from ss23/permissions_fix 
Fix duplicate not having the correct permission check
 2015-06-23 17:32:35 +12:00
Stephen Shkardoon
b71a521c21 Fix incorrect permission check on duplicate() 
Will now properly fall back to the canCreate() on the parent
 2015-06-23 16:42:08 +12:00
Devlin
bc4dc5cf79 increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain 2015-06-22 14:15:49 +02:00
Nathan Glasl
0de71d45db Enforced the published/draft selection for SS reports, which was being ignored due to previous code refactoring. 2015-06-22 16:05:13 +10:00
Damian Mooyman
6513f8ac49 Merge 3.2 into 3 2015-06-22 14:14:15 +12:00
Daniel Hensby
c678855c46 MINOR Bump PHP version for 3.2 2015-06-20 11:34:18 +01:00
Damian Mooyman
12bcf382ad Update translations 2015-06-19 18:25:53 +12:00
Hamish Friedlander
124de94e67 Merge pull request #1222 from tractorcow/pulls/3.2/deprecations 
Set deprecation level for all changes in 3.x to 4.0
 2015-06-19 15:59:25 +12:00