Commit Graph

907 Commits

Author SHA1 Message Date
Robbie Averill
1a9cdee0f2 Remove obsolete branch alias 2017-11-20 14:31:23 +13:00
Daniel Hensby
1d6cf1dec6
Merge pull request #486 from zanderwar/pulls/3.0/optional-profiles
Allow a user to disable all profiles
2017-11-06 15:56:55 +00:00
Robbie Averill
271fbfeae7 Merge branch '2' 2017-11-03 15:39:57 +13:00
Robbie Averill
ffc0ab7f38 Merge branch '2.4' into 2 2017-11-03 15:35:11 +13:00
Damian Mooyman
f2a0c36bd6
Merge pull request #487 from creative-commoners/pulls/2.4/fix-parent-canview
FIX Ensure that draft blog posts are always viewable to users with view draft permission
2017-11-03 15:12:44 +13:00
Robbie Averill
c2f58507a0 FIX Ensure that draft blog posts are always viewable to users with view draft permission 2017-11-03 14:00:14 +13:00
zanderwar
99112e6eef Test for disable_profiles option 2017-11-03 08:32:38 +13:00
zanderwar
2e01219e8f Documentation for disabling user profiles 2017-11-03 08:32:25 +13:00
zanderwar
3d8f0941ed Added config option check for disable_profiles and removed linking if it is disabled 2017-11-03 08:32:03 +13:00
zanderwar
54aeb23356 Fixed return tags and values 2017-11-01 22:00:33 +13:00
Daniel Hensby
49744a0a94
Updating travis install steps 2017-10-12 13:28:32 +01:00
Robbie Averill
c0b10e450e Merge pull request #482 from creative-commoners/pulls/vendorise-ci
FIX convert CI bootstrap references to new their new locations in vendor
2017-10-05 11:04:12 +13:00
Dylan Wagstaff
ee74732b1f FIX convert CI bootstrap references to new their new locations in vendor 2017-10-05 10:07:54 +13:00
Franco Springveldt
f972b1cfa6 FIX testArchiveMonthlyWithNewPostsAdded SS4 friendly 2017-09-28 17:37:31 +13:00
Franco Springveldt
993846b98c FIX merge conflicts 2017-09-28 16:53:32 +13:00
Franco Springveldt
f29b73f532 Merge branch '2.4' into 2 2017-09-28 16:46:58 +13:00
Franco Springveldt
246b203452 Merge pull request #481 from creative-commoners/pulls/2.4/fix-archive-widget-date-today
FIX Archive widget shows months from posts published that day
2017-09-28 16:40:49 +13:00
Robbie Averill
d47648a86d FIX Archive widget shows months from posts published that day 2017-09-28 15:08:30 +13:00
Robbie Averill
427abee8b0 FIX Datetime format for MySQL and Postgres, add widgets to Travis builds 2017-09-27 13:25:03 +13:00
Florian Thoma
dae2ba0e5f add meta links for previous and next pages in pagination 2017-09-27 13:14:27 +13:00
Robbie Averill
6525f1c109 FIX Update BlogArchiveWidget and tests for SS4 2017-09-27 11:49:57 +13:00
Robbie Averill
75f5042d60 Merge branch '2' 2017-09-27 11:48:41 +13:00
Robbie Averill
385fe9572a Merge branch '2.4' into 2 2017-09-27 11:25:36 +13:00
Loz Calver
165ef46b64 Merge pull request #480 from creative-commoners/pulls/2.4/archived-widget-years
FIX Display individual years in blog archive widget when set to "Yearly"
2017-09-26 09:13:05 +01:00
Robbie Averill
8e684dea50 FIX BlogArchiveWidget for PostgreSQL compatibility 2017-09-26 17:17:53 +13:00
Robbie Averill
92f6192870 Increase mimumum versioned of SilverStripe to 3.2 and update versions in Travis configuration 2017-09-26 17:05:04 +13:00
Robbie Averill
a1e4f3efce Add tests for BlogArchiveWidget 2017-09-26 16:17:41 +13:00
Robbie Averill
b1acc1d359 Merge pull request #479 from creative-commoners/pulls/2/fix-help-links
FIX Blog user settings help links displayed incorrectly
2017-09-26 09:28:32 +13:00
Daniel Hensby
311842a69b
Add sass config and compile 2017-09-25 21:00:48 +01:00
Robbie Averill
27044d86a5 FIX Display individual years in blog archive widget when set to "Yearly" 2017-09-22 14:54:44 +12:00
Franco Springveldt
010d751337 FIX Blog user settings help links displayed incorrectly 2017-09-22 12:20:41 +12:00
Robbie Averill
5fb5bc0b2a Merge pull request #476 from creative-commoners/pulls/2/ss4-docs-update
DOC SS4 documentation update
2017-09-21 11:10:14 +12:00
Franco Springveldt
740d252536 Merge branch 'creative-commoners-pulls/2/ss4-docs-update' 2017-09-21 10:38:13 +12:00
Franco Springveldt
38d1fac04d Merge branch 'pulls/2/ss4-docs-update' of https://github.com/creative-commoners/silverstripe-blog into creative-commoners-pulls/2/ss4-docs-update 2017-09-21 10:37:18 +12:00
Franco Springveldt
5d516ea678 FIX namespaced includes 2017-09-21 09:11:37 +12:00
Franco Springveldt
3936ddcaff DOC typos and translations fixed 2017-09-21 09:05:07 +12:00
Franco Springveldt
8e3729de51 SS4 documentation updates 2017-09-20 12:15:19 +12:00
Daniel Hensby
35cbc20d5f Merge pull request #437 from xini/feature-prev-next
add meta links for previous and next pages in paging and post view
2017-09-19 12:03:21 +01:00
Robbie Averill
dd31c6fa35 Merge pull request #473 from creative-commoners/pulls/2/further-translations-updates
FIX Language file updates
2017-09-19 12:03:16 +12:00
Franco Springveldt
297e384b85 Removed HTML from lang files 2017-09-19 10:57:02 +12:00
Franco Springveldt
5737881cee Lang updates 2017-09-19 10:50:13 +12:00
Daniel Hensby
b83e0e8117 Merge pull request #472 from creative-commoners/pulls/2/updating-translations
FIX updated translations to use namespaces
2017-09-18 10:44:45 +01:00
Robbie Averill
6527cbae16 Revert "Removing translations in preparation for namepsacing them"
This reverts commit 6a16213bc7.
2017-09-18 16:03:08 +12:00
Franco Springveldt
dc0e56b49a FIX further translations fixed in templates 2017-09-18 15:59:58 +12:00
Robbie Averill
db18b5d31f FIX Update BlogFunctionalTest for SS4 2017-09-18 15:56:31 +12:00
Franco Springveldt
90359e36f8 FIX updated translations to use namespaces 2017-09-18 15:24:33 +12:00
Robbie Averill
7f63681d33 Merge branch '2' 2017-09-14 17:11:45 +12:00
Robbie Averill
9a5690ca3e Merge branch '2.4' into 2 2017-09-14 16:53:42 +12:00
Robbie Averill
4aa468a6ab Merge pull request #470 from creative-commoners/pulls/2/update-translations
Removing translations in preparation for namepsacing them
2017-09-14 15:57:43 +12:00
Franco Springveldt
6a16213bc7 Removing translations in preparation for namepsacing them 2017-09-14 14:00:41 +12:00