Commit Graph

487 Commits

Author SHA1 Message Date
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
Christopher Pitt
db69eab825 Merge pull request #179 from tractorcow/pulls/2.0/filter-description
API Add filter description to blog holder
2015-04-14 14:25:20 +12:00
Damian Mooyman
467a50175e Adjust size of custom summary and remove extra title
Depends on https://github.com/silverstripe/silverstripe-framework/pull/4072
2015-04-14 14:22:52 +12:00
Damian Mooyman
6130f81753 Merge pull request #184 from assertchris/add-tag-field
Added tag field
2015-04-14 14:18:19 +12:00
Christopher Pitt
3e29c378ed Added tag field 2015-04-14 14:12:59 +12:00
Christopher Pitt
c03ec88467 Merge pull request #182 from tractorcow/pulls/2.0/custom-summaries
API Enable custom summaries for blogposts
2015-04-13 17:52:33 +12:00
Damian Mooyman
6283122c9c API Enable custom summaries for blogposts 2015-04-13 17:13:53 +12:00
Damian Mooyman
359c2732a9 Merge pull request #181 from assertchris/fix-comment-form-bug
Fix $CommentsForm bug
2015-04-13 16:25:30 +12:00
Christopher Pitt
859ff57d3a Fix comment form bug 2015-04-13 16:23:36 +12:00
Damian Mooyman
0d31739255 Merge pull request #180 from scott1702/user-descriptions
Update descriptions of user levels
2015-04-13 11:58:37 +12:00
scott1702
6c5ff30bfb Update descriptions of user levels 2015-04-13 11:45:57 +12:00
Damian Mooyman
64b140f044 API Add localised filter description to blog holder
Supported by the default theme via $MetaTitle
2015-04-13 11:33:14 +12:00
Christopher Pitt
23c38002c4 Merge pull request #177 from tractorcow/pulls/2.0/role-helpers
API Add role-helpers for templates
2015-04-09 16:20:27 +12:00
Damian Mooyman
0dd2d2504b API Add role-helpers for templates 2015-04-09 16:13:05 +12:00
Christopher Pitt
db8ff0855c Merge pull request #178 from tractorcow/pulls/2.0/comment-notification-extensions
API Comment notification extensions
2015-04-09 16:13:01 +12:00
Damian Mooyman
81c0ca2c55 Comment notification extensions 2015-04-09 16:03:30 +12:00
Christopher Pitt
32c18515c1 Merge pull request #176 from tractorcow/pulls/2.0/comments-extension
API Enable comment specific enhancements
2015-04-09 14:13:10 +12:00
Damian Mooyman
5817eea314 API Enable comment specific enhancements
If an author creates a comment include a highlight class
2015-04-09 14:12:34 +12:00
Damian Mooyman
78bc202323 Merge pull request #175 from assertchris/add-role-help
Added role help
2015-04-09 13:18:24 +12:00
Christopher Pitt
330401683a Added role help 2015-04-09 13:04:47 +12:00
Damian Mooyman
d58b376bf1 Merge pull request #172 from flashbackzoo/pulls/protected-isauthor
Make BlogPost::isAuthor public
2015-04-02 14:53:21 +13:00