Commit Graph

3580 Commits

Author SHA1 Message Date
Matt Enlow
18015809a4 Merge pull request #5002 from ErisDS/issue-4989
Fixing overzealous trailing-slashes
2015-03-09 10:34:18 -06:00
Paul Adam Davis
eccf96c836 Update icon font unicode references
Closes #3515 (again)

- Changes the prefix for icons from `\e` to `\f` which is borrowed from Font Awesome
2015-03-09 13:09:44 +00:00
Hannah Wolfe
b216677161 Accept mailto: links
refs #4989

- this allows users to enter mailto and output links via the navigation UI
- the navigation validation/cleanup needs a bit of a refactor to handle other kinds or URI, so leaving #4989 open for now
2015-03-09 13:06:26 +00:00
John O'Nolan
461834f96d Introduce new help menu 2015-03-09 11:53:40 +02:00
Paul Adam Davis
56a6f4ddec Clean up hidden accessibility text class
Closes #4662

- Removed accessibility classes from `_shame.scss` in favour of those in `global.css`, which are from Bootstrap and better tested.
- Change many instances if `class="hidden"` to `class="sr-only"`, so text intended to help with accessibility is not hidden from screen readers, only visually hidden.
2015-03-08 15:58:51 +00:00
Hannah Wolfe
4e5cba8c4c Fixing overzealous trailing-slashes
refs #4989

- Don't add a trailing a slash if the url is a file or anchor
2015-03-07 21:09:50 +00:00
John O'Nolan
7383820e35 Merge pull request #4948 from PaulAdamDavis/simpler-icon-code
Improve icon handling code
2015-03-07 20:16:06 +02:00
John O'Nolan
ccbd3f99ad Merge pull request #4976 from PaulAdamDavis/fix-blog-logo-svg
Remove button wrapping blog logo image
2015-03-07 20:15:53 +02:00
Matt Enlow
e3fc748e92 Merge pull request #4986 from ErisDS/notification-fix
More serverside notificaiton HTML fixes
2015-03-03 14:13:04 -07:00
Hannah Wolfe
b7a80eb5fd Users should get 5 password attempts
closes #4987
2015-03-03 20:23:04 +00:00
Hannah Wolfe
884d766afe More serverside notificaiton HTML fixes
refs #4964, #4969
2015-03-03 19:57:27 +00:00
Felix Rieseberg
436d2a8e42 RSS: Don't add trailing '/' to post image
Closes #4888

We automatically added a trailing slash to all non-absolute paths in
RSS, including post images. This fix ensures that trailing slashes
aren’t added to absolute paths including ‘content/images/‘.
2015-03-02 20:51:32 +01:00
Paul Adam Davis
4cb7cfff09 Remove button wrapping blog logo image
Closes #4959

An SVG (without width & height attributes) inside a button won't display as it should. There seems to be no fix other than apply a minimum width & height. That doesn't feel right, so I've opted for this.

