Commit Graph

634 Commits

Author SHA1 Message Date
Robbie Averill
ee0077f861 Merge branch '3.0' into 3.1 2018-12-12 14:45:48 +00:00
Robbie Averill
d7a2fc5a6c Update translations 2018-12-12 14:44:28 +00:00
Dylan Wagstaff
62d628cf62 Merge branch '3.0' into 3.1 2018-12-07 09:59:57 +13:00
Robbie Averill
233a5e6397 FIX Blog profile summary field is always inserted before the profile image field 2018-12-07 09:59:16 +13:00
Guy Marriott
17ed46cddd
Merge pull request #563 from shaunjc/sjc/3.0-date-fix
FIX: Update Blog archive date formats for SS4
2018-11-26 15:22:18 +13:00
Shaun Cockerill
c0895803db FIX: Update Blog archive date formats for SS4 2018-11-26 10:03:29 +08:00
Daniel Hensby
468e0530fd
Merge branch '3.0' into 3.1 2018-06-19 21:51:26 +01:00
Daniel Hensby
fcda48175c
Merge branch '2.5' into 3.0 2018-06-19 21:48:59 +01:00
Daniel Hensby
2da2c2927f
Merge branch '2.4' into 2.5 2018-06-19 21:40:41 +01:00
Robbie Averill
a4efb3409c
Merge pull request #540 from dhensby/pulls/2.4/fix-multibyte-urlfilter
FIX Make sure `setAllowMultibyte` is on when looking up by URLSegment
2018-06-20 08:24:01 +12:00
Daniel Hensby
3b14436304
TEST Fix regression in tests from new Versioned exceptions 2018-06-19 14:39:17 +01:00
Daniel Hensby
d392ca72f1
FIX Make sure setAllowMultibyte is on when looking up by URLSegment 2018-06-19 14:23:27 +01:00
Robbie Averill
fcf7127f09
Merge pull request #536 from MarcioBarrientos/fix
Call the correct method ->isModifiedOnDraft()
2018-06-07 16:04:38 +12:00
Marcio Barrientos
4e5f25c5eb Call the correct method ->isModifiedOnDraft() 2018-06-07 15:53:39 +12:00
Dylan Wagstaff
e63c5d4482
Merge pull request #530 from creative-commoners/pulls/3.1/modified-state
FIX Use correct API for determining if record is modified on draft stage
2018-04-20 21:05:50 +12:00
Robbie Averill
dc26478e94 FIX Use correct API for determining if record is modified on draft stage 2018-04-20 17:05:29 +12:00
Robbie Averill
db0d4f0f98 Merge branch '3.0' into 3.1 2018-04-10 15:53:04 +12:00
Robbie Averill
ae953b9a3c
Update constraints for dependencies 2018-04-10 15:49:44 +12:00
Dylan Wagstaff
50612b4f4c Remove obsolete branch alias 2018-04-10 14:42:51 +12:00
Robbie Averill
c344575ef9
Merge pull request #527 from JorisDebonnet/urlsegment-on-main
Bring back BlogPost URLSegment to Main tab
2018-04-10 14:13:50 +12:00
Joris Debonnet
06bcd961ce Bring back BlogPost URLSegment to Main tab 2018-04-10 02:04:44 +02:00
Robbie Averill
4c1303bfb5 Remove obsolete branch alias, remove @dev constraints on assets and asset-admin 2018-04-06 10:29:02 +12:00
Dylan
392b4aafd9 Update translations 2018-04-04 10:17:01 +12:00
Daniel Hensby
fdbfa8995c
Merge pull request #520 from creative-commoners/pulls/3.0/remove-add-blog-post
FIX Remove "Add new blog post" button from Blog Posts GridField in a members profile
2018-03-22 13:21:01 +00:00
Robbie Averill
fffd2cece3 FIX Remove "Add new blog post" button from Blog Posts GridField in a members profile 2018-03-22 17:17:03 +13:00
Loz Calver
836c7b4c22
Merge pull request #517 from creative-commoners/pulls/3.0/fix-config-reference
FIX Correctly import namespaces in BlogPostNotifications class
2018-03-20 10:03:49 +00:00
Robbie Averill
29154eae4c FIX Correctly import namespaces in BlogPostNotifications class 2018-03-20 16:54:55 +13:00
Dylan Wagstaff
374c3e2893
Merge pull request #515 from DrMartinGonzo/patch-2
Fix bad date formatting
2018-03-20 14:16:03 +13:00
Martin Portevin
b483446a45
Fix bad date formatting
`m` returns minute in hour as seen here : http://userguide.icu-project.org/formatparse/datetime
2018-03-20 01:54:08 +01:00
Daniel Hensby
049e77227e
Merge pull request #512 from zanderwar/pulls/enhancement/minutes-to-read
ENHANCEMENT added getMinutesToRead()
2018-03-14 14:27:52 +00:00
zanderwar
3f24858b73 ENHANCEMENT added MinutesToRead() 2018-03-14 18:01:09 +10:00
Dylan
c4e06a4b07 Update development dependencies 2018-02-22 18:14:32 +13:00
Daniel Hensby
9cc98c3e19
Merge pull request #511 from dhensby/pull/502
Make Categorization and PostOptions localizable
2018-02-20 12:58:18 +00:00
marcio.barrientos
519fe25da1
Make Categorization and PostOptions localizable
Allow to make localizable Blog Categorization tab and BlogPost Options tab
2018-02-20 11:38:30 +00:00
Robbie Averill
5c1cedeb98 Merge branch '2' 2018-02-20 11:05:54 +13:00
Robbie Averill
fbfa5e38c1 Merge branch '2.5' into 2 2018-02-20 11:02:14 +13:00
Robbie Averill
c76cbcb0f0 Merge branch '2.4' into 2.5 2018-02-20 11:01:29 +13:00
Robbie Averill
767250435e Remove PHP 5.3 from Travis builds 2018-02-20 11:01:09 +13:00
3Dgoo
f948afe271 Fixing non int pagination variable server error
If a user tries to paginate the blog using a value that is not an integer SilverStripe will throw a server error.

