Commit Graph

333 Commits

Author SHA1 Message Date
Daniel Hensby df68e34398
Merge branch '2.2' into 2.3 2017-07-20 10:31:55 +01:00
Daniel Hensby 7bfe622909
Merge branch '2.1' into 2.2 2017-07-20 10:30:12 +01:00
Daniel Hensby 3a62155f66
Merge branch '2.0' into 2.1 2017-07-20 10:29:50 +01:00
Loz Calver 6f5d4bd658 Merge pull request #458 from dhensby/pulls/2.0/fix-url-segment-generation
FIX Dont generate urlsegments if we dont need to
2017-07-20 09:07:06 +01:00
Daniel Hensby 34b6191666
Remove HHVM from test builds 2017-07-19 17:47:04 +01:00
Daniel Hensby c29438fd1a
FIX Dont generate urlsegments if we dont need to 2017-07-19 17:42:46 +01:00
Damian Mooyman be1a502823 Add 2.3.0 changelog 2015-11-23 16:08:22 +13:00
Scott Hutchinson 797c8ee45b Merge pull request #341 from tractorcow/pulls/fix-phpcompat-33
BUG Fix regression in #312 in PHP 5.3
2015-11-23 16:02:34 +13:00
Damian Mooyman 5282ad84f9 BUG Fix regression in #312 in PHP 5.3 2015-11-23 15:45:22 +13:00
Damian Mooyman a4c6e5abb6 Update translations 2015-11-23 11:15:25 +13:00
Damian Mooyman cf18cfcdb1 Merge pull request #338 from lekoala/master
french translation
2015-11-23 11:04:04 +13:00
Damian Mooyman 0a8ee233a6 Merge pull request #331 from helpfulrobot/convert-to-psr-2
Converted to PSR-2
2015-11-23 10:46:41 +13:00
Daniel Hensby 664340bdd3 Merge pull request #339 from helpfulrobot/add-standard-code-of-conduct
Added standard code of conduct
2015-11-21 10:32:25 +00:00
helpfulrobot 834343c9c0 Added standard code of conduct 2015-11-21 20:12:35 +13:00
helpfulrobot f82825d9a6 Converted to PSR-2 2015-11-21 19:17:29 +13:00
Thomas 417277b77a french translation 2015-11-20 11:47:06 +01:00
Daniel Hensby 4785ad0123 Merge pull request #297 from lekoala/master
Allow injection on date
2015-11-20 09:30:06 +00:00
Thomas 4c4afd5b38 allow injection on date 2015-11-20 08:53:20 +01:00
Damian Mooyman 8a877debf2 Merge pull request #337 from scott1702/master
Add changelog for release
2015-11-20 13:22:03 +13:00
scott1702 31b3bb7d73 Add changelog for release 2015-11-20 12:52:01 +13:00
Damian Mooyman 3d6de78df5 Merge pull request #306 from DrMartinGonzo/patch-1
i18n wrong label in BlogPost.php
2015-11-20 12:51:00 +13:00
Damian Mooyman 4d5c63e772 Merge pull request #329 from helpfulrobot/add-standard-scrutinizer-config
Added standard Scrutinizer config
2015-11-20 12:50:09 +13:00
Damian Mooyman 7bddc86ab4 Merge pull request #303 from SilbinaryWolf/fix-changing-blog-pagetype
Fix bug where can't change 'Blog' page type to non-'Blog' page type
2015-11-20 12:49:54 +13:00
David Craig 388b868b89 Merge pull request #333 from assertchris/remove-featured-posts
Removed featured posts
2015-11-20 10:37:24 +13:00
Daniel Hensby 4175e592f7 Merge pull request #335 from helpfulrobot/add-standard-license
Added standard license
2015-11-19 17:26:23 +00:00
Daniel Hensby a5ac85285e Merge pull request #336 from helpfulrobot/add-standard-git-attributes
Added standard git attributes
2015-11-19 09:39:46 +00:00
helpfulrobot 104782f061 Added standard git attributes 2015-11-19 19:11:09 +13:00
helpfulrobot 9dfaae802d Added standard license 2015-11-19 18:29:47 +13:00
Damian Mooyman 1e31fa6b00 Merge pull request #334 from helpfulrobot/add-standard-editor-config
Added standard editor config
2015-11-19 14:13:50 +13:00
helpfulrobot 1b79c4d6b0 Added standard editor config 2015-11-19 13:24:47 +13:00
Christopher Pitt 21e45ce875 Removed featured posts 2015-11-19 10:09:46 +13:00
helpfulrobot 67678944d9 Added standard Scrutinizer config 2015-11-18 15:01:24 +13:00
Damian Mooyman 3ef14a6e1a Merge pull request #328 from silverstripe/add-hook-for-extension-filters-on-tag-blog-posts
Added hook for extension filters on tag blog posts
2015-11-17 16:37:23 +13:00
Damian Mooyman 974e5636c4 Merge pull request #327 from silverstripe/add-hook-for-extension-filters-on-category-blog-posts
Added hook for extension filters on category blog posts
2015-11-17 16:37:03 +13:00
Christopher Pitt 040fb95eb6 Added hook for extension filters on tag blog posts 2015-11-17 16:09:31 +13:00
Damian Mooyman a5b98a4244 Update translations 2015-11-17 16:07:37 +13:00
Christopher Pitt 34a45e21a7 Added hook for extension filters on category blog posts 2015-11-17 16:06:19 +13:00
Christopher Pitt 3f23add5af Merge pull request #318 from unclecheese/patch-1
BUGFIX: Dropdowns do not use unique IDs
2015-11-17 11:52:48 +13:00
Damian Mooyman bc151e1591 Merge pull request #325 from assertchris/add-featured-posts
Added featured posts to CMS
2015-11-13 15:36:45 +13:00
Christopher Pitt 6d059806ea Added featured posts to CMS 2015-11-13 15:06:29 +13:00
Damian Mooyman ee9cca0788 Merge pull request #322 from camfindlay/hotfix/fix-titlebug
FIX Title bug due to #320
2015-11-10 11:25:41 +13:00
Cam Findlay 12674edb87 FIX Title bug due to #320 2015-11-10 10:20:12 +13:00
Damian Mooyman 01091ee20b Merge pull request #321 from silverstripe/fix-archive-year-test
FIX Hardcode the year to the current year in setUp()
2015-11-09 16:51:13 +13:00
Michael Strong 930074c2a2 FIX Hardcode the year to the current year in setUp() 2015-11-09 15:52:21 +13:00
Michael Strong a27dd892f6 Merge pull request #319 from tractorcow/pulls/fix-paginated-filter
BUG Fix tag / category filters not being filtered in PaginatedList()
2015-11-09 15:30:25 +13:00
Damian Mooyman b45a573fac BUG Fix tag / category filters not being filtered in PaginatedList() 2015-11-09 15:22:57 +13:00
Damian Mooyman dd33bbfa50 Merge pull request #320 from camfindlay/feature/defaultarchiveyear
ENHANCEMENT Default archive year
2015-11-09 14:30:02 +13:00
Cam Findlay 43bb2248a5 ENHANCEMENT Default archive year
If no year is passed, rather than 404 it should grab the latest years posts.
2015-11-09 13:56:50 +13:00
unclecheese 454d31910a BUGFIX: Dropdowns do not use unique IDs
Solves problem where `DOMXPath` was throwing (in `ShortcodeParser`) due to invalid HTML
2015-11-05 12:02:00 +13:00
Christopher Pitt a87e0f77e6 Merge pull request #317 from tractorcow/pulls/fix-nonblog-parent
BUG Fix crash if parent page isn't Blog type
2015-11-05 11:44:03 +13:00