- Remove the `<button>` wrapping `<img>` elements
- Add `cursor: pointer;` to those images (now they don't get one, not being inside a `<button>`
- Remove the `#blog-logo/cover` IDs and `for` attributes. They only apply focus on text inputs anyway.
2015-03-02 14:53:03 +00:00
Hannah Wolfe
879b6afbc5 Display serverside HTML notifications correctly
refs #4964

- persistent notifcations from the server contain HTML and should be marked HTML safe
2015-02-28 17:41:38 +00:00
Matt Enlow
7377b44afa Merge pull request #4968 from ErisDS/published-by-fix
Only import can override published_by
2015-02-28 09:59:57 -07:00
Matt Enlow
80861fa50f Merge pull request #4966 from ErisDS/check-edit-id
Check ids match on edit
2015-02-28 09:57:29 -07:00
Matt Enlow
3f1d0b9353 Merge pull request #4965 from ErisDS/validate-image-url
Validate urls in modal
2015-02-28 09:49:15 -07:00
Hannah Wolfe
0e80d77100 Only import can override published_by
no issue

- published_by should be set to the current user, unless we are in import mode

Credits: Matteo Beccaro
2015-02-28 16:27:30 +00:00
Hannah Wolfe
cde1842750 Check ids match on edit
no issue

- It should not be possible to provide a different ID in the object being edited to that provided in the URL
- We now send the id to check object to ensure there is a match

Credits: Matteo Beccaro
2015-02-28 16:25:37 +00:00
Hannah Wolfe
8be8831adb Validate urls in modal
- Urls added via a model are stored in the DB and need to be validated

Credits: Abdel Adim Oisif
2015-02-28 16:24:34 +00:00
Hannah Wolfe
e75939c083 Mark html notifications as html-safe, else escape
no issue

- Use the double-tash escaping output for notification messages
- Mark known and trusted html notifications as html-safe

Credits: Abdel Adim Oisif
2015-02-28 16:22:38 +00:00
Hannah Wolfe
2450f18170 Make the {{navigation}} helper global
refs #4535

- Rather than storing navigation data as a top level key, store it as @blog.navigation
- Reference the global data from the helper
2015-02-28 12:53:00 +00:00
Sebastian Gierlinger
ab2c57efe9 Merge pull request #4821 from markstos/https-subdirectory
Fixes #4435, also refactors checkSSL to be unit-tested.
2015-02-27 15:24:31 +01:00
Matt Enlow
2f04e85130 Merge pull request #4954 from halfdan/express
Upgrade express.js to 4.12
2015-02-26 07:50:37 -07:00
Matt Enlow
ca4c4c17de Merge pull request #4950 from ErisDS/nav-flag-remove
Remove navigation config flag
2015-02-26 07:50:23 -07:00
Fabian Becker
e7246a4ef3 Upgrade express.js to 4.12
no ref
- Fix deprecation warnings
2015-02-26 08:28:37 +01:00
Jason Williams
515abc3080 Simplify navigation item reordering 2015-02-25 17:26:25 +00:00
Hannah Wolfe
70a200d53f Remove navigation config flag
ref #4535

- don't need this any more :)
2015-02-25 15:15:55 +00:00
Paul Adam Davis
c473303abf Improve icon handling code
Closes #4878

This changes nothing except DRYness of code. Its output is exactly the
same.

- Moves all icon variables into a map
- Add getter function to extract variables from the map
2015-02-25 00:21:56 +00:00
Matt Enlow
299fbf9fbd Don't save if nav items have empty labels
Closes #4942, Closes #4944
- Also adds the `order` prop to the lastItem on save, so it doesn't jump about
2015-02-24 11:50:07 -07:00
Matt Enlow
1f195bdf88 Fix navigation deletion
Closes #4928
2015-02-23 17:02:48 -07:00
Hannah Wolfe
8cf111e767 Merge pull request #4934 from PaulAdamDavis/fix-nav-order-metadata
Add `order` property when parsing Navigation JSON
2015-02-23 23:39:06 +00:00
Hannah Wolfe
10d68386b1 Remove odd duplication from permissions.json 2015-02-22 18:26:32 +00:00
Paul Adam Davis
2843a35ecc Add order property when parsing Navigation JSON
Closes #4927

- Add `order` property when parsing Navigation JSON
- Fixes CSS issue where the placeholder nav item drag handle was still visible
2015-02-21 14:07:13 +00:00
Hannah Wolfe
2029f264d0 Merge pull request #4935 from PaulAdamDavis/input-error-style
Add `error` class styles for inputs
2015-02-20 16:17:28 +00:00
Sebastian Gierlinger
ca1d97ab43 Merge pull request #4923 from ErisDS/nav-trailing-slash
Ensure internal nav items have a trailing slash
2015-02-18 20:40:22 +01:00
Hannah Wolfe
a30b165e13 Merge pull request #4930 from jaswilli/issue-4871
Run listener callbacks in Ember run-loops
2015-02-18 19:19:01 +00:00
Sebastian Gierlinger
8b4979c7d1 Merge pull request #4919 from ErisDS/pr/4852
Update to PR 4852 ({{navigation}} helper)
2015-02-18 20:00:34 +01:00
Sebastian Gierlinger
27859a9769 Merge pull request #4914 from ErisDS/nav-ux-fix
Use placeholder only for last item
2015-02-18 19:55:09 +01:00
Jason Williams
1bac657c8c Run listener callbacks in Ember run-loops
Closes #4871
2015-02-18 17:11:02 +00:00
Paul Adam Davis
914d2fa1e3 Add error class styles for inputs
No issue

Adds a red border to inputs when a `error` class is applied

Also DRY's up the URL input a tad.
2015-02-18 11:34:52 +00:00
Hannah Wolfe
9668ed71ca Merge pull request #4848 from chilts/i4792-assign-higher-priority-in-sitemaps-to-featured-posts
Assign a higher priority to featured posts in the sitemap
2015-02-17 21:05:51 +00:00
Hannah Wolfe
6c701ff7f1 Merge pull request #4925 from dbalders/Script_AutoLink
Added <script> to Not Auto Link and Added Test
2015-02-17 20:01:14 +00:00
John O'Nolan
c997ff52fa Merge pull request #4870 from PaulAdamDavis/notifications-bug
Move bottom notifications outlet outside of <main>
2015-02-17 21:22:12 +02:00
David Balderston
6648a17ae2 Added Script to Not Auto Link and Added Test
Closes #4922

* Added script to not be parsed to auto linking
* Added test to make sure urls inside
2015-02-17 11:20:51 -08:00
Hannah Wolfe
2086c8d452 Merge pull request #4915 from dbalders/footnote_bug
Fixed Bug Showing Full HTML Inside Code Block
2015-02-17 19:14:07 +00:00
David Balderston
2b1bf96130 Fixed Bug Showing Full HTML Inside Code Block 2015-02-17 09:37:15 -08:00
Hannah Wolfe
01dc9bd834 Ensure internal nav items have a trailing slash
refs #4535

- all internal urls in ghost have a trailing slash, missing it out will cause nav-current to not work
2015-02-16 19:08:41 +00:00
Sebastian Gierlinger
c944644e0d Merge pull request #4909 from ErisDS/urlfor-external-subdir-fix
Don't pass external urls through createUrl
2015-02-16 18:52:38 +01:00
Hannah Wolfe
6d42df029a Navigation helper amends
closes #4541

- Add role="presentation" to <li>
- Clean up space if nav-current isn't present
- Changed all internal references from nav to navigation for consistency
- Deleted old nav.hbs
- Updated tests
2015-02-15 21:44:10 +00:00
Hannah Wolfe
13a610a8e1 Merge pull request #4901 from felixrieseberg/RSS-Image
Add Post Image to RSS Feed
2015-02-14 22:35:17 +00:00
Hannah Wolfe
4a2963a2ae Use placeholder only for last item
refs #4535

- as discussed in the meeting on 1st February ;)
- changed the fake-placeholder to only operate on the last item, this way it feels right, I think
2015-02-13 23:27:22 +00:00
Matt Enlow
81fd5f9eaf Merge pull request #4858 from PaulAdamDavis/nav-drag-order
Drag & Drop Navigation Reordering
2015-02-13 11:26:34 -07:00
Marcos Ojeda
d28ffef3e9 Add {{navigation}} helper
closes #4541
creates a handlebars helper with behavior matching the spec in #4541 and
updates `frontend.js` to include the navigation data in the rendered page
context.
- checks for {{current}} against `relativeUrl`
- adds helper `getSiteNavigation()` which returns contents of
  `api.settings.read('navigation')`, or an empty list
