Commit Graph

4422 Commits

Author SHA1 Message Date
Andrew Chilton
4e8dc4f6e3 Make preview URLs include trailing slash when slug is given
- the trailing slash isn't shown usually
- slash added when a slug is given to be more correct
2015-01-23 17:34:36 +13:00
Hannah Wolfe
2c1d662517 Merge pull request #4833 from jaswilli/issue-4735
Format database-related error responses
2015-01-22 16:05:55 +01:00
Jason Williams
786ec6be28 Format database-related error responses
Closes #4735
- Shows error message on client instead of "[object Object]".
- Server log shows error message instead of uknown error.
2015-01-21 18:09:09 +00:00
Hannah Wolfe
8454a1c0bb Merge pull request #4830 from jaswilli/find-by-role
Fixup finding user by role name
2015-01-21 11:01:44 +00:00
Hannah Wolfe
e26d1a9257 Merge pull request #4826 from jaswilli/issue-4807
Implement Navigation item input behaviors
2015-01-20 19:31:04 +00:00
Jason Williams
7578d674ae Fixup finding user by role name
No Issue.
- Build up query object to lookup a user by the name of a role.  Return
  user with "roles" objects included.
- Add test for findOne by role.
2015-01-20 18:31:17 +00:00
Hannah Wolfe
c946230171 Merge pull request #4823 from jaswilli/fixup-test
Assume datetime in import filename is UTC
2015-01-19 18:49:08 +00:00
Jason Williams
d446ad84ea Implement Navigation item input behaviors
Closes #4807
2015-01-18 23:08:03 -06:00
Jason Williams
d5d7919d26 Assume datetime in import filename is UTC
No issue.
- Add missing catch handlers to async tests.
2015-01-18 21:20:51 +00:00
Hannah Wolfe
e07ec3ef84 Merge pull request #4816 from halfdan/fix-footnote
Fix footnote handling for n-digit numbers
2015-01-17 20:43:58 +00:00
Fabian Becker
90ac1fdd16 Fix footnote handling for n-digit numbers
fixes #4815
- Fix regex
- Add new test
2015-01-17 14:56:13 +00:00
Hannah Wolfe
75ef56e91b Merge pull request #4810 from jaswilli/jscs-cleanup
Update grunt-jscs dependency
2015-01-16 18:42:20 +00:00
Jason Williams
1c07273f5a Update grunt-jscs dependency
No Issue
- grunt-jscs@1.2.0
- Clean up some instances of multiple spaces.
- Remove jscs:disable for regexes now that jscs better supports them.
2015-01-16 18:06:20 +00:00
Sebastian Gierlinger
8d43a7484a Merge pull request #4808 from jaswilli/invite-error
Check all users when generating slug
2015-01-16 11:52:44 +01:00
Jason Williams
aee472eb65 Check all users when generating slug
No Issue
- Set 'status: all` when calling generateSlug from the user model
  so that all user slugs are checked for duplicates instead of
  only active users.
2015-01-16 06:56:53 +00:00
Matt Enlow
3982e0f871 Merge pull request #4804 from jaswilli/issue-4539
Connect Navigation page to live data
2015-01-14 15:45:04 -07:00
Jason Williams
a007ae1442 Connect Navigation page to live data
Closes #4539
2015-01-14 21:24:08 +00:00
Hannah Wolfe
b9db60e3bb Merge pull request #4801 from halfdan/4800-role-select
Fix user role select
2015-01-14 13:30:51 +00:00
Sebastian Gierlinger
023a37b074 Merge pull request #4772 from ekulabuhov/4262_NextPrevPostWIP
[API] Retrieve next and previous post
2015-01-14 10:32:07 +01:00
Fabian Becker
7090fa0430 Fix user role select
fixes #4800
- Correctly reference the user role for initial value
2015-01-14 00:58:15 +01:00
Hannah Wolfe
b4e2484f6e Merge pull request #4796 from jaswilli/import-test-fix
Don't assume order of results in import test
2015-01-13 17:31:18 +00:00
Hannah Wolfe
2debe1cb34 Remove extra brackets from contributing.md 2015-01-13 16:57:51 +00:00
Jason Williams
9151f53323 Don't assume order of results in import test
No Issue
- Fixes intermittent test failure when order of results
  returned by loadFile() changes.
