TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-16 04:08:34 +03:00
Code Issues Projects Releases Wiki Activity
3,331 Commits 253 Branches 1,686 Tags 364 MiB
1ed286d09e
Commit Graph

2446 Commits

Author SHA1 Message Date
Jason Williams
e73468fb1e Fix and enable general and user settings tests. 
Conflicts:
	core/test/functional/client/settings_test.js
 2014-08-18 20:44:26 +01:00
Hannah Wolfe
90b9c7681c Fixing bad merge 2014-08-18 20:22:10 +01:00
Felix Rieseberg
ab9fe8752f Post Settings: No 'Author' selection for 'author' 
closes #3756
- The post settings menu’s option to change the post’s author isn’t
displayed if the user has the ‘author’ role.
- Also fixed some incorrect indentation in the template (no actual code
change)
 2014-08-18 19:29:19 +01:00
Hannah Wolfe
b1c77c70fd Merge pull request #3805 from TryGhost/gui-update-yolo 
Gui Update
 2014-08-18 19:20:40 +01:00
Hannah Wolfe
3bf3d497cf Fixing tests, PSM and settings pane 
- resolving test failures where number of tests changed
- fixing issue with PSM label
- re-removing app settings screen code
 2014-08-18 18:16:09 +01:00
John O'Nolan
04536b3916 God damn tests 2014-08-17 22:23:00 +03:00
Hannah Wolfe
734fad2a64 Merge pull request #3762 from blia/dev 
Fixed TypeError when updating slug
 2014-08-17 16:02:14 +01:00
John O'Nolan
c4b87bbfeb Content management cleanup 2014-08-17 15:01:35 +03:00
John O'Nolan
137c0129db Settings nav overhaul 2014-08-17 15:01:35 +03:00
John O'Nolan
5f0bca1166 Disable Pinterest inside Ghost admin 2014-08-17 14:58:03 +03:00
Paul Adam Davis
5912286b35 Use old form styles with class changes for radios & checkboxes 2014-08-17 14:58:03 +03:00
Paul Adam Davis
10ffe68c08 Working new dropdowns 
- Implement new GUI 2.0 dropdowns into templates
 2014-08-17 14:58:03 +03:00
John O'Nolan
85b7819791 Implement new button markup 2014-08-17 14:57:07 +03:00
John O'Nolan
c10d555a2e New publish button markup implementation 2014-08-17 14:53:47 +03:00
John O'Nolan
2e4f2a262d Adding global app frame wrappers 
This makes the new responsive styles work in a basic way. It'll probably need revisiting to break out the header area into a partial (maybe?)
 2014-08-17 14:53:47 +03:00
John O'Nolan
0c56a2478b Implement new global-nav markup 2014-08-17 14:40:44 +03:00
Hannah Wolfe
b91dee35c4 Removing prototypal i18n code 
refs #16, #17, #18, #19, #20, #21, #3801

- This code was a prototype system built when Ghost was still a prototype.
  It was never fully implemented and hasn't actually worked for ages.
- Now that the admin is in Ember, it's likely we'll need a very different
  system.
 2014-08-16 17:29:54 +01:00
Hannah Wolfe
9b7be32c0c Merge pull request #3775 from felixrieseberg/iss3765 
Ensure Owner's role isn't downgraded
 2014-08-16 17:07:41 +01:00
Felix Rieseberg
47ba9a7385 Ensure Owner's role isn't downgraded 
closes #3765
- Simple API check to ensure that the owner isn’t downgraded to a
different role (analog to the ’can’t change your own role’ check)
- Test added to ensure Owner can't be downgraded to a lower role
 2014-08-15 17:44:30 -04:00
Hannah Wolfe
7f4231c83d Merge pull request #3791 from ErisDS/issue-3790 
Display correct new Ghost version
 2014-08-15 18:34:03 +01:00
Hannah Wolfe
e8ad143705 Merge pull request #3785 from jaswilli/post-status 
Revert post status on failed save.
 2014-08-15 18:27:47 +01:00
