tonyair
/
silverstripe-blog
mirror of https://github.com/silverstripe/silverstripe-blog
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
857 Commits 33 Branches 102 Tags 6.3 MiB
Commit Graph

857 Commits

Author SHA1 Message Date
Damian Mooyman eb32e495cc Merge pull request #234 from assertchris/fix-regressions 
Fixed regressions
 2015-05-14 11:10:12 +12:00
Christopher Pitt a978b4a9a1 Fixed regressions 2015-05-14 10:52:49 +12:00
Christopher Pitt e3f2036aaa Merge pull request #231 from flashbackzoo/pulls/update-default-pagination 
Update default pagination
 2015-05-13 15:30:51 +12:00
David Craig ea06252f2d Update default pagination 2015-05-13 15:12:48 +12:00
Christopher Pitt 277ad767e1 Added better Scrutinizer support 2015-05-13 00:12:21 +12:00
Damian Mooyman a64f6f0a81 Merge pull request #225 from assertchris/clean-up 
Clean up
 2015-05-11 14:13:11 +12:00
Christopher Pitt 787c02a19d Clean up 2015-05-11 10:11:21 +12:00
Cam Findlay e72905c023 Merge pull request #223 from assertchris/reorder-tabs 
ENHANCEMENT Blog post tabs show first to improve editing experience
 2015-05-09 22:18:16 +12:00
Christopher Pitt 0dd0bf0670 Reorder tabs 2015-05-09 20:27:56 +12:00
Damian Mooyman 8cd2b793fe Merge pull request #187 from assertchris/minimum-stability-settings 
Adjusted minimum stability flag to reflect dev-develop usage
 2015-04-28 15:34:56 +12:00
Damian Mooyman 6c1fee8eb1 Merge pull request #208 from A7DC/category-ux 
changed class to ID
 2015-04-28 14:25:28 +12:00
Christopher Pitt b31ff6c397 Adjusted minimum stability flag to reflect dev-develop usage 2015-04-28 14:23:58 +12:00
Daniel Caine c1ce71f7aa changed class to ID 2015-04-28 14:23:22 +12:00
Christopher Pitt 1427cbdf6b Merge pull request #196 from tractorcow/pulls/2.0/blogtree-migration 
BUG Fix blogtree with non-blogpost children breaking on migration
 2015-04-28 14:18:38 +12:00
Christopher Pitt 6bd8bc9210 Merge pull request #197 from tractorcow/pulls/2.0/replace 
Add composer replace
 2015-04-28 14:17:57 +12:00
Christopher Pitt 8dcc66bab8 Merge pull request #207 from A7DC/category-ux 
Category ux
 2015-04-28 14:17:43 +12:00
Damian Mooyman 26a8b39f70 Merge pull request #205 from assertchris/update-tagfield-dependency-version 
Update TagField dependency version
 2015-04-28 13:41:51 +12:00
Damian Mooyman 27611c980d Merge pull request #199 from tractorcow/pulls/2.0/helper-class 
Add helper class for cms styling
 2015-04-28 12:34:56 +12:00
Christopher Pitt e4adddd1b2 Update TagField dependency version 2015-04-28 12:04:07 +12:00
Damian Mooyman e0e9d95314 Merge pull request #204 from assertchris/style-changes-to-merging 
Style changes to merging
 2015-04-28 11:48:17 +12:00
Christopher Pitt d620df17f9 Style changes to merging 2015-04-28 11:25:53 +12:00
Daniel Caine 30acb4f383 icon styling 2015-04-24 10:27:09 +12:00
Damian Mooyman 40b05482a8 Merge pull request #201 from assertchris/hide-merge-for-empty-parents 
Hide merge for empty parents
 2015-04-24 10:03:49 +12:00
Christopher Pitt c7b374f800 Hide merge for empty parents 2015-04-24 09:45:28 +12:00
Damian Mooyman 48051024aa Merge pull request #203 from assertchris/small-improvements-to-merge-column 
Small improvements to merge column
 2015-04-23 17:13:03 +12:00
