Commit Graph

3472 Commits

Author SHA1 Message Date
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