Hannah Wolfe
260d9562e4 Merge pull request #3670 from felixrieseberg/iss3641 
Validation fix for number of posts/page
 2014-08-15 18:27:14 +01:00
Hannah Wolfe
52d0a83dc2 Display correct new Ghost version 
closes #3790
 2014-08-15 18:23:55 +01:00
Hannah Wolfe
d2e09de0de Merge pull request #3769 from novaugust/iss3764 
Hide role dropdown on user page if user is owner
 2014-08-15 17:53:46 +01:00
Jilles Soeters
6249d28a92 Added target="_blank" to all links that go to the support page. 2014-08-15 16:46:24 +02:00
Jilles Soeters
ecdf5cec21 Open the e-mail sending support page in a new window. 2014-08-15 16:20:52 +02:00
Jason Williams
1c4c4eb5de Correct behavior on updating user slug. 
No Issue
- Defer save until after slug is checked.
- If new slug is empty or all whitespace, reset to previous value.
- If new slug is the same as existing slug except for an increment
  value (e.g. ghost-user-2), use the original slug.
- If the slug has changed, change the URL path to reflect the
  change so that the browser refresh and back button still work.
- Added tests.
 2014-08-15 04:00:19 +00:00
Jason Williams
24a97db1be Revert post status on failed save. 
Refs #3667, Refs #3776
- If saving a post fails, revert its status back to the
  pre-save value.
- Added tests to check post status after failed save attempt
  on both new and existing posts.
 2014-08-15 00:22:10 +00:00
Hannah Wolfe
868219d0a9 Merge pull request #3776 from felixrieseberg/iss3667 
Ensure editor awareness if publishing fails
 2014-08-14 21:19:21 +01:00
Hannah Wolfe
b1386fccc3 Merge pull request #3738 from felixrieseberg/iss3728 
Error notification if send test mail returns 500
 2014-08-14 20:38:08 +01:00
Hannah Wolfe
62b46bac57 Merge pull request #3749 from novaugust/ghost-logo-link 
Update ghost-logo, amend the amdendments, death to jQuery
 2014-08-14 20:19:00 +01:00
Hannah Wolfe
a8fdc7ac43 Merge pull request #3773 from jaswilli/settings-tests 
Fix and enable general and user settings tests.
 2014-08-14 20:05:42 +01:00
Felix Rieseberg
6e8c98e27c Ensure editor awareness if publishing fails 
closes #3667
- If the ‘save’ function on a new post fails, the local Ember model
still beliefs that the status is ‘published’, resulting in wrong
buttons. A simple catch fixes that.
 2014-08-14 11:05:05 -07:00
Felix Rieseberg
f19c2be6fe Validation fix for number of posts/page 
closes #3641
- Reworded error messages, remove “please” (credits go to @YouriAckx)
 2014-08-13 12:08:09 -07:00
Hannah Wolfe
048cdc5f16 Merge pull request #3733 from rwjblue/use-ghost-paths-util 
Use the ghost-paths consistently.
 2014-08-13 18:28:11 +01:00
Hannah Wolfe
2aed220e9e Merge pull request #3647 from felixrieseberg/iss3644 
Accept all versions of 'edit' as URL parameter
 2014-08-13 18:22:18 +01:00
Jason Williams
2eb9a48c48 Fix and enable general and user settings tests. 2014-08-13 14:14:29 +00:00
Matt Enlow
8748895607 Hide role dropdown on user page if user is owner 
Closes #3764
 2014-08-12 18:06:34 -06:00
Kirill Yakovenko
d812f99174 Fix TypeError when updating slug 
- added check slug before trim
 2014-08-12 17:46:14 +03:00
Felix Rieseberg
0720033e38 Error notification if send mail api returns 500 
closes #3728
- If the mail config is broken, the ajax call will fail with 500 and
not return an error.
- This change catches 500 and wraps the error in a notification.
 2014-08-11 09:15:12 -07:00
Matt Enlow
10f3efa388 Update ghost-logo, death to jQuery 
Amends #3740 (which amended #3736), ref #3623
- Removed futzy jquery for setting href on logo; binding to ApplicationView property
- Killed dead code
 2014-08-11 09:52:55 -06:00