Damian Mooyman 0fd7f5fe8b Merge pull request #202 from assertchris/hide-current-parent-for-merge-options 
Hide current parent for merge options
 2015-04-23 17:12:43 +12:00
Christopher Pitt 5c099aa0dc Small improvements to merge column 2015-04-23 16:50:50 +12:00
Christopher Pitt 97498cc3f6 Hide current parent for merge options 2015-04-23 16:47:54 +12:00
Damian Mooyman efcdd64cf4 Add helper class for cms styling 2015-04-23 16:06:56 +12:00
Daniel Caine ac4509776c included icon for move button, ensured link is 100% width 2015-04-23 15:14:43 +12:00
Christopher Pitt 5130ed4e28 Merge pull request #198 from tractorcow/pulls/2.0/sidebar-sizing 
API Improve sizing of blog sidebar
 2015-04-23 14:48:52 +12:00
Damian Mooyman 8edc079e92 API Improve sizing of blog sidebar 2015-04-23 14:30:58 +12:00
Damian Mooyman 0c6f5122ed BUG Fix blogtree with non-blogpost children breaking on migration 2015-04-23 12:47:03 +12:00
Damian Mooyman 766bd5d153 Add composer replace 2015-04-23 12:43:43 +12:00
Christopher Pitt 7f5bf0cda9 Merge pull request #195 from tractorcow/pulls/fix-zindex 
BUG Backport of https://github.com/silverstripe/silverstripe-framework/pull/4077
 2015-04-22 16:22:41 +12:00
Damian Mooyman dfd90dc215 Add translations to transifex 2015-04-22 16:17:09 +12:00
Damian Mooyman ddd51252e1 BUG Backport of https://github.com/silverstripe/silverstripe-framework/pull/4077 to blog 
Better support for versions of framework 3.1.12 and older
 2015-04-22 14:59:11 +12:00
Damian Mooyman 8ff1fc178c BUG Fix typo in last merge 2015-04-21 19:17:27 +12:00
Damian Mooyman 5e9741d3fa Merge pull request #194 from assertchris/merging-tags-and-categories 
Added merging of tags and categories
 2015-04-21 18:45:05 +12:00
Christopher Pitt 5d9ed5b9e0 Added merging of tags and categories 2015-04-21 16:51:51 +12:00
Christopher Pitt 09145a25f7 Merge pull request #191 from tractorcow/pulls/2.0/remove-comments-css 
Remove comments CSS from blog and into comments module
 2015-04-21 15:28:34 +12:00
Damian Mooyman b173460400 Remove comments CSS from blog and into comments module 
Move CSS to scss
 2015-04-21 15:15:15 +12:00
Christopher Pitt 22f8901b63 Merge pull request #192 from A7DC/custom-summary 
design improvements for custom summary
 2015-04-21 15:11:11 +12:00
Christopher Pitt 97fea257c9 Merge pull request #193 from tractorcow/pulls/2.0/summary-css-class 
Add class to summary holder
 2015-04-21 15:10:51 +12:00
Damian Mooyman d4c80750ad Add class to summary holder 2015-04-21 13:21:22 +12:00
Daniel Caine 204d4ed29e design improvements for custom summary 2015-04-21 13:11:52 +12:00
Christopher Pitt 6ac6986ee6 Merge pull request #188 from scott1702/css-cleanup 
Cleanup of css styles for user-levels description
 2015-04-15 13:40:56 +12:00
scott1702 3da11ede53 Cleanup of css styles for user-levels description 2015-04-15 12:38:45 +12:00
Damian Mooyman e024fcb97a BUG Fix php 5.3 compatibility 2015-04-14 15:16:07 +12:00
Christopher Pitt 61f996461c Merge pull request #185 from tractorcow/pulls/2.0/summary-size 
Adjust size of custom summary and remove extra title
 2015-04-14 14:27:59 +12:00