2015-01-13 16:40:46 +00:00
Jason Williams
1feea95816 Merge pull request #4794 from ivanvotti/fix-disallow-object-controller
Fix typo in disallow-object-controller
2015-01-13 10:05:43 -06:00
Ivan Votti
a63d3ec350 Fix typo in disallow-object-controller 2015-01-13 22:13:26 +07:00
Eugene Kulabuhov
0e2709c42f [API] Retrieve next and previous post
closes #4262
- implementation based on #1545
- added integration test. Modified mocked posts because code requires published_at timestamps to be different.
- fixed 2 broken tests that depended on mocked posts to have "new Date()" as their timestamps
- added checks to only query db if next/previous post requested
2015-01-13 12:49:16 +00:00
Hannah Wolfe
0cb3483bc0 Merge pull request #4694 from PaulAdamDavis/navigation-ember
Navigation UI Ember Integration
2015-01-13 09:31:32 +00:00
Hannah Wolfe
cf2c7ba38d Version bump to 0.5.8 2015-01-12 17:57:06 +00:00
Hannah Wolfe
e8fa276fea Update about page copyright 2015-01-12 17:46:11 +00:00
Hannah Wolfe
ac72e1c71e Upgrading Casper to 1.1.5 2015-01-12 17:23:55 +00:00
Hannah Wolfe
e6305e83fa Merge pull request #4765 from martinnormark/master
Load next page if scrollHeight <= clientHeight
2015-01-12 14:17:51 +00:00
Hannah Wolfe
3052f60820 Merge pull request #4790 from jaswilli/issue-4766
Fixup validation engine to handle lack of proxying
2015-01-12 14:13:19 +00:00
Jason Williams
66154145f1 Fixup validation engine to handle lack of proxying
Closes #4766
- Adjust ValidationEngine so it no longer assumes the properties
  it is validating are proxies via ObjectController.
- Fixup controllers, templates, and routes to use models where
  data needs to be validated.
2015-01-12 03:27:47 +00:00
Paul Adam Davis
6cc5a58b68 Navigation UI Ember Integration
Closes #4537

- Adds Navigation to the Settings menu
- Adds a `navigationUI` config flag (redirects if not an editor or author)
2015-01-11 20:04:01 +00:00
Jason Williams
be462d8d94 Merge pull request #4781 from ErisDS/has-tag-fix
Fix has helper tag matching
2015-01-11 13:01:55 -06:00
Jason Williams
64d2907614 Merge pull request #4789 from ErisDS/issue-4788-2
Fixes post sort order
2015-01-11 11:01:50 -06:00
Hannah Wolfe
5ceb721fa4 Fixes post sort order
fixes #4788
2015-01-11 16:46:43 +00:00
Jason Williams
1afd6091a9 Merge pull request #4784 from ErisDS/test-cleanup
Misc test cleanup
2015-01-10 10:33:49 -06:00
Hannah Wolfe
fb46b7d356 Misc test cleanup
refs #4644

- Changes tests using assert style to use should style for consistency
- Updates moment().subtract() to remove deprecation warning
- Changes test and test-coverage grunt commands to run in a way which is
  compatible with both *nix and win envs
- refs #4644 as this is a step towards getting coverage working properly
  again
2015-01-10 11:39:18 +00:00
Matt Enlow
f56bbc04e6 Merge pull request #4779 from ErisDS/mail-fix
Fix email sending fail when blog title has a comma
2015-01-09 15:09:20 -07:00
Hannah Wolfe
3f34162fd9 Fix has helper tag matching
fixes #4780
2015-01-09 21:52:23 +00:00
Hannah Wolfe
283deb2461 Fix email sending fail when blog title has a comma
no issue

- We send emails from Blog Title <ghost@blog-url.com>, but it should be from "Blog Title" <ghost@blog-url.com>
- It worked fine without quotes unless you have a comma in your Blog Title in which case different mail systems get confused in different ways
2015-01-09 21:34:24 +00:00
Jason Williams
7501b4478d Merge pull request #4692 from ErisDS/markdown-importer
Add markdown file handler to importer
2015-01-09 14:44:46 -06:00
Hannah Wolfe
fbdabce086 Add markdown file handler to importer
closes #4691

- adds a file handler for markdown file (.md and .markdown)
- handles titles and featured images
- gets status, date, and slug from the filename
- has a test suite
2015-01-09 20:04:56 +00:00
Jason Williams
481af2ddee Merge pull request #4774 from felixrieseberg/iss4768
Editor Save Button/Notifcations: Post vs Page
2015-01-09 11:26:31 -06:00
Jason Williams
95aad12de1 Merge pull request #4775 from Trendy/gravatar_error
Fixed issue where Gravatars with rating higher than G would cause a 404 ...
2015-01-09 11:05:14 -06:00
Jeremiah Hoyet
bbe3ceb025 Fixed issue where Gravatars with rating higher than G would cause a 404 error.
closes #4770
- Check for Gravatar now allows the highest rating for images
- Defaults to silhouette in the event a user deletes their Gravatar
- Allows highest rating for Gravatars (x), since Ghost should have no opinion on image ratings.
2015-01-08 19:34:28 -05:00
Felix Rieseberg
d7bf4258fe Editor Save Button/Notifcations: Post vs Page
Closes #4768

- Notifications that used to read ‘View Post’ now read ‘View Page’ if
the post is actually a page
- The Editor Save Button now also makes a distinction between posts and
pages
2015-01-08 10:23:48 -08:00
Matt Enlow
33ce828a4a Merge pull request #4773 from jaswilli/travis-gh-oauth
Make authenticated GitHub API requests from Travis
2015-01-08 09:48:51 -07:00
Jason Williams
1b8796b993 Make authenticated GitHub API requests from Travis
No Issue
- top-gh-contribs@0.0.5
- Add oauth key to .travis.yml with public-only access
2015-01-08 16:21:22 +00:00