Commit Graph

4387 Commits

Author SHA1 Message Date
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
Jason Williams
8a99a934d3 Merge pull request #4771 from ErisDS/importer-store-reset
Reset the store after import
2015-01-08 09:36:20 -06:00
Hannah Wolfe
7860818a2f Reset the store after import
no issue

- without this, the content screen doesn't update properly after an import
2015-01-08 13:42:45 +00:00
Hannah Wolfe
0b7a6c52f0 Merge pull request #4767 from jaswilli/contribs-task-info
Show info on about page task failure
2015-01-08 12:42:05 +00:00
Jason Williams
11c7d75b1b Show info on about page task failure
No Issue.
- gh-top-contribs@0.0.4
- package now provides information when a failure occurs.
2015-01-07 17:28:03 +00:00
Jason Williams
04180bc83b Merge pull request #4763 from ErisDS/no-tag-flag
Move tag management from behind config/labs flags
2015-01-06 13:41:19 -06:00
Hannah Wolfe
fcdb471fa1 Merge pull request #4762 from jaswilli/issue-4755
Reset upload component on tag switch
2015-01-06 19:29:13 +00:00
Hannah Wolfe
1f22d8c28c Move tag management from behind config/labs flags
issue #4248

- tag management is ready for release, this takes the training wheels off :)
- remove config flag
- remove labs checkbox and related code
2015-01-06 18:56:42 +00:00
Jason Williams
ce11c728c6 Reset upload component on tag switch
Closes #4755
2015-01-05 22:45:19 +00:00
Jason Williams
a7b405924a Merge pull request #4759 from ErisDS/importer-test-fix
Fix importer tests on windows
2015-01-05 16:25:35 -06:00
Hannah Wolfe
02d091bbbc Fix importer tests on windows 2015-01-05 21:59:43 +00:00
Jason Williams
7f753acff1 Merge pull request #4752 from ErisDS/importer-updates
Image Importer Improvements
2015-01-05 10:39:35 -06:00
Jason Williams
05877124ae Remove unneeded promises and fix tests 2015-01-04 21:05:31 +00:00
Hannah Wolfe
dd0e3d2991 Merge pull request #4754 from jaswilli/labs-feature-toggle
Rework Labs feature toggling
2015-01-04 20:59:50 +00:00
Jason Williams
e6fd1b89c0 Rework Labs feature toggling
Refs #4750
- Make "Feature" a Controller with promise support.
- Use via 'needs' instead of injecting from an initializer because
  we need authenticated access to the API.
- Check whether feature is enabled when entering Code Injection route.
2015-01-04 20:05:25 +00:00
Jason Williams
7c7dbb911c Merge pull request #4750 from ErisDS/labs-thing
Labs page checkboxes
2015-01-04 13:44:47 -06:00
Hannah Wolfe
3310dba9ea Merge pull request #4738 from jaswilli/socket-perms
Allow socket permissions to be set from config
2015-01-03 19:41:27 +00:00
Hannah Wolfe
c0fc7c5bcd Adds global feature manager
closes #4409
2015-01-03 14:25:04 +00:00
Hannah Wolfe
add4c6b078 Image Importer Improvements
ref #4608, #4609, #4690

- fix errors with cleaning up files
- improve handling of base directories, and introduce a simple valid format for zips (must contain importable files or folders, and may contain up to one base directory)
- vastly improve test coverage
2015-01-02 22:54:40 +00:00
Jason Williams
ac5d98e656 Merge pull request #4748 from rwjblue/remove-proxying
Remove ObjectController proxying behavior.
2015-01-02 15:18:15 -06:00
Hannah Wolfe
2bc5478681 Merge pull request #4749 from jaswilli/test-deps
Update test-related dependencies
2015-01-02 17:51:05 +00:00
Paul Adam Davis
cc6f698053 Start of labs
issue #4409
2015-01-02 15:58:36 +00:00
Jason Williams
9d82c2e360 Update test-related dependencies
No Issue
- nock@0.52.4
- should@4.4.2
    .eql no longer does type coercion.
- sinon@1.12.2
- supertest@0.15.0
2015-01-02 15:49:58 +00:00
John O'Nolan
bd1211da5d Update copyright 2015-01-02 16:11:13 +02:00
Robert Jackson
a1ed9adf92
Remove ObjectController proxying behavior.
Ember.ObjectController (and Ember.ArrayController) will be deprecated in
Ember 1.11 (and removed from core in Ember 2.0). The reasoning is
detailed in the Ember 2.0 RFC.

This PR does the following:

* Updates templates/controllers/views to explicitly reference model
  properties (instead of relying on proxying behavior).
* Clearly delineate where certain properties are being set or retrieved
  from (for example it was not clear exactly where `scratch` and
  `titleScratch` were stored).
* Remove usage of `Ember.ObjectController`.
* Add JSCS rule to prevent future PR's from adding regressions.
2015-01-01 21:51:20 -05:00
Jason Williams
25d90c01c9 Merge pull request #4744 from jbfriedrich/fix4741
Update excerpt helper to properly filter HTML footnotes
2015-01-01 10:34:40 -06:00
Jason Williams
5d1412bc86 Merge pull request #4742 from rwjblue/cleanup-posts-template
Cleanup posts template.
2015-01-01 10:13:45 -06:00
Jason Williams
959ebfcad7 Merge pull request #4743 from rwjblue/remove-double-class-assignment
Do not use static and {{bind-attr}} for the same attribute.
2015-01-01 09:12:49 -06:00
Jason Friedrich
bc74c89e76 Update excerpt helper to properly filter HTML footnotes
closes #4741
- updated regexp to properly filter out footnotes without removing too much text
- happened only when a link was used before a footnote
- old regexp was too 'greedy' and removed regular link together with the footnote
- new regexp uses a more specific <a> tag
2015-01-01 06:45:06 +01:00
Robert Jackson
b6676b38c7
Do not use static and {{bind-attr}} for the same attribute.
No issue.
2014-12-31 22:30:39 -05:00
Robert Jackson
273a782fcb
Cleanup posts template.
No issue.

* Fix indentation (it was surprisingly hard for me to grok what was happening
  without indentation).
* Utilize `alternateActive` from `core/client/utils/link-view.js` to
  maintain the `active` state. Observing `childViews` is deprecated (and
  may not work properly in future versions of Ember).
* Remove now unused `item-view`.
2014-12-31 21:06:05 -05:00
Jason Williams
85a34f66c2 Merge pull request #4740 from rwjblue/remove-manual-registerHelper
Allow resolver to lookup gh-path helper.
2014-12-31 14:17:02 -06:00
Robert Jackson
d70b19987c
Allow resolver to lookup gh-path helper. 2014-12-31 14:44:39 -05:00
Jason Williams
6c1287c3a2 Allow socket permissions to be set from config
Closes #4478
2014-12-31 15:28:04 +00:00
Hannah Wolfe
4f278e3cf7 Merge pull request #4726 from jaswilli/issue-3961
Change {{url}} and {{image}} into synchronous helpers
2014-12-30 19:20:51 +00:00