TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-17 05:21:36 +03:00
Code Issues Projects Releases Wiki Activity
6,683 Commits 252 Branches 1,686 Tags 367 MiB
bd2f59b5f9
Commit Graph

6683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Austin Burdine
f3a7dc2f99
update client ref 2016-07-12 10:41:49 -06:00
Aileen Nowak
24c86b49d1 HTML newsletter template for subscribers (#7045) 
refs #7023

The template can be used for all cases (different newsletter interval, different amount of blog posts, with or without blog picture).

The template can be filled with the following data structure:
- `blog.logo` is the blog logo from settings
- `blog.title` is the title of the current blog
- `blog.url` is the URL of the blog
- `blog.twitterURL` is the twitter profile URL of the blog from settings
- `blog.facebookURL` is the facebook page URL of the blog from settings
- `blog.unsubscribe` is the link for the reader to unsubscribe from the blog
- `newsletter.interval` is the interval in words like 'weekly', 'daily', 'monthly'
- `newsletter.date` is the date of the newsletter issue in a format like 'June 9th, 2016'
- `blog.post` is expected to be an array:
	- `blog.post[i].picture` is the picture of the blog post. There are also conditionals, which change the inline CSS to either show a border-top if there's no picture (in that case the HTML code, that shows the picture is not active)
	- `blog.post[i].title` is the title of the current blog post
	- `blog.post[i].text` is the text of the current blog post, which needs to be cut down to 278 letters, plus ending with `…`
	- `blog.post[i].url` is the URL of the current blog post
	- `blog.post[i].tag` is the tag of the current blog post
	- `blog.post[i].author` is the author of the current blog post

Important is, that only HEX HTML entities will work, especially in Outlook. So instead of `—` we need to use `—` and `’` instead of `'` or `'` and so on.

Added unit test for newsletter template in `test/unit/mail/utils_spec.js`.
 2016-07-08 21:40:32 -06:00
Greenkeeper
7b0226247b chore(package): update express-hbs to version 1.0.2 (#7078) 2016-07-08 21:35:00 -06:00
Austin Burdine
a1a5e55bf7 improve styling on private blogging password page (#7021) 
refs TryGhost/Casper#253
- make private.hbs styling consistent with the ghost signin page
 2016-07-07 15:37:42 +01:00
Austin Burdine
9e93c2b6aa deps: bookshelf@0.10.0 (#7074) 
merged in fix for lodash
 2016-07-06 10:31:24 +01:00
Greenkeeper
bbaad73f87 chore(package): update rewire to version 2.5.2 (#7061) 
https://greenkeeper.io/
 2016-07-05 17:25:23 +01:00
Greenkeeper
495bbee594 chore(package): update moment to version 2.14.1 (#7071) 2016-07-04 11:05:28 -06:00
Greenkeeper
62859fbb57 chore(package): update jsonpath to version 0.2.6 (#7063) 2016-07-01 20:29:25 -06:00
Greenkeeper
0b23bb007d chore(package): update html-to-text to version 2.1.3 (#7056) 2016-06-30 11:46:21 -06:00
Gergely Nemeth
447cc0cd2e fix(twitter-card): use proper image tag (#7025) 2016-06-29 18:04:43 -06:00
Greenkeeper
204e99b331 chore(package): update body-parser to version 1.15.2 (#7013) 2016-06-29 15:23:03 -06:00
Lukas Strassel
03137ff5cd allow manifest.json in theme root (#6986) 
closes #6769
 2016-06-29 14:44:01 -06:00
Greenkeeper
72f7b0bc6c chore(package): update html-to-text to version 2.1.1 (#7051) 
https://greenkeeper.io/
 2016-06-29 13:02:33 -06:00
Greenkeeper
78b19d80e3 chore(package): update semver to version 5.2.0 (#7049) 
https://greenkeeper.io/
 2016-06-29 10:28:23 -06:00
Austin Burdine
a4c767afb7 Add greenkeeper branch ignores to travis (#7026) 
This prevents greenkeeper pushes from being run, as it will be run through the PR that is submitted instead.
 2016-06-28 20:15:04 +02:00
Katharina Irrgang
ded60ba6e8 post-scheduling: delete job but time is null (#7035) 
no issue

This is a fix for the default-scheduler.
When a post never had a published_at value, the oldTime for removing the job would be null. And in this case we would try to delete a job with an invalidate date.
 2016-06-28 20:14:29 +02:00
Katharina Irrgang
e91e9eadac improvement: mail structure (#7033) 
no issue
- in preparation for subscribers V2
- do not implement code in index.js
- create mail utils
 2016-06-28 20:13:01 +02:00
Katharina Irrgang
1b3e1df641 fix: date permalink test (#7047) 
closes #7044
 2016-06-28 11:14:39 -06:00
Hannah Wolfe
67522ea25a Merge pull request #7041 from acburdine/bookshelf-upgrade-test 
Bookshelf Lodash Fix
 2016-06-28 18:43:47 +02:00
Austin Burdine
996866b728 Merge pull request #7034 from TryGhost/greenkeeper-semver-5.1.1 
Update semver to version 5.1.1 🚀
 2016-06-27 22:05:13 -06:00
Austin Burdine
acc08b9702 deps: bookshelf@lodash-upgrade-fix 
no issue
- temporarily upgrades bookshelf to latest master commit
- fixes lodash version incompatibility
 2016-06-27 08:22:30 -06:00
greenkeeperio-bot
5e8b072025 chore(package): update semver to version 5.1.1 
https://greenkeeper.io/
 2016-06-23 19:08:34 +01:00
Hannah Wolfe
d5e1d122ac Merge pull request #7018 from TryGhost/greenkeeper-istanbul-0.4.4 
Update istanbul to version 0.4.4 🚀
 2016-06-23 14:29:56 +01:00
Hannah Wolfe
9d69e43771 Merge pull request #7004 from TryGhost/greenkeeper-bluebird-3.4.1 
Update bluebird to version 3.4.1 🚀
 2016-06-23 14:29:49 +01:00
greenkeeperio-bot
5e425c229e chore(package): update istanbul to version 0.4.4 
https://greenkeeper.io/
 2016-06-23 14:29:49 +01:00
Hannah Wolfe
2280838736 Merge pull request #7003 from TryGhost/greenkeeper-jsonpath-0.2.5 
Update jsonpath to version 0.2.5 🚀
 2016-06-23 14:29:35 +01:00
greenkeeperio-bot
c9e665ba04 chore(package): update bluebird to version 3.4.1 
https://greenkeeper.io/
 2016-06-21 23:11:04 +01:00
greenkeeperio-bot
f5506f7bb9 chore(package): update jsonpath to version 0.2.5 
https://greenkeeper.io/
 2016-06-21 23:11:04 +01:00
Austin Burdine
820207052e Merge pull request #7022 from TryGhost/greenkeeper-grunt-jscs-3.0.1 
Update grunt-jscs to version 3.0.1 🚀
 2016-06-21 18:10:49 -04:00
greenkeeperio-bot
2fe3223a6b chore(package): update grunt-jscs to version 3.0.1 
https://greenkeeper.io/
 2016-06-21 22:22:16 +01:00
Austin Burdine
bfaa8ece90 Merge pull request #7016 from kirrg001/fix/6999 
fix: url for post path when post is not published
 2016-06-21 07:09:11 -04:00
Austin Burdine
dc0416bbe8 Merge pull request #7017 from kirrg001/fix/prev-next-post 
fix: prev next posts
 2016-06-21 06:57:48 -04:00
kirrg001
f8ba12481d fix: prev next posts 
closes #7015
 2016-06-20 15:44:02 +02:00
kirrg001
507677f071 fix: url for post path when post is not published 
closes #6999
 2016-06-20 14:48:01 +02:00
Austin Burdine
14c3d0e9ef Merge pull request #7006 from kevinansfield/subgrunt-init 
Use subgrunt to install client dependencies
 2016-06-18 15:11:35 -04:00
Kevin Ansfield
fe44040dea Updating Ghost-Admin: grunt init bower fix 
- includes `grunt init` task used in #7006
 2016-06-18 19:30:42 +01:00
Kevin Ansfield
706d47fb5b Use subgrunt to install client dependencies 
closes https://github.com/TryGhost/Ghost/pull/7005, requires https://github.com/TryGhost/Ghost-Admin/pull/79
- defers to client's Gruntfile to install client dependencies, avoids requirement for a global bower install
 2016-06-18 18:35:51 +01:00
Kevin Ansfield
47678cc30e Merge pull request #6946 from kirrg001/improvement/jshint 
improvement: jshint globals/mocha
 2016-06-18 11:51:02 +01:00
kirrg001
250d571fe6 improvement: jshint/jscs 
no issue
- add mocha option to jshintrc, no need to define globals in files anymore
- call client grunt commands in case of jshint/jscs
 2016-06-17 22:59:47 +02:00
Kevin Ansfield
3e92d63c27 Version bump to 0.9.0-beta.2 2016-06-15 13:33:02 +01:00
Kevin Ansfield
490ee92ed5 Merge pull request #6996 from kirrg001/fix/delete-lodash-pickby 
fix: delete lodash.pickBy dependency
 2016-06-15 13:26:52 +01:00
Kevin Ansfield
8e21e31436 Upgrading Ghost-Admin to 0.9.0-beta.2 2016-06-15 13:25:39 +01:00
kirrg001
e43aefe576 fix: delete lodash.pickBy dependency 2016-06-15 14:00:32 +02:00
Kevin Ansfield
48b8660970 Merge pull request #6971 from ErisDS/tag-visibility 2016-06-15 12:51:18 +01:00
Hannah Wolfe
ac63621fe7 Update tags & foreach to respect visibility 
refs #6165

- adds lodash.pickby@4.4.0
- new helper util for understanding a visibility attribute
- generalises visibility handling for `{{tags}}` helper
- adds visibility handling to `{{foreach}}` helper
- adds tests which check behaviour + labs flag
 2016-06-15 12:37:09 +01:00
Kevin Ansfield
0d518d1ae6 Merge pull request #6993 from kirrg001/fix/delete-bug-post-scheduling 
post-scheduling: fix delete bug in default scheduler
 2016-06-15 11:50:37 +01:00
kirrg001
9de153ff82 post-scheduling: fix delete bug in default scheduler 2016-06-15 12:21:33 +02:00
Kevin Ansfield
7d8e01b14e Merge pull request #6990 from kirrg001/improvement/503-for-scheduling 
post-scheduling: 503 retry logic for default adapter
 2016-06-15 10:07:06 +01:00
kirrg001
a3cd43909b post-scheduling: HTTP 503 retry logic for default adapter 2016-06-15 08:40:18 +02:00
Hannah Wolfe
fe5e0eed48 Merge pull request #6988 from kirrg001/improvement/forward-utc-timestamp-for-scheduler 
post-scheduling: forward UTC timestamp to scheduler adapters
 2016-06-14 17:05:22 +01:00