Example. Visiting `blog/?start=10.1` will cause the following server error:

```You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '10.1' at line 8```

This change casts the pagination variable to an int before using it.
2018-02-20 11:00:09 +13:00
Dylan Wagstaff
b76f1e1840
Merge pull request #509 from 3Dgoo/patch-1
Fixing non int pagination variable server error SS3
2018-02-20 10:56:29 +13:00
3Dgoo
483a384fb1
Fixing non int pagination variable server error
If a user tries to paginate the blog using a value that is not an integer SilverStripe will throw a server error.

Example. Visiting `blog/?start=10.1` will cause the following server error:

```You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '10.1' at line 8```

This change casts the pagination variable to an int before using it.
2018-02-20 07:47:49 +10:30
Robbie Averill
b79f3db883
Merge pull request #507 from creative-commoners/pulls/3.0/vendorise-module
Review SS4 update
2018-01-30 11:55:29 +13:00
Raissa North
84ef592297 FIX Update template based requirement calss 2018-01-30 11:31:26 +13:00
Raissa North
8dfb4426a4 Remove unneeded requirement 2018-01-29 16:17:41 +13:00
Raissa North
1feaa52ed7 ENHANCEMENT Update hard reference to png file 2018-01-29 16:16:45 +13:00
Raissa North
e437e7ac42 Optimise imports 2018-01-29 16:13:19 +13:00
Raissa North
f2ef7a945e FIX Fix line length 2018-01-29 16:10:45 +13:00
Raissa North
ba6328f558 Run TextCollector task 2018-01-29 16:08:45 +13:00
Raissa North
f131daf5f5 ENHANCEMENT Vendorise module and expose dist and images directory 2018-01-29 16:07:07 +13:00
Raissa North
6ce8871e87 Remove old compiled CSS files, they live in client now 2018-01-29 16:04:18 +13:00