Commit Graph

620 Commits

Author SHA1 Message Date
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
David Craig
99b03b555c Make BlogPost::isAuthor public 2015-04-02 14:50:46 +13:00
Damian Mooyman
4e1b4afb6c Merge pull request #171 from assertchris/pulls/2.0/better-credits-description
Better credits description in admin
2015-04-02 13:49:33 +13:00
Christopher Pitt
342d2a3d2a Better credits description in admin 2015-04-02 12:52:44 +13:00
Damian Mooyman
604f9eb1f8 Merge pull request #170 from assertchris/pulls/2.0/fix-credits
Fixed credits
2015-04-01 15:08:46 +13:00
Christopher Pitt
4ee278abb3 Fixed credits 2015-04-01 15:06:54 +13:00
Daniel Hensby
56f9d0c906 Merge pull request #168 from tractorcow/pulls/2.0/fix-member-url
BUG Fix incorrect reference to extension member ID
2015-03-31 21:38:23 +01:00
Damian Mooyman
99ff67feba BUG Fix incorrect reference to extension member ID 2015-03-31 17:07:29 +13:00
Damian Mooyman
0a70332e60 Merge pull request #167 from scott1702/button-naming
Remove 'Blog' from tags/categories buttons
2015-03-30 15:04:53 +13:00
scott1702
252f323ebe Remove 'Blog' from tags/categories buttons 2015-03-30 14:49:27 +13:00
Christopher Pitt
b84e6e7cf6 Merge pull request #165 from tractorcow/pulls/2.0/fix-tag-permissions
BUG Fix editors not being able to create categories / tags
2015-03-26 15:33:18 +13:00
Christopher Pitt
8d64f95372 Merge pull request #166 from tractorcow/pulls/2.0/sort-newest-first
Sort newest posts first
2015-03-26 10:09:50 +13:00
Damian Mooyman
deee52a994 Sort newest posts first 2015-03-26 09:56:06 +13:00
Damian Mooyman
45a1af4a0d BUG Fix editors not being able to create categories / tags
Remove debug::dump from tests
Hide options if not allowed to edit the blog
2015-03-25 15:24:40 +13:00
Damian Mooyman
3be06ffd20 Merge pull request #162 from flashbackzoo/pulls/member-profiles
Add member profiles to blog
2015-03-24 14:00:21 +13:00
David Craig
49bee390a3 Add user profiles to Blog 2015-03-24 12:25:46 +13:00
Christopher Pitt
47369dc9b6 Merge pull request #160 from tractorcow/pulls/2.0/fix-self
BUG Fix incorrect $this reference within closure
2015-03-16 12:35:48 +13:00
Damian Mooyman
dc5a941409 BUG Fix incorrect $this reference within closure 2015-03-16 12:26:04 +13:00