Hannah Wolfe
1e14cac5ce Merge pull request #3740 from PaulAdamDavis/ghost-logo-link 
Change Ghost logo link back to an anchor
 2014-08-11 12:20:42 +01:00
Sebastian Gierlinger
ffe2ad2d9f Merge pull request #3743 from ErisDS/filestorage-helper 
Filestorage helper returns string true if config is object
 2014-08-11 13:12:58 +02:00
Paul Adam Davis
a11e25c12b Add ghost logo anchor tag 
Amends #3736, references #3623

With `button.ghost-logo`, there's no `href`, so cannot be opened in a new window. This changes it back to an anchor and appends the blog URL to a href attribute. Win!

Bumps Ghost-UI version to 0.8.13 bring in related CSS changes.
 2014-08-11 12:08:08 +01:00
John O'Nolan
8d798c95b8 Merge pull request #3744 from PaulAdamDavis/user-actions-button 
Change user actions button tag
 2014-08-11 13:03:22 +02:00
Hannah Wolfe
c500b41536 Filestorage helper returns string true if config is object 
no issue

- else admin client gets [object Object] which is weird Please enter the commit message for your changes. Lines starting
 2014-08-11 11:50:44 +01:00
Hannah Wolfe
96c5266e31 Merge pull request #3742 from rwjblue/ensure-slug-is-always-saved 2014-08-11 11:43:09 +01:00
Robert Jackson
0c3d603f8a Ensure that slug is always synced for User form. 2014-08-11 11:42:53 +01:00
Paul Adam Davis
fc06108445 Change user actions button tag 
No issue

- Changes the user actions button to a `<button>` element.
 2014-08-11 11:29:29 +01:00
Hannah Wolfe
5381db37cd Fix for bug where owner user has name owner 
no issue

- in the case that the role is not being assigned, the code assumes it doesn't get a role..
 2014-08-11 10:51:14 +01:00
Jason Williams
8fb3cddcf6 Update express and body-parser dependencies. 
No Issue
- Upgrade to versions of these packages that use qs >= 1.0.0.
 2014-08-11 05:20:31 +00:00
Hannah Wolfe
988ca127b6 Updating docs links to point to support.ghost.org 2014-08-10 23:17:40 +01:00
Hannah Wolfe
e5771b0b3f Merge pull request #3736 from novaugust/ghost-burgers 
Fix -navbar events attachment
 2014-08-10 22:45:50 +01:00
Matt Enlow
d61e37e799 Fix -navbar events attachment 
Closes #3623
- Move hamburger logic to action with terrible name, "toggleSidebarOrGoHome"
- Move ".js-close-sidebar" events to a document.on(event, *selector*, f) to make sure they attach even when the js-close-sidebars aren't on page (ie, hidenav)
 2014-08-10 15:31:47 -06:00
Sebastian Gierlinger
85a1902294 Merge pull request #3735 from ErisDS/cache-invalidation 
Adding author pages to cache invalidation
 2014-08-10 22:01:19 +02:00
Sebastian Gierlinger
d167bb4ff4 Merge pull request #3731 from ErisDS/issue-3724 
Expose blog URL to client app
 2014-08-10 20:51:45 +02:00
Hannah Wolfe
d556f4723e Adding author pages to cache invalidation 2014-08-10 19:32:46 +01:00
Hannah Wolfe
90fc933f08 Merge pull request #3730 from jyek/auth-route 
Update authentication endpoint for subdirectory
 2014-08-10 19:23:31 +01:00
Hannah Wolfe
32d72d5daa Expose blog URL to client app 
fixes #3724

 - provide config.url to the ember client app via a data attribute
 - create server and client side helpers to output the URL
 - wire up the client side helper
 - add a class for testing, and add tests for both the server and client side
 2014-08-10 18:49:37 +01:00
Justin Yek
8393ba727b Update authentication endpoint for subdirectory 
Fixes bug where user is unable to log into admin when subdirectory is specified
 2014-08-11 01:29:36 +08:00