- navigation helper is responsible for filtering and consistently formatting
  navigation data from settings.
- changes `frontend.js`'s `formatResponse` & `formatPageResponse` to return
  a promise with page data and updates frontend controllers to use it.
- `formatPageResponse` now includes a third parameter to allow values to be
  merged into the page response (rather than using `_.extend` in the
  render methods directly.
- {{navigation}} will render an empty `ul` if no navigation items exist
- incorporates {{url}}/urlFor behavior for nav contexts. (see #4862)
- uses {{url absolute="true"}} in default nav template
2015-02-13 08:38:18 -08:00
Matt Enlow
2d7bbdcaa7 Merge pull request #4910 from 1pete/disable-reset-pw-btn
Set reset-password button disabled while submitting form
2015-02-12 19:51:49 -07:00
Jason Williams
6cc715d41b Adjust reauth modal to handle removal of proxying
Closes #4907.
- The modal signin no longer inherits from the signin page
  controller to simplify the interaction with simple-auth.
2015-02-13 01:40:13 +00:00
1Pete
69f9cc5192 set reset-password button disabled while submitting form 2015-02-13 06:16:18 +07:00
Hannah Wolfe
eaee9369e8 Don't pass external urls through createUrl
refs #4852, refs #4862, refs #4541

- fixes urlFor for the combination of an external url and a blog using a subdirectory
2015-02-12 23:09:12 +00:00
Paul Adam Davis
68eb6b67b0 Drag & Drop Navigation Reordering
Closes #4540

- Implements drag & drop to reorder navigation items
- Adds a `sort` property to navigation items
- Adds a tiny library to enable touch events for drag & drop. It hooks onto jQuery UI.
- Sort nav items before being saved
- Adds `settings-view-navigation` to route for body class
2015-02-12 17:02:46 +00:00
Felix Rieseberg
762a47b6bf Add Post Image to RSS Feed
Closes #4888

- If a post cover image exists, it is added to the `description` tag
(at the very front). This allows RSS readers to pic up the picture.
2015-02-10 14:04:59 -08:00
Jason Williams
2a91a1071e Update Ember to 1.10.0
No issue.
- Ember@1.10.0
- Update grunt-ember-templates to version that supports HTMLBars.
- Update Gruntfile.js to compile templates with HTMLBars.
- Convert Handlebars code to its HTMLBars equivalent.
2015-02-09 16:20:16 +00:00
Hannah Wolfe
a110b3741f Merge pull request #4862 from nsfmc/urlmod
Update `urlFor` to handle 'nav' contexts
2015-02-07 21:15:48 +00:00
rmfx
19ea1824a1 Remove duplicate 'an'
Remove the second 'an' on line 264.
2015-02-06 20:30:35 +00:00
Hannah Wolfe
5a18eae819 Merge pull request #4882 from jaswilli/client-controller-tests
Add tests for client controllers
2015-02-05 20:28:40 +00:00
Hannah Wolfe
6005bc732d Merge pull request #4887 from jaswilli/issue-4886
Fix error in generating absolute URLs for RSS
2015-02-04 18:30:28 +00:00
John O'Nolan
3c52d96fe6 Merge pull request #4793 from PaulAdamDavis/url-upload-styles
Update Image URL Input Styles
2015-02-04 09:02:33 -04:00
John O'Nolan
6f0e445e9f Merge pull request #4864 from PaulAdamDavis/user-image-styles
Update user image styles
2015-02-04 09:02:20 -04:00
Jason Williams
921f7dab5b Fix error in generating absolute URLs for RSS
Closes #4886
2015-02-03 21:10:06 +00:00
Jason Williams
8d7b0034bb Add tests for client controllers
No Issue.
- Add tests for SettingsGeneral controller.
- Add tests for PostSettingsMenu controller.
2015-02-02 22:22:03 +00:00
Hannah Wolfe
31880e7cfa Merge pull request #4880 from jaswilli/client-model-tests
Add tests for admin client models
2015-02-02 19:03:40 +00:00
Jason Williams
b1b24706b4 Merge pull request #4877 from harryhope/master
Ignore non-words in word counter
2015-02-02 10:52:04 -06:00
Jason Williams
d60fff9519 Add tests for admin client models 2015-02-01 21:41:55 +00:00
Harry Hope
6361976c39 ignore non-words in word counter 2015-02-01 01:22:20 -05:00
Jason Williams
15fcc8067b Fix regression in re-setting slug on untitled post
Refs #4748
2015-02-01 05:17:24 +00:00
Marcos Ojeda
6f457768a2 Update urlFor to handle 'nav' contexts
needed for #4852
Before this, calling `{{url}}` with a nav context from #4541 would
output `/`. This adds a check in `urlFor` that looks for keys in a
nav context object, namely `slug`, `current`, `label`, & `url`.

This change allows for a url to pass through if used in a nav context.

* adds `schema.isNav()`
* adds tests to `url_spec.js`
* handles absolute urls correctly even if `absolute=true`
2015-01-31 09:29:53 -08:00
Jason Williams
db693b50cb Do not add autofocus attribute unless set to focus
No Issue
- Don't add the "autofocus" attribute to the input element unless
  the "focus" property is set to true.
2015-01-30 22:29:34 +00:00
Hannah Wolfe
aa4bcda52c Merge pull request #4865 from PaulAdamDavis/user-settings-no-name-bug
Fix layout error when there's no user name
2015-01-30 20:16:04 +00:00
Paul Adam Davis
35ddf189e7 Move bottom notifications outlet outside of <main>
Closes #4379

- Moves the bottom notification outlet _outside_ the `<main>` element which allows notifications to show above the nav bar
- Removes (the now unnecessary) code which counter-positioned the bottom notifications when a Settings Menu was opened.

The way these notifications look or are positioned at various viewport sizes **has not changed**.
2015-01-30 16:01:13 +00:00
Jason Williams
571c9b61c3 Simplify url preview component, add test
No Issue
- Rework the preview URL component so its implementation is
  simpler.
- Add test for gh-url-preview component.
- ember-mocha@0.3.0.
- Remove unused jshint options.
2015-01-29 17:13:02 +00:00
Paul Adam Davis
56e9f09277 Update user image styles
Related to #4844

The newly added user image in the content list uses a CSS property to
crop `img` tags, but it's not supported in IE or Firefox. This issue
corrects that by chancing them to be background images which can be
cropped cross-browser.

It also adjusts the nav bar user image (previously an `img` tag) which
would squash a non-square image.

Also removes the border around the settings/users/ user images, to be
consistent with the rest of the UI.
2015-01-29 11:34:14 +00:00
Hannah Wolfe
366ed7c220 Merge pull request #4860 from jaswilli/add-on-enter
Add new navigation item on enter key
2015-01-28 21:24:43 +00:00
Paul Adam Davis
61a6197074 Fix layout error when there's no user name
No issue

- Adds a clearfix to the user settings header to prevent a broken
layout when there's no name.
2015-01-28 16:43:55 +00:00
Jason Williams
c764503224 Merge pull request #4861 from ErisDS/tag-mgmt-cache
Add cache invalidation header when updating tags
2015-01-27 20:23:45 -06:00
Hannah Wolfe
4eee52d142 Add cache invalidation header when updating tags
no issue
2015-01-27 23:44:31 +00:00
Jason Williams
b3ed3d78cb Add new navigation item on enter key
No Issue
- Fix regression in add item on enter behavior.
2015-01-27 23:14:45 +00:00
Jason Williams
f0ae1fa919 Set 'value' property before a dependent CP is used
No issue.
- Make sure value property has been set before computed
  property isRelative is referenced.
2015-01-27 22:23:10 +00:00
John O'Nolan
9881af3404 Merge pull request #4844 from PaulAdamDavis/content-list-style
Update content list styles
2015-01-27 13:03:24 -05:00
Hannah Wolfe
057a8d19ac Merge pull request #4842 from chilts/add-slash-to-tag-editor-tag-url
Make preview URLs include trailing slash when slug is given
2015-01-27 17:45:01 +00:00
Hannah Wolfe
54c7d23b26 Merge pull request #4841 from jaswilli/frontend-match
Use path-match to match routes instead of Router
2015-01-26 21:28:35 +00:00
Matt Enlow
8693e1dda0 Merge pull request #4855 from jaswilli/serializer-cleanup
Update Ember-Data, remove unneeded code
2015-01-26 12:05:50 -07:00
Jason Williams
f794490e61 Update Ember-Data, remove unneeded code
No Issue.
- Ember-Data@1.0.0-beta.14.1.
- Remove code from serializers for a workaround that's no longer needed.
2015-01-25 20:00:55 +00:00
Paul Adam Davis
d54af1b926 Update content list styles
Closes #4425

- Adds the author avatar (with defalt fallback)
- Shows author name when hovering the avatar (falls back to email address)
- Slightly adjusts type, colour, and spacing
2015-01-24 17:51:19 +00:00
Hannah Wolfe
cea358bff0 Merge pull request #4845 from jaswilli/jshint
Remove jshint rules that are no longer supported
2015-01-24 18:23:55 +01:00
Andrew Chilton
7f9d10a62d Assign a higher priority to featured posts in the sitemap
Closes #4792
- Made priority be 0.8 (as it currently is) for standard posts
- Made featured posts have a priority of 0.9
- Split the current test into two to check both above scenarios
2015-01-24 21:19:14 +13:00
Hannah Wolfe
3c86f67fca Merge pull request #4831 from jaswilli/edit-user
Fix up users API so admin role can edit owner
2015-01-23 22:55:08 +01:00
Jason Williams
d633ffc766 Remove jshint rules that are no longer supported
No Issue
- grunt-contrib-jshint@0.11.0.
- remove error about browser global Notification being redefined.
2015-01-23 21:00:37 +00:00
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
Jason Williams
b06d2a619d Use path-match to match routes instead of Router
No Issue
- Use path-match instead of hacking up the Express.Router internals.
2015-01-22 19:21:47 +00: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
Jason Williams
0fc152b2ad Fix up users API so admin role can edit owner
No Issue.
- Make sure that a user with the Admin role can edit the Owner.
- Add test for behavior.
2015-01-20 21:34:24 +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
Mark Stosberg
770317b834 Refactor: Make checkSSL unit-testable and add unit tests for it.
- Code was moved to core/server/middleware/middleware.js, which is the
  home for unit-testable middleware.

- Functional code coverage for this code also exists at:
  test/functional/routes/admin_test.js
2015-01-18 13:44:50 -05:00
Josh Vanderwillik
094d6dfc38 Make HTTPS compatible with a Ghost module
closes #4434
- Change an incorrect redirect
2015-01-17 21:23:31 -05: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
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
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
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
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
Paul Adam Davis
f90cb0c8de Update Image URL Input Styles
No issue

The style for the URL input when uploading images are a bit broken.
This PR reduces the horizontal spacing in the settings menu uploader (to widen the input), corrects the button with black text in the editor uploader and makes sure all image upload inputs fill the container.
2015-01-13 11:16:04 +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
e8fa276fea Update about page copyright 2015-01-12 17:46:11 +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
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
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
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
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
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
Martin H. Normark
3faf4deca0 Load next page if scrollHeight <= clientHeight
closes #4764
- call loadNextPage in attachCheckScroll, if element scrollHeight <=
clientHeight
2015-01-07 00:16:16 +01: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
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
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
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
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 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
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
Jason Williams
a67b6bcd90 Merge pull request #4722 from mbrock/master
Add reentrant conversion to Showdown footnotes.
2014-12-30 09:41:58 -06:00
Mikael Brockman
c9069cc234 Add reentrant conversion to Showdown footnotes.
closes #4668

- inline markup in footnotes now works properly
- note that multi-paragraph footnotes are still broken
2014-12-30 05:32:03 -05:00
Jason Williams
0dc0d37888 Change url and image into synchronous helpers
Closes #3961
2014-12-29 18:44:15 +00:00
Hannah Wolfe
edc98602d3 Merge pull request #4724 from jaswilli/http-api
Fix up HTTP API handler
2014-12-29 18:39:26 +00:00
Robert Jackson
eb2d940e11
Remove PostSettingsMenuView.
It seems that the properties this sets up (`datePlaceholder` and
`publishedAt`) are unused throughout the project.
2014-12-28 22:14:02 -05:00
Robert Jackson
fc18a38215
Fix invalid HTML in templates.
HTMLBars (coming soon in Ember 1.10) validatest templates during
compilation. This PR fixes errors identified.
2014-12-28 18:01:05 -05:00
Jason Williams
f6736049c3 Fix up HTTP API handler
No Issue
- Add Location header for tags.
- Ensure Location header has trailing slash.
- Remove unnecessary promises/async.
2014-12-28 05:27:29 +00:00
Jason Williams
3f3544a3bb Make embedded-relation-adapter the default
No Issue
- Generalize embedded-relation-adapter so it can be used for both fetching
  and saving records.
- Change Adapter inheritance hierarchy to
  RESTAdapter => BaseAdapter => EmbeddedRelationAdapter. ApplicationAdapter
  now extends EmbeddedRelationAdapter.
- Cleanup or remove adapters that existed just to extend directly
  from EmbeddedRelationAdapter.
2014-12-28 00:28:36 +00:00
Hannah Wolfe
5b23a3d957 Merge pull request #4720 from jaswilli/modal-error
Use an explicit action name in action helper
2014-12-27 19:13:53 +00:00
Hannah Wolfe
cce0d72870 Merge pull request #4716 from jaswilli/deps
Update dependencies
2014-12-26 17:17:38 +00:00
Jason Williams
07bf54224a Merge pull request #4666 from felixrieseberg/iss4651
Trigger Change Event before Login
2014-12-26 11:13:18 -06:00
Jason Williams
26b7102451 Use an explicit action name in action helper
No Issue
- Clicking on the body of a modal dialog causes an
  unhandled exception in the console.  Add an explicit
  action name to the helper.
2014-12-26 16:01:50 +00:00
Jason Williams
730e7ebcfa Adjust about page tests
No Issue
- Wait for list item element to appear before starting tests
  to make sure template partial has been rendered.
- Remove test for 20 list items as it's possible that there
  could be fewer than 20 contributors for during the window.
  Instead just test to make sure the list has at least one item.
2014-12-25 17:35:11 +00:00
Jason Williams
d59f873aec Update dependencies
No Issue
- bluebird@2.4.2
- body-parser@1.10.0
- busboy@0.2.9
- connect-slashes@1.3.0 (remove base path option which is no
  longer needed)
- fs-extra@0.13.0
- glob@0.4.2
- passport@0.2.1
- passport-oauth2-client-password@0.1.2
- grunt-jscs@1.1.0
2014-12-25 00:22:45 +00:00
Jason Williams
2c66430dba Merge pull request #4690 from ErisDS/image-importer
Add support for importing images
2014-12-24 17:08:13 -06:00
Hannah Wolfe
98087f0244 Merge pull request #4708 from cobbspur/editors
Fixes navigation for Editors on small screen
2014-12-24 13:03:46 +00:00
John O'Nolan
c01b32c74f Fix settings back button implementation 2014-12-23 20:02:55 +00:00
Paul Davis
a8b30209be Merge pull request #4711 from JohnONolan/fix-tagmgmt
Fix tag mgmt display bugs
2014-12-23 12:22:54 +00:00
John O'Nolan
06b4b377a6 Fix tag mgmt display bugs
- Misaligned header due to back button being in the wrong place in the markup
- Corrected padding on tag delete button
- Updated tag settings input labels for consistency
2014-12-23 14:10:21 +02:00
Paul Adam Davis
7200b5ec40 Fix modal edge spacing
No issue

The transparent border surrounding modals was being cut off.
This fix uses padding instead of adjusting the left & right valued to create space.
2014-12-23 12:05:18 +00:00
cobbspur
050491a9d3 Fixes navigation for Editors on small screen
closes #4707

- Changes Back-link on settings users page to content for editors
2014-12-23 10:35:49 +00:00
Hannah Wolfe
d620f3a0d2 Merge pull request #4699 from jaswilli/issue-4683
Finish tag post count UI.  Misc tag related fixes
2014-12-22 20:15:25 +00:00
cobbspur
c98ee001be Fix back button on tag UI page
closes #4703

- previous link used absolute url which fails for subdirectories
2014-12-22 16:50:09 +00:00
Hannah Wolfe
a54b5c4af1 Merge pull request #4698 from jaswilli/tag-dup-slugs
Run tag add operations in sequence
2014-12-22 10:00:05 +00:00
Hannah Wolfe
7f4539e67e Merge pull request #4693 from cobbspur/metatags
Updated meta helpers to use tag meta data if present
2014-12-22 09:56:11 +00:00
Jason Williams
7176097e9d Finish tag post count UI. Misc tag related fixes
Issue #4683
- Finish setting up pagination in tag management page.
- Add post count warning to delete tag modal.  Fix styling.
- Make sure tag input menu is loading all tags.
- Only include saved tags in tag input suggestion list.
- Unload tag records from store when entering tag route so that
  we get accurate post count.
- Add a resetPagination action to pagination-controller-mixin for
  cases where we want to start fresh.
- Include tag.id when sending tag payload to API.
2014-12-22 02:17:18 +00:00
Jason Williams
15ebc5d5dc Merge pull request #4689 from ekulabuhov/4683_TagPostCountUI
Updated tag management UI with the post counts
2014-12-21 19:19:56 -06:00
Jason Williams
633cf1385a Run tag add operations in sequence
Closes #4697
- Run tag add operations in sequence instead of in parallel
  since generateSlug will hand out duplicate slugs until one of
  them is committed to the database.
- Add test.
- Misc cleanup of method parameter names and jshint hints.
2014-12-22 00:41:10 +00:00
Eugene Kulabuhov
f1da5f86b6 Updated tag management UI with the post counts
closes #4683
- added post count to 'delete tag' modal
- fixed lint errors
- preventing extra data to be sent to server
- adjustments suggested by @jaswilli
2014-12-22 00:26:52 +00:00
Paul Adam Davis
a3e36fca8d Fix broken user list paginated scrolling
Closes #4695

- Adds a new class to the template and minor CSS to allow user list scroll events to work
2014-12-21 23:03:39 +00:00
cobbspur
32059812a9 Updated meta helpers to use tag meta data if present
No issue

- Tag Meta title and description override default response
- Tag Meta title present on all pages
- Tag Meta description available only on first page
 - Updates tests
2014-12-21 11:39:49 +00:00
Hannah Wolfe
ba3d4b3689 Add support for importing images
closes #4608, #4609

- image handler loads in any image files & figures out where they'll get stored
- image importer has a preprocessor which replaces image paths in
  pertinent spots of post, tag and user models
- image importer stores images, keeping the path where it makes sense
- basic test for the preprocessor
2014-12-21 01:58:35 +00:00
Jason Williams
b00279885f Merge pull request #4688 from ErisDS/migrate-test
Add tests to verify db version hasn't changed
2014-12-20 11:59:57 -06:00
Hannah Wolfe
48ac142c54 Merge pull request #4546 from PaulAdamDavis/url-preview-comp
Add a URL preview componant
2014-12-20 15:26:59 +00:00
Hannah Wolfe
c855198ace Add tests to verify db version hasn't changed
issue #4479

- these tests will need updating if ever the db schema (not inc validations), permissions fixtures or db
version ever changes
- the intention is that it is no longer possible to accidentally change permissions or the db schema without
knowing you need to update the db version and the values in this test file
2014-12-20 10:24:20 +00:00
Paul Adam Davis
7c310ad2df Add a URL preview componant
Closes #4499

- Introduces a URL preview component
- Added the component to tag settings and post settings
- Adds a new CSS file for this component which makes sure the preview never wraps onto multiple lines
2014-12-19 23:48:21 +00:00
Jason Williams
591fa349aa Finish up post count support in tags API
Refs #4521
- Handle 'include' query param in tags API.
- Add post_count support when fetching a tag with findOne.
- Remove post_count from options.include after processing.
- Extra database query no longer used to fetch post_count.
2014-12-19 21:46:34 +00:00
Hannah Wolfe
6af0b83b7c Merge pull request #4670 from jaswilli/model-opt
Optimize model class methods
2014-12-19 21:19:01 +00:00