Commit Graph

479 Commits

Author SHA1 Message Date
Daniel Hensby
c110b4e2e1
Merge branch '2.4' into 2 2017-07-20 10:33:28 +01:00
Daniel Hensby
0b6a2d710a
Merge branch '2.3' into 2.4 2017-07-20 10:33:06 +01:00
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
Daniel Hensby
ca59af43e8
Merge branch '2.4' into 2 2017-07-05 14:42:23 +01:00
Daniel Hensby
91d9e42ba0 Merge pull request #450 from camfindlay/feature/config-spam-notifications
Config spam notifications
2017-07-05 14:30:24 +01:00
Cam Findlay
d5340a87dc
FEATURE config to disable sending spam notifications 2017-07-03 11:17:30 +01:00
Franco Springveldt
0d6b44aa44 FIX mysql >= 5.7 sql_mode=only_full_group_by error 2017-06-26 10:21:39 +12:00
Daniel Hensby
e737cd818b Merge pull request #445 from creative-commoners/pulls/2.4/travis-php7
Add PHP7 + SS3.6 build to Travis configuration
2017-06-18 01:03:00 +01:00
Robbie Averill
e5415b1ea8 Remove hhvm from Travis build matrix 2017-06-16 09:11:22 +12:00
Daniel Hensby
deb0a098e8 Merge pull request #435 from rasstislav/patch-1
FIX Add translation to some areas of BlogMemberExtension that were missing them
2017-06-15 16:56:31 +01:00
Rastislav Brandobur
abe6015a34 added BlogMemberExtension definitions to lang subfolder 2017-06-15 02:00:40 +02:00
Robbie Averill
16d684dcfa Add PHP7 + SS3.6 build to Travis configuration 2017-06-15 09:58:30 +12:00
Daniel Hensby
ef67447ad5 Merge pull request #444 from alex-dna/2.4
Prevent user_error when querying object from Solr
2017-06-14 13:05:27 +01:00
Alexandre Saelens
bd23bb2f0a Prevent user_error when querying object from Solr 2017-06-14 14:05:40 +12:00
Florian Thoma
4f1eb3d227 add meta links for previous and next pages in pagination 2017-05-26 09:43:27 +10:00
Daniel Hensby
0132a02cf0 Adding .codecov.yml file 2017-05-25 08:57:47 +01:00
Rastislav Brandobur
2cd7db9beb FIX Add translation to some areas of BlogMemberExtension that were missing them 2017-04-12 10:33:29 +02:00
Daniel Hensby
a5dee40fcb Merge pull request #431 from christopherdarling/patch-1
BlogMigrationTask missing title and description
2017-03-16 11:45:27 +13:00
Christopher Darling
fef1462f56 BlogMigrationTask missing title and description
Otherwise shows up in dev/tasks/ as "Database Migrations"
2017-03-15 14:31:18 +00:00
Daniel Hensby
3e298b7b10
Updating composer alias 2016-12-20 15:20:16 +00:00
Damian Mooyman
7583e0bcd5 Update translations 2016-11-17 12:39:49 +13:00
Damian Mooyman
b4050a7392 Remove obsolete branch-alias 2016-11-17 10:17:56 +13:00
Damian Mooyman
033a7bb96f Merge pull request #414 from dhensby/pulls/casting-fix
FIX Excerpt should be casted as HTMLText
2016-09-08 22:45:10 +12:00
Daniel Hensby
ffab2df9d2
FIX Excerpt should be casted as HTMLText 2016-09-08 11:00:15 +01:00
Loz Calver
0f77789eb5 Merge pull request #412 from dhensby/pulls/cast-date
FIX Cast Date method on BlogPost
2016-08-30 09:07:28 +01:00
Daniel Hensby
91abe1f9f8
FIX Cast Date method on BlogPost 2016-08-27 22:50:45 +01:00
Damian Mooyman
7f7459f769 Update translations 2016-08-17 11:08:00 +12:00
Daniel Hensby
9f09218da2 Merge pull request #411 from lekoala/patch-1
remove i18n formatting in links
2016-07-15 14:16:56 +01:00
Thomas Portelange
2dd5fd8596 remove i18n formatting in links
the getArchiveMonth and getArchiveYear only accepts number in Blog.php. Removing i18n formatting restore the functionnality.
2016-07-15 14:31:11 +02:00
Damian Mooyman
9e117b64ea Merge pull request #406 from TheBnl/entry-meta-multiple-authors-localisation
Localisation for multiple authors
2016-07-05 18:43:25 +12:00
Damian Mooyman
226d8282fd Merge pull request #401 from micmania1/fix-close-p-tags
FIX closing p tag
2016-06-30 10:16:28 +12:00
Damian Mooyman
fc6c86fd35 Merge pull request #400 from micmania1/tidy-readme
Tidied the badges on reademe
2016-06-29 17:52:30 +12:00
Damian Mooyman
a21b50333d Merge pull request #402 from micmania1/fix-376-url
FIX #376 allow multibyte chars in url segment
2016-06-29 17:51:22 +12:00
Michael Strong
35c5357cc6 Merge pull request #407 from ksdhans/patch-2
Add RSS feeds for categories and tags
2016-06-17 13:13:34 +12:00
ksdhans
29ffaa8295 Minor layout tweak
Correcting indentation of isRSS().
2016-06-15 19:33:29 +12:00
ksdhans
ca7f09d0e0 Removed category()/tag() documentation changes
Adding "string" to the possible return types of category()/tag() didn't stop the scrutinizer from raising two new issues, so I've reverted that change. In future tags/categories may be split into separate controllers (it's cleaner that way), so these "issues" may serve as a reminder.

NOTE: This means that the documented return type for rss() is also wrong
2016-06-14 18:20:03 +12:00
ksdhans
d42b3ca57c Fixed RSS feed link for category/tag feeds
- The RSS feed link was always the blog's root URL, even for category/tag feeds. FIXED
- Changed the return type documented for category() and tag() to include string for the case where an RSS feed is returned (addresses the "Scrutinizer" issues)
2016-06-14 18:08:31 +12:00
ksdhans
95e14e5496 Performed suggested changes
- Removed hardcoded URL segment (was test code that I forgot to remove)
- Changed if($rss to if(is_string($rss)
- Moved bracket after isRSS() to next line
- Made rssFeed() protected as it's an internal function and shouldn't be part of the public API
2016-06-14 17:38:43 +12:00
ksdhans
073fca5f0d Add RSS feeds for categories and tags
This patch adds RSS feeds for tags and categories. The RSS feeds are at the following URLs:
- */category/<category-name>/rss
- */tag/<tag-name>/rss
2016-06-13 23:20:07 +12:00
Bram de Leeuw
1231d0ca92 added localisation for multiple authors in the entry meta 2016-06-10 13:04:15 +02:00
Daniel Hensby
09bdf60aa4 Merge pull request #403 from micmania1/fix-blog-rss-date
FIX #394 add getDate to proxy publish date in rss template
2016-06-06 12:44:28 +01:00
micmania1
299944fd1f FIX #394 add getDate to proxy publish date in rss template 2016-05-31 14:26:29 +12:00
micmania1
e4c3b879e8 FIX #376 allow multibyte chars in url segment 2016-05-31 14:00:54 +12:00
micmania1
198d3550fc FIX closing p tag 2016-05-31 11:37:26 +12:00
micmania1
f6fef9e77e Tidied the badges on reademe 2016-05-30 17:35:13 +12:00