Robert Jackson
569fb34a1f
Use the ghost-paths consistently. 
Always using the utility function ensures that we have the ability to
update/change/etc these paths without scouring the codebase.

For example, if we ever decide to bump the API version it would be nice
if there was only one location it needed to be updated at.
 2014-08-10 13:10:29 -04:00
Hannah Wolfe
d210e400b0 Merge pull request #3729 from rwjblue/ensure-author-in-psm-is-reset 
Ensure PSM author is reset when changing posts.
 2014-08-10 16:26:36 +01:00
Hannah Wolfe
c12b92582c Merge pull request #3722 from hswolff/rss-atom-url 
Fix rss content's url to the RSS feed
 2014-08-10 16:01:54 +01:00
Robert Jackson
4752fb77c9
Ensure PSM author is reset when changing posts. 2014-08-10 10:40:04 -04:00
Hannah Wolfe
957b1566de Merge pull request #3723 from JohnONolan/wrong-slug 
Fix wrong author slug on user settings page
 2014-08-10 15:36:01 +01:00
Hannah Wolfe
2d2e61676d MU Importer - Assign objects correctly 
fixes #3716

- change the importer to not override any user details
- only set published_by if it is not already set
- import users before anything else
- process the import and map user ids to existing users
- test fix - owner should have owner role
- test fix - catch invalid success in importer
 2014-08-10 14:49:23 +01:00
John O'Nolan
85809a8b82 Fix wrong author slug on user settings page 2014-08-10 10:37:28 +03:00
Harry Wolff
5d70604f9b Fix rss content's url to the RSS feed 
fixes #3719

- correctly sets the path to the RSS feed for tags and authors
 2014-08-09 23:16:27 -04:00
Felix Rieseberg
c4aeab1fde Fix 'broken' debug tools template 
closes #3715
- Includes wrapper class for @pauladamdavis css
 2014-08-09 09:20:50 -07:00
Felix Rieseberg
4269ca94fa Error if user has already been invited 
closes #3681
 2014-08-08 16:41:16 -07:00
Hannah Wolfe
d6b62501c0 Merge pull request #3706 from jaswilli/invite-fixup 
Close invite user modal immediately after submit.
 2014-08-08 22:58:29 +01:00
Hannah Wolfe
2472637321 Merge pull request #3704 from javorszky/iss3649 
Sends test email to the person who clicked on the button
 2014-08-08 22:54:21 +01:00
Hannah Wolfe
78929cab1a Merge pull request #3705 from wjake/issue-3663 
Reset forgotten form on success
 2014-08-08 22:45:53 +01:00
Hannah Wolfe
4d4efe26ae Merge pull request #3702 from ErisDS/issue-3694 
Switch middleware order to result in proper error
 2014-08-08 22:44:30 +01:00
Jason Williams
d488454f10 Close invite user modal immediately after submit. 
Closes #3672, Closes #3673, Closes #3680
- Close and reset modal immediately after submit instead
  of waiting until after processing has finished.
 2014-08-08 20:44:03 +00:00
Gabor Javorszky
508f669a49 Sends test email to the person who clicked on the button 
Closes #3649

* Small refactor of the api route for email test. We no longer need to look up the email in the settings
* Added a user model lookup based on context to the test email method.
 2014-08-08 18:41:14 +01:00
Hannah Wolfe
56d29d0206 Merge pull request #3697 from novaugust/close-modal#3652 
Close modals when clicking off them
 2014-08-08 18:05:13 +01:00
Hannah Wolfe
2d82617726 Merge pull request #3696 from rwjblue/do-not-focus-post-title 
Do not focus post title when editing.
 2014-08-08 18:03:00 +01:00
Hannah Wolfe
7d37a829c3 Switch middleware order to result in proper error 
fixes #3694

- Split the res.isAdmin check out into it's own thing because we need to detect whether we are in the admin, before everything else
 2014-08-08 17:17:07 +01:00
Robert Jackson
1d360b3d18
Do not focus post title when editing. 2014-08-08 11:37:24 -04:00
David Balderston
99e77cab3c Removed Username From Initial Blog Description 
closes #3631
- Removed the 'by + setupUser.name' from authentication.js
- Removed the 'by Test User' from feed_test.js
- Added a '.' to the end of each per issue comment example
 2014-08-08 08:04:46 -07:00
Matt Enlow
1e4d11c734 Close modals when clicking off them 
Closes #3652
 2014-08-08 08:33:42 -06:00
Hannah Wolfe
8cf270aad2 Merge pull request #3693 from sebgie/issue#3623 
Fix Ghost icon is not clickable
 2014-08-08 14:38:06 +01:00
Hannah Wolfe
918a911d3f Merge pull request #3686 from sebgie/issue#3660 
Improve error handling for authentication
 2014-08-08 14:25:40 +01:00
Sebastian Gierlinger
9e65b47007 Merge pull request #3695 from ErisDS/issue-3657 
Don't require protocol for website
 2014-08-08 15:24:25 +02:00
Hannah Wolfe
648b503cff Merge pull request #3690 from sebgie/issue#3659 
Improve handling of SQLITE_READONLY
 2014-08-08 14:18:29 +01:00
Hannah Wolfe
e01046df11 Don't require protocol for website 
fixes #3657

- we didn't require this previously, and adding it causes issues
 2014-08-08 14:15:49 +01:00
Sebastian Gierlinger
d5a34d72e6 Merge pull request #3688 from ErisDS/issue-3658 
Catch user validation errors on login
 2014-08-08 15:07:37 +02:00
Hannah Wolfe
8d46705dbb Disable user validation and errors on login 
fixes #3658

- Catch any errors from user.save() events during login
- Prevent validation from happening at all when only updating status/last_login
- Fixes a problem I introduced with errors which are arrays in logError
 2014-08-08 13:12:17 +01:00
Sebastian Gierlinger
22f147c995 Fix Ghost icon is not clickable 
closes #3623
- Initialization of the link was done on login page where the ‚burger‘
did not exist.
- initialization in application needs to be done to make it work on
refresh
 2014-08-08 13:53:56 +02:00
Sebastian Gierlinger
9cedd1a2b9 Imporve handling of SQLITE_READONLY 
closes #3659
- added alternate context/help for SQLITE_READONY error to
errors.logError()
 2014-08-08 11:16:51 +02:00
Sebastian Gierlinger
649a0872ec Improve error handling for authentication 
closes #3660
- added wrapping in JSON API format to error500()
- added client side handling
 2014-08-08 09:44:24 +02:00
Jake Wright
f95a3d349d Reset email form value on success 
closes #3663
- Set value of email input as nil string
 2014-08-08 02:52:19 +01:00
Hannah Wolfe
8e17efeac9 Merge pull request #3656 from rwjblue/activate-specific-tab-not-toggle 
Activate specific tab that is tapped/clicked.
 2014-08-07 19:32:14 +01:00
Hannah Wolfe
ae0edc5674 Merge pull request #3655 from rwjblue/dont-loop-keyboard-nav 
Do not loop keyboard nav on content list.
 2014-08-07 19:30:48 +01:00
Hannah Wolfe
f7664194ca Merge pull request #3628 from novaugust/popover-btn-binding#3603 
Add open class to popover buttons
 2014-08-07 19:27:46 +01:00
Robert Jackson
493fe8183b
Activate specific tab that is tapped/clicked. 2014-08-07 09:32:10 -04:00
Robert Jackson
b7b797e2fb
Do not loop keyboard nav on content list. 2014-08-07 09:15:24 -04:00
Felix Rieseberg
39f10228f6 Editor: Warn if title change is unsaved 
closes #3643
- TitleScratch is compared with Title; if there’s a difference, we have
unsaved changes and open up the modal.
 2014-08-06 20:39:19 -07:00
Felix Rieseberg
8453067d70 Accept all versions of 'edit' as URL parameter 
closes #3644
 2014-08-06 20:07:41 -07:00