TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-15 11:34:24 +03:00
Code Issues Projects Releases Wiki Activity
4,113 Commits 253 Branches 1,686 Tags 364 MiB
6f0bca8d57
Commit Graph

1590 Commits

Author SHA1 Message Date
Jason Williams
63546be1eb Prevent transition to signup on invalid invitation 
Refs #3876
- Prevent signup page from flashing when an invalid invitation
  token is used.
- Clear sensitive information from signup controller.
- Make isInvitation API behavior consistent with other auth
  related APIs.
 2014-09-19 04:52:45 +00:00
Matt Enlow
9fb038f8d3 Merge branch 'pr/3876' 
* pr/3876:
  Redirect user if signup invitation isn't valid
 2014-09-18 19:22:39 -06:00
Felix Rieseberg
b1c1b03015 Redirect user if signup invitation isn't valid 
Closes #3565
- Added server API isInvitation (analog to isSetup), checking if an
invitation exists for a given email address.
- If the invitation is no longer valid (or didn’t exist in the first
place), the user is redirected and an error notification is shown.
 2014-09-18 19:11:40 -06:00
Matt Enlow
5851b1ad9c Merge pull request #4051 from PaulAdamDavis/fix-user-settings 
Fix user settings page for Firefox
 2014-09-18 18:51:22 -06:00
Matt Enlow
f29231aa70 Add Tab components 
Closes #3937
- Add ghost tab components
- Remove extra container div from Application view
- Move right-outlet viewing logic to application level
- Prepare PSM.hbs for tabbing
 2014-09-18 18:15:43 -06:00
Fabian Becker
8575e8de59 Mobile view menu for content screen 
closes #4031
- Adds css to show back button, edit button in header nav on mobile
 2014-09-18 15:52:40 +00:00
Fabian Becker
12f117cfbe Properly handle no posts 
fixes #4058
- Set noPosts in setupController
 2014-09-18 16:29:03 +02:00
Harry Wolff
469aaa398c Add jscs task to grunt file and clean up files to adhere to jscs rules. 
resolves #1920

- updates all files to conform to style settings.
 2014-09-17 21:44:29 -04:00
Paul Adam Davis
b55d1b47d2 Fix user settings page for Firefox 
References #4050

- Restructures the CSS to work in Firefox - No visual changes, only fixes
 2014-09-17 14:07:44 +01:00
Matt Enlow
21aee9229c Merge pull request #4041 from felixrieseberg/psm-coverimages 
PSM: Cover Images
 2014-09-16 15:37:33 -06:00
Felix Rieseberg
0048d393ac PSM: Cover Images 
closes #3885
 2014-09-16 13:32:43 -07:00
Matt Enlow
a3bb8cb588 Add delete post shortcut to content screen 
Proposal :: No issue
- cmd/ctrl+backspace deletes a post on the content screen
 2014-09-16 12:02:27 -06:00
Hannah Wolfe
411e8dc44f Merge pull request #4044 from novaugust/issue4032 
Abstract mobile transition interactions
 2014-09-16 18:34:23 +01:00
Paul Davis
fcab1a961b Merge pull request #4033 from halfdan/getting-typos 
Fix Markdown help modal table positioning
 2014-09-16 16:36:53 +01:00
Matt Enlow
09fb17a2be Abstract mobile transition interactions 
Closes #4032
- Created "mobile" views: `parent-view`, `content-view` and `index-view`
- `mobile/parent-view` has three callbacks for managing layout, and a mediaQuery listener to keep in sync with the user
- content-view and index-view use their parent-views callbacks to bring themselves into and out of the viewport as appropriate
- fixed media queries for post content list from 800px to 900px
- Created `mobile-index-route` to intelligently transition to a new route on desktops (used by both PostsIndexRoute and SettingsIndexRoute)
- Extract mobile interactions from settings views to new mobile utility views
- `js-` prefixed settings view transitions
- removed unused openEditor action from PostsRoute
- removed unused mobile util "responsiveAction"
 2014-09-16 07:28:03 -06:00
John O'Nolan
67b037608a Minor tweaks to new scrollbar appearance and animations 2014-09-15 12:37:52 +03:00
John O'Nolan
550a35239c Merge pull request #4015 from PaulAdamDavis/nano-scrollbars 
[WIP] Nanoscroller integration
 2014-09-15 11:09:10 +02:00
Paul Davis
d5ddbfee5a Merge pull request #4034 from novaugust/iss4027 
Fix editor scroll depending on cursor location
 2014-09-15 09:14:14 +01:00
Fabian Becker
7830d68000 Fix Markdown help modal table positioning 
no ref
- Fix top spacing of markdown table
- Fix width of table and left align table head
- Fix grammar, whitespace in getting-started post
 2014-09-15 09:56:54 +02:00
Fabian Becker
9b002edbf7 Properly align word-count 
no ref
- Re-adds word-count styles
 2014-09-15 00:43:18 +00:00
Matt Enlow
986d3c1696 Fix editor scroll depending on cursor location 
Closes #4027
 2014-09-14 17:38:32 -06:00
Paul Adam Davis
9b94e71805 Static nanoscroller integration 
References #1892

A static integration of https://github.com/jamesflorentino/nanoScrollerJS



This is WIP with the goal of getting feedback on and deciding how we should integrate this into Ghost.
 2014-09-14 17:15:57 +01:00
Paul Adam Davis
9fe5a9280a Fix ::selection bug 
No issue

Fixes a weird issue where text would overlap other text.
 2014-09-13 14:54:44 +01:00
John O'Nolan
bd163ada46 Merge pull request #4014 from PaulAdamDavis/fix-mobile-nav-click 
Change class for editor PSM closing transparent div
 2014-09-12 14:51:05 +02:00
Hannah Wolfe
f2eb90f606 Merge pull request #3999 from novaugust/emberify-posts-c-and-v 
Emberify Posts mobile transitions
 2014-09-12 11:19:34 +01:00
Paul Adam Davis
9a233cde7b Change class for editor PSM closing transparent div 
No issue

- Changes the class used by the transparent div used to close the PSM

Without this change, when in the editor and the nav is open, the transparent div here is above the div the nav is looking for. So, the div for the PSM is clicked, rather than the nav div.
 2014-09-11 16:38:57 +01:00
Matt Enlow
5b74929d1c Merge pull request #4013 from PaulAdamDavis/settings-nav-icons 
Add icons to settings nav menu
 2014-09-11 09:11:34 -06:00
Matt Enlow
9577f61f3b Merge pull request #4011 from PaulAdamDavis/fix-notifications 
Fix notification position when PSM is open
 2014-09-11 08:48:31 -06:00
Paul Adam Davis
8f9401a78c Add icons to settings nav menu 
References #3810

- Re-adds the icons for each item of the settings nav and related styles

I've opted to go with adding `.icon-users` classes instead of setting them in the Sass.
 2014-09-11 15:27:28 +01:00
Paul Adam Davis
9e1f223892 Snap page transition for mobile settings 
References #3810

- Disables the `.fade-in` animation for settings page transitions on mobile
 2014-09-11 14:19:16 +01:00
John O'Nolan
5e9d545bba Merge pull request #4009 from PaulAdamDavis/fix-modals 
Fix modal positioning
 2014-09-11 14:12:11 +02:00
Paul Adam Davis
0bd2294828 Fix notification position when PSM is open 
Closes #4006

- Adds a transition to the notification containers
- Adjusts the position of bottom notifications when PSM is open
 2014-09-11 12:57:41 +01:00
Sebastian Gierlinger
aceb85d2c2 Merge pull request #3994 from halfdan/3982-use-auth-scope 
Add authentication scope.
 2014-09-11 11:00:06 +02:00
Sebastian Gierlinger
6f7fda2a94 Merge pull request #3908 from halfdan/3758-revokation-api 
Delete revoked tokens
 2014-09-11 10:17:08 +02:00
Matt Enlow
6f929eee4a Emberify Posts mobile transitions 
Closes #3950

- Fixed up event attachment and removal in a few mixins
- Renamed content-list-content-view to something more understandable
- simplify transition from posts.index to posts.post
 2014-09-10 20:58:10 -06:00
Paul Adam Davis
d419bec66b Fix modal positioning 
Closes #4008

- Adds a `.modal` class which extends `%modal` - it disappeared with the migration to Libsass
 2014-09-10 19:34:39 +01:00
Fabian Becker
c684ee5b38 Delete revoked tokens 
closes #3758
- new API method to delete access and refresh token
- use new ember-simple-auth config to revoke tokens on logout
- new method to delete tokens by .. token
 2014-09-10 20:19:52 +02:00
Paul Adam Davis
00abfa64fe [WIP] Wire up new mobile nav 
References #3810

With GUI2, there's now a number of places to open the mobile navigation menu. This handles those clicks.
 2014-09-10 18:33:27 +01:00
John O'Nolan
47a0a71350 Merge pull request #3960 from PaulAdamDavis/fix-user-settings-page 
Fix user profile settings
 2014-09-10 19:04:06 +02:00
Paul Adam Davis
7119493a1e Prevent horizontal scroll on content list 
Closes #4000

- Adds `overflow-x: hidden;` to the content list & preview wrapper
 2014-09-10 16:48:33 +01:00
Matt Enlow
5ccbf799e1 Merge pull request #3965 from halfdan/3936-psm-1 
PSM Step 1
 2014-09-10 09:35:21 -06:00
Fabian Becker
961ab5f064 Post Settings Menu - Step 1 
closes #3936
- Implement new PSM
- Hook up close action
- Automatically close when view is destroyed
- Close on click and when pressing ESC
 2014-09-10 17:31:19 +02:00
Jamie Knight
040ee823ba Improve keyboard support 
issue #3964
- added :focus selector to improve keyboard support in modern browsers
- added :active selector to improve keyboard support in old IE
 2014-09-10 01:51:25 +01:00
Fabian Becker
aa43e98e2e Add authentication scope. 
closes #3982
- Set custom key to use in localStorage based on subdir
 2014-09-09 23:44:38 +00:00
Fabian Becker
1f8b323285 Remove active class from buttons. 
refs #3989
- Remove active class from {{#link-to tagName="button" ..}}
 2014-09-09 22:21:39 +00:00
Paul Adam Davis
ecf5d045f3 Fix user profile settings 
References #3810, #3944

- Fixes several small visual bugs with the user settings page
- Changes `.settings-subview-header` to use a clearfix instead of `overflow: hidden;` (fixing style issues in #3944)
 2014-09-09 11:21:39 +01:00
Hannah Wolfe
946eab801a Merge pull request #3963 from jaswilli/issue-3955 
Prevent editor title from being overwritten
 2014-09-06 16:07:30 +01:00
John O'Nolan
eafbe4ed7e Merge pull request #3972 from PaulAdamDavis/form-refactor 
Remove form focus halo
 2014-09-05 18:35:00 +02:00
Paul Adam Davis
a8a72dc55c Remove form focus halo 
No issue

- Removed the blue halo from around focused form elements
- Slightly refactored the forms to target less text inputs and have cleaner syntax
 2014-09-05 17:16:55 +01:00
Gabor Javorszky
5f06f69d18 Adds (Never) for users who haven't been seen 
Closes #3970
 2014-09-05 16:45:34 +01:00
Hannah Wolfe
f7b85524d8 Merge pull request #3957 from halfdan/3956-we-dont-like-html 
Don't send HTML on post save.
 2014-09-05 11:36:19 +01:00
Jason Williams
1d6b1f9667 Prevent editor title from being overwritten 
Closes #3955
- Change titleScratch from being bound to the title to being
  set when entering the editor so it is not overwritten on a
  model refresh.
- Ensure that the "unsaved content" dialog is shown when there are
  changes to the "scratch" fields after a post-settings-menu change.
- Add tests to prevent regression.
 2014-09-04 19:27:59 +00:00
Fabian Becker
60ed88f804 Don't send HTML on post save. 
fixes #3956
- adjusts post serialiser to not send HTML content
 2014-09-04 18:32:34 +02:00
John O'Nolan
af7743f935 Merge pull request #3952 from PaulAdamDavis/fix-what-libsass-broke 
Fix floating header gradient in FF and settings images
 2014-09-04 12:20:36 +02:00
Fabian Becker
2959b6d391 Show settings-cog and back button 
closes #3925
- Make user-settings-cog reappear
- Show [< Users] back button
 2014-09-03 17:18:41 +02:00
Paul Adam Davis
80a048c2d4 Fix floaring header gradient in FF and settings images 
No issue

- Corrects the syntax used for the floating header gradient so it now gets prefixed correctly for Firefox
- Removes padding from `<button>` elements (fixes padding around images in buttons)
- Adds display: block; to settings images to prevent a Webkit bug which adds space under the image
 2014-09-03 15:52:01 +01:00
Matt Enlow
03bea5dbef js- prefix; fix content preview back button 
Closes #1990, Ref #3810
- Add `js-` prefix to jQuery calls throughout code and templates
- move MarkdownComponent classNames to template
- Fix back button on posts content preview
- Remove dead code for preview tabbing jQuery
 2014-09-02 22:29:32 -06:00
John O'Nolan
719f56f918 Merge pull request #3935 from PaulAdamDavis/new-psm 
[WIP] New post settings menu
 2014-09-03 01:29:14 +03:00
Paul Adam Davis
53a4a6a010 Enlarge mobile matchMedia max-width 
Closes #3941

It now matches the mobile MQ in CSS - https://github.com/TryGhost/Ghost/blob/master/core/client/assets/sass/components/navigation.scss#L163
 2014-09-02 22:20:16 +01:00
Paul Adam Davis
d1910c6ea5 Static integration of the new PSM 
Reference #3932

Take this, and make it work.
 2014-09-02 22:07:13 +01:00
Hannah Wolfe
e00843851e Merge pull request #3575 from novaugust/about-ghost 
About ghost page
 2014-09-02 21:17:16 +01:00
Hannah Wolfe
cfd987b748 Merge pull request #3907 from PaulAdamDavis/fix-about-styles 
Update About page styles
 2014-09-02 21:16:50 +01:00
Matt Enlow
737ea3f65e Implement About Ghost page 
Closes #3568
- Deleted html placeholders in client
- Added new grunt task, buildAboutPage, which 1)creates -contributors.hbs partial and 2) downloads contributor avatars
- buildAboutPage is called by anything that does an emberTemplates task
- Removed unused code from ghostpaths
 2014-09-02 13:49:01 -06:00
Paul Adam Davis
9341d05d16 Update About page styles 
Closes #3919

With the move to new global styles, the about page styles got a bit borked. This fixes those.
 2014-09-02 16:48:56 +01:00
Hannah Wolfe
254d890dec Merge pull request #3934 from PaulAdamDavis/fix-cover-image 
Fix user cover images
 2014-09-02 16:33:00 +01:00
Hannah Wolfe
7936fc7d12 Merge pull request #3819 from studioromeo/reset-preview-scroll-position 
Reset preview scroll position when post item is clicked
 2014-09-02 16:28:53 +01:00
Paul Adam Davis
fdb0cce524 Fix user cover images 
No issue

The cover image method in the settings/user controller returned the correct asset URL, but not the corresponding CSS which is needed to show it correctly.
 2014-09-02 15:19:23 +01:00
Robert Rhoades
464db6f289 Resets the scroll position on controller content change 
When scrolling through the preview of a long article, if the
post was changed the scroll position of the preview would
remain the same.
 2014-09-02 13:13:32 +01:00
Hannah Wolfe
910cdc1210 Merge pull request #3903 from JohnONolan/gui-readme 
First pass refactor of GUI readme redux
 2014-09-01 17:18:10 +01:00
Paul Adam Davis
3f72028a73 Fix notification styles 
No issue

I'm not sure why, but @extend's here using placeholder selectors, not classes, work.

This fixes the notification and modal styles, which meant changing how the default button selector works. It is now a placeholder, and a real class extends that. The modal styles extended the default button style, which can now happen.
 2014-08-31 20:56:05 +01:00
John O'Nolan
8321ff33e0 First pass refactor of GUI readme redux 2014-08-31 16:56:41 +03:00
Hannah Wolfe
2a843c309e Adding Grunt tasks for Sass 2014-08-31 14:16:58 +01:00
Hannah Wolfe
91b5d27492 Merge TryGhost/Ghost-UI into TryGhost/Ghost 2014-08-30 18:57:31 +01:00
Paul Adam Davis
7782c48383 Swap out Ruby Sass for Node Sass 
- Uses Node Bourbon https://www.npmjs.org/package/node-bourbon
- Produces source maps
- Removed all ruby dependencie

History:
- Remove bourbon from package and cleanup grunt tasks
- Un-bourbon keyframe animations
- Un-bourbon transitions
- Un-bourbon box-sizing
- Un-bourbon font-feature-settings
- Import bourbon clearfix mixin
- Un-bourbon linear gradients
- Un-bourbon input types
- Un-bourbon positions
- Un-bourbon transforms
- Un-bourbon notification animations
- Un-bourbon uploader box-sizing
- Un-bourbon border-radius
- Un-bourbon splitbutton transitions
- Add triangle mixin
- Un-bourbon default container positioning
- Un-bourbon flexbox properties
- Fix triangle mixin - It now has the same output as the Bourbon mixin
- Add autoprefixer
- Correct global default font size
- Remove unwanted prefixes - Because, y'know, autoprefixer
- Output from node sass migration - Includes all the files we usually have, plus source maps
 2014-08-30 14:13:36 +01:00
Hannah Wolfe
25e08d6af5 Merge pull request #3882 from JohnONolan/fix-profile 
Fix up user profile
 2014-08-26 12:30:00 +01:00
John O'Nolan
1c37ad9a3a Merge branch 'fix-profile' into GUI-2.0 
* fix-profile:
  Fix up user profile screen
 2014-08-26 13:11:53 +03:00
John O'Nolan
73439ace0e Fix up user profile screen 2014-08-26 13:11:38 +03:00
John O'Nolan
15b4791e54 Fix up user profile 2014-08-26 13:08:43 +03:00
Jason Williams
03d25ca502 Show warning dialog if session has ended in editor 
Closes #3839
- Display a warning modal in the editor routes if the user
  is logged out due to re-authorization problems.  This provides
  a chance to copy any unsaved content before being sent to the
  signin page to log back in.
 2014-08-25 19:45:26 +00:00
Matt Enlow
77a2d341aa Fix mobile settings menu transitions with new GUI 
Ref #3810
 2014-08-23 12:24:00 -06:00
Hannah Wolfe
62eed88d3b Merge pull request #3830 from wjake/issue-3813 
Fix editor markdown tab
 2014-08-21 20:09:18 +01:00
Hannah Wolfe
3992b1f3cf Merge pull request #3836 from jaswilli/ember17-prep 
Rework editor save button.
 2014-08-21 19:47:35 +01:00
Jake Wright
349fd649f8 Fix markdown/preview tab for mobile 
Fixes #3813

- Add togglePreview action to controller
- Implement action and bind attributes
- Remove the now pointless
- Update to comply with issue suggestions
 2014-08-21 17:13:30 +01:00
Nicola Mustone
1d0cb1603f fix username length 2014-08-21 10:07:11 +02:00
Nicola Mustone
a17d86c153 fix 3679 2014-08-21 09:59:34 +02:00
Hannah Wolfe
e7f451cbef Merge pull request #3820 from PaulAdamDavis/input-icons 
Icon wrapper around signing inputs
 2014-08-20 19:15:56 +01:00
Jason Williams
f59ad208ac Rework editor save button. 
Refs #3834
- Change bindings and fix a forward reference.  Preparation for
  upgrade to Ember 1.7.0.
 2014-08-20 13:36:25 +00:00
Hannah Wolfe
edc9f5e164 Merge pull request #3816 from felixrieseberg/iss3671 
'Autocorrect' for posts per page setting
 2014-08-20 13:44:29 +01:00
Matt Enlow
20f40e7e32 Change Ember function.property() to Ember.computed 
Closes #3417
 2014-08-19 10:01:17 -06:00
Paul Adam Davis
9c6ed3bf7b Icon wrapper around signing inputs 
No issue

References https://github.com/TryGhost/Ghost-UI/commit/379a630e1bc1

- Adds `<span class="input-icon icon-mail">` around signing inputs to help match markup used elsewhere
 2014-08-19 15:36:59 +01:00
Paul Adam Davis
7e55f9a393 Reimplement notification close button hit area size 
Essentially, this: 087868c1c9
 2014-08-19 15:31:18 +01:00
Paul Adam Davis
9208677e6c Prevent nav items from wrapping 2014-08-19 15:27:01 +01:00
Paul Adam Davis
8f225fe640 Refactor auth CSS 
This means signing screen icons now depend on new markup
 2014-08-19 15:25:24 +01:00
Felix Rieseberg
6710a1da89 Working CopyHTML shortcut 
closes #3481
- Pressing Ctrl/CMD+Shift+C in the editor will open up a modal that
contains the generated HTML for either the selected text or the whole
post
 2014-08-19 15:05:26 +01:00
Hannah Wolfe
6c96d00bcc Merge pull request #3767 from jaswilli/clear-ws-slug 2014-08-19 10:13:45 +01:00
Felix Rieseberg
acf8ffc1fb 'Autocorrect' for posts per page setting 
See #3671
- As @JohnONolan’s suggestion, if the user enters an invalid value for
the ‘posts per page’ setting, the number autocorrects to 5, iOS
autocorrect-style
 2014-08-18 23:24:59 -06:00
Jason Williams
c4fb17d2d7 Reset slug input text box after invalid input. 
No Issue
- When an invalid, all whitespace slug is entered into the
  slug input in the post settings menu, it's rejected but
  the input's value still remains the same.  This resets the
  input back to its original value.
- Added test for the above behavior.
- Only show success notification if slug was actually changed.
- Convert whitespace from tabs to spaces in post-settings-menu.hbs
 2014-08-18 21:10:57 +01:00
Hannah Wolfe
02ca955a00 Merge pull request #3766 from jaswilli/user-slug 
Correct behavior on updating user slug.
 2014-08-18 20:55:54 +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
Paul Adam Davis
c63c88c37f Move nav-item file, use variable colours instead of some hexes 2014-08-18 18:08:52 +01:00
Paul Adam Davis
bacb7dd93c New PSM markup, nav-item, and refactored input icons 
References #97, #98, #99
 2014-08-18 17:57:04 +01:00
Paul Adam Davis
cd9628cd45 Remove dist CSS files from gitignore 2014-08-18 13:28:06 +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
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
John O'Nolan
71350ff0a0 Settings nav overhaul 2014-08-16 19:39:52 +03:00
John O'Nolan
e74e7e1f37 Remove old button styles 2014-08-16 19:39:37 +03: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
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
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
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
Paul Adam Davis
e9a976c7a5 Fix images in buttons 2014-08-14 17:56:23 +01:00
Paul Adam Davis
48b83a9dc7 Re-implement old form styles 2014-08-14 16:29:34 +01:00
Paul Adam Davis
2c9f47d24b Badge component 2014-08-14 14:38:32 +01:00
Paul Adam Davis
6472d80474 Pagination component 2014-08-14 12:48:44 +01: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
Paul Adam Davis
60f1b47129 Allow buttons elements in dropdowns 2014-08-13 15:15:23 +01:00
Paul Adam Davis
147f1a836f Updated dropdown positions in layouts 2014-08-13 14:25:28 +01: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
Paul Adam Davis
ad26ed39b7 Implement labels 2014-08-12 15:27:22 +01:00
Paul Adam Davis
58e4d47e08 User list styles from master 2014-08-12 15:26:20 +01: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
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
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
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
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
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
Robert Jackson
4752fb77c9
Ensure PSM author is reset when changing posts. 2014-08-10 10:40:04 -04:00
John O'Nolan
85809a8b82 Fix wrong author slug on user settings page 2014-08-10 10:37:28 +03:00
John O'Nolan
a1ef78e7f9 OCD 2014-08-10 09:36:36 +03: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
78929cab1a Merge pull request #3705 from wjake/issue-3663 
Reset forgotten form on success
 2014-08-08 22:45:53 +01:00
Paul Adam Davis
67b9d393db Reimplement visual ascetic styles 2014-08-08 21:54:22 +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
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
Robert Jackson
1d360b3d18
Do not focus post title when editing. 2014-08-08 11:37:24 -04: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
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
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
John O'Nolan
333b39eef2 Reset buttons without classes 2014-08-07 16:37:47 +03:00
John O'Nolan
d3b3a2ed80 Fix floatingheader alignments 2014-08-07 16:35:58 +03: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
John O'Nolan
c8ebc66fc7 Improved mobile editor styles 2014-08-07 15:33:56 +03:00
John O'Nolan
c0d51817a9 Update application frame styles for content + editor 2014-08-07 15:11:01 +03: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
Matt Enlow
1f608cf5ab Add open class to popover buttons 
Ref#3603
- Popover Buttons now have an `open` class applied to them when their popover is open
- The open class is removed from the popover button at the start of the popover's fadeout
- Consolidated common code into popover-mixin
 2014-08-06 18:23:03 -06:00
Hannah Wolfe
4b83dfd6ab Merge pull request #3633 from halfdan/3630-revoke-user 
Fix revoke user invite and user.destroy
 2014-08-06 22:29:33 +01:00
John O'Nolan
7ade967733 Typography updates 2014-08-06 22:46:32 +03:00
John O'Nolan
b807b00002 Unfucking content management screen 2014-08-06 22:46:23 +03:00
Fabian Becker
9915fb1268 Fix revoke user invite and user.destroy 
fixes #3630
- Extend user adapter in ember to load users with status: all
- Fix user.destroy by loading all users with status: all
 2014-08-06 16:48:18 +00:00
John O'Nolan
304de7ad32 Put global nav back under modals 2014-08-06 19:47:52 +03:00
John O'Nolan
e2354e2fe2 unfuck settings nav 2014-08-06 19:46:43 +03:00
shindakun
adbd32c51d Transition to signin with error message on invalid token not 500 error screen 
closes #3548
- Add error to hidenav, removes menubar from error screen.
- Wrap atob() in a try/catch
- Added regex to try and validate if params.token at least looks like base64
 2014-08-06 08:08:02 -07:00
John O'Nolan
41ea0dac23 Convert old button override styles to new classes 
(and some cleanup)
 2014-08-06 14:36:35 +03:00
Robert Jackson
8d2b26daea Restore original display after window resizing. 
fixes #3597
 2014-08-06 09:04:43 +01:00
Hannah Wolfe
c4f74097f8 Merge pull request #3618 from jaswilli/issue-3612 
Check for server notifications on hard refresh
 2014-08-06 08:13:23 +01:00
Sebastian Gierlinger
b6fdcc268e Merge pull request #3614 from ErisDS/remove-apps 
No apps screen for 0.5
 2014-08-06 08:51:07 +02:00
Jason Williams
fb64de54f6 Check for server notifications on hard refresh 
Closes #3612
- Trigger the loadServerNotifications event from the
  ApplicationRoute's afterModel hook, which gets called
  every time the app gets loaded.
 2014-08-06 05:01:00 +00:00
Hannah Wolfe
9fb34d6b27 Merge pull request #3550 from halfdan/3542-forgotten-user 
Properly show message when resetting password.
 2014-08-06 02:18:30 +01:00
Jason Williams
a950e559e7 Cleanup from notifications refactor. 
Refs #3521
 2014-08-06 00:13:56 +00:00
Hannah Wolfe
6b747be1c1 No apps screen for 0.5 
no issue

- The apps screen is nowhere near ready for prime time yet, lets not have
  it in 0.5 at all
 2014-08-06 00:54:57 +01:00
John O'Nolan
73454b86d6 Styles for splitbuttons on editor screen 2014-08-06 02:06:36 +03:00
Fabian Becker
a2d5105bcc Changing User.read API to default to active users. 
refs #3542
- Properly handle forgotten screen (ember)
- Change Users API to only return active users on read
- Adjust tests
 2014-08-06 00:30:48 +02:00
John O'Nolan
201e827768 Button updates to match existing styles 2014-08-06 00:39:19 +03:00
Paul Adam Davis
6615f7aad3 Swap notification close link for a button 
No issue

- Swap out notification <a> close link for <button> (gains a native hover state)
 2014-08-05 20:08:03 +01:00
Paul Adam Davis
cd561b3d97 Re-do of dropdowns 2014-08-05 20:06:22 +01:00
Hannah Wolfe
a2ceffc199 Merge pull request #3590 from felixrieseberg/iss3518 
Ghost Logo navigation responds correctly to mobile
 2014-08-05 19:08:30 +01:00
Felix Rieseberg
e2348e6802 Ghost Logo navigation responds correctly to mobile 
closes #3522
- Previously, the logo had a href attribute which was manually kept
from executing on mobile. Slow mobile devices that didn’t fully load
the JS would therefore navigate “desktop style”
- The href attribute is now set after the event handler has been loaded, ensuring correct navigation behaviour.
 2014-08-05 10:05:32 -07:00
Paul Adam Davis
96f01e0c23 Form Inputs 2014-08-05 15:12:27 +01:00
Sebastian Gierlinger
aec440bbd0 Fix embedded code being removed 
no issue
- changed order of escaping
 2014-08-05 14:11:20 +02:00
Hannah Wolfe
954fde1cd2 Cleaning up old html files 2014-08-05 12:02:58 +01:00
Hannah Wolfe
1b8c8c27c1 Merge pull request #3593 from morficus/issue-3563 
prevent revoking invite for already active users
 2014-08-05 11:57:16 +01:00
John O'Nolan
db7677bfca Reduce indentation for readability 2014-08-05 12:23:51 +03:00
Sebastian Gierlinger
0a3b070ed1 Merge pull request #3587 from PaulAdamDavis/settings-header-classes 
Add classes to settings headers
 2014-08-05 09:46:21 +02:00
Maurice Williams
18a1be8850 prevent revoking invite for already active users 
closes #3563
- before attempting to revoke an invitation, get updated model info
- reload route and show warning if user info has changed
 2014-08-05 00:35:46 -04:00
Felix Rieseberg
6645f7c65a Working delete user modal & button 
closes #3529
- Created ‘delete user’ modal (similar to the ‘delete post’ modal) and
controller
-  Modal will be opened if ‘Delete User’ is selected in the user
setting cog menu
 2014-08-04 13:29:24 -07:00
John O'Nolan
d4861e41d7 Highlight old styles for removal 2014-08-04 19:45:32 +03:00
John O'Nolan
26838f8e4e Clean up conflicting class 2014-08-04 19:43:47 +03:00
John O'Nolan
c56ea041d3 Strip base button style. This should be covered already. 2014-08-04 19:38:41 +03:00
John O'Nolan
4b6e3dae48 Remove old button styles which are not used anywhere in core 2014-08-04 19:37:04 +03:00
John O'Nolan
0f320c115e Break splitbuttons out into component 2014-08-04 19:28:07 +03:00
John O'Nolan
0a403dfd8b Adjust BS default styles 2014-08-04 19:24:41 +03:00
John O'Nolan
df3b3e753e Port/convert BS mixins/vars - strip unneeded variations 2014-08-04 18:57:33 +03:00
John O'Nolan
726294bd41 Add base bootstrap buttons 2014-08-04 18:11:22 +03:00
Paul Adam Davis
4948994cca Add classes to settings headers 
No issue

Refs https://github.com/TryGhost/Ghost-UI/issues/91

- Adds a class to settings page headers, for cleaner CSS selectors
 2014-08-04 12:53:55 +01:00
Sebastian Gierlinger
89389b3673 Merge pull request #3569 from morficus/issue-3549 
fix most recent post stolen by the last logged in user AND only show active users in post-settings-menu drop-down
 2014-08-04 10:51:07 +02:00
Sebastian Gierlinger
c3e7b48a6d Merge pull request #3581 from felixrieseberg/iss3541 
Autofocus on input fields after routing
 2014-08-03 22:22:48 +02:00
Hannah Wolfe
ac4c3a1d62 Merge pull request #3500 from novaugust/markdown-help 
Update markdown help modal
 2014-08-03 18:05:12 +01:00
Hannah Wolfe
e12f8bb624 Merge pull request #3567 from novaugust/issue#3564 
Return to invite new user; invite multiple users in one go
 2014-08-03 17:54:59 +01:00
Matt Enlow
07cd654ab9 Return to invite new user; invite multiple users in one go 
Closes #3533, Closes #3547, Closes #3531
- invite-new-user always resets role to author now, allowing for multiple invites on one load
- Added confirm action when hitting return in INUModal's email input
- Don't pass users as the model to invite-new-user-modal
- Move invite-new-user reset to a `finally` clause
- invite-new-user always closes on a confirm
 2014-08-03 10:31:42 -06:00
Hannah Wolfe
0d5e199632 Merge pull request #3580 from felixrieseberg/iss3543 
Insert inline code shortcut for editor
 2014-08-03 17:28:39 +01:00
Hannah Wolfe
27710e88d2 Merge pull request #3578 from morficus/issue-3516 
Stop event propagation when hitting "enter" in the gh-blur-input component
 2014-08-03 17:25:29 +01:00
Hannah Wolfe
a1dad7b59d Merge pull request #3576 from morficus/issue-3523 
Error modifying "author" attribute before post record has been created
 2014-08-03 17:24:09 +01:00
Matt Enlow
0c2ad482fa Update markdown help modal 
Closes #3499
- Swapped out "Cmd" for the symbol. We're all UTF8, right?
- Removed hint for "Inline Code" until we readd its shortcut
 2014-08-03 10:24:00 -06:00
Hannah Wolfe
8337762b3d Merge pull request #3579 from morficus/issue-3502 
Replacing "touchstart" with "tap" event, provided by hammer.js
 2014-08-03 17:23:30 +01:00
Hannah Wolfe
7b380b706b Merge pull request #3535 from rwjblue/properly-transition-on-mobile 
Handle toggleing the content screen on mobile.
 2014-08-03 17:23:25 +01:00
Hannah Wolfe
7b7573816a Merge pull request #3571 from felixrieseberg/iss3570 
Show "Make Owner" only if displayed user is admin
 2014-08-03 17:20:54 +01:00
Felix Rieseberg
be683e3d4b Autofocus on input fields after routing 
closes #3538, closes #3541
- The “autofocus” property isn’t considered by browsers if the element
is created after the page has been loaded. The Ember cookbook
recommends extending the input type with a manually triggered
autofocus, which I included here.
- This introduces the new helper “gh-focus-input”, an input field
gaining focus even when routing occurs.
 2014-08-03 09:16:13 -07:00
Hannah Wolfe
a8f6b31731 Merge pull request #3574 from rwjblue/speed-up-posts-orderby 
Small performance tweak for Posts ordering.
 2014-08-03 15:05:02 +01:00
Felix Rieseberg
ec188c66d8 Insert inline code shortcut for editor 
closes #3543
- Wired up existing code shortcut in codemirror-shortcuts.js in
editor-shortcuts.js
 2014-08-02 23:40:12 -07:00
Maurice Williams
da279de71b Replacing "touch start" with "tap" event, provided by hammer.js 
fixes #3502
 2014-08-03 01:36:46 -04:00
Maurice Williams
cb9f4f7c05 Stop event propagation when hitting "enter" in the gh-blur-input component 
fixes #3516
- new behavior is disabled by default
- added new stopEnterKeyDownPropagation property enable new behavior
 2014-08-03 00:48:05 -04:00
Maurice Williams
e8f6bcd176 fix most recent post stolen by the last logged in user AND only show active users in post-settings-menu drop-down 
fixes #3549 fixes #3528
- instead of grabbing and setting the author after fetching the list of users, get the author info from the models "author" property and set it when that value returns. (3549)
- added filter to the PSM's "authors" attribute to only display active users (3528)
 2014-08-02 21:28:02 -04:00
Maurice Williams
4b5aab8306 Error modifying "author" attribute before post record has been created 
fixes #3523
- when changing the author, added a check to NOT trigger a save if the post has not been created/saved as yet
 2014-08-02 14:35:19 -04:00
Robert Jackson
3bd938a7eb
Small performance tweak for Posts ordering. 
* Move publishedAtCompare to standalone function in closure scope
  (allows better browser optimizations).
* Avoid getting the same field (published_at) more than once.
 2014-08-02 11:15:55 -04:00
Robert Jackson
ae56c8a8e2
Ensure keyboard navigation matches custom post sorting. 2014-08-02 10:39:26 -04:00
Felix Rieseberg
2f3520a675 Show "Make Owner" only if displayed user is admin 
closes #3570
- Added ‘controller.user.isAdmin’ as an condition for displaying the
“make owner” option
 2014-08-02 07:02:50 -07:00
Sebastian Gierlinger
8b954efbdb Merge pull request #3521 from jaswilli/notifications 
Prevent stacking of notifications
 2014-08-02 12:54:56 +02:00
Felix Rieseberg
4c79770580 Admin isn't shown "make owner" option 
closes #3558
- Replaced canAssignRoles as "show user" conditional with new
"canMakeOwner"
 2014-08-01 13:03:26 -07:00
Jason Williams
dd50cca97a Refactor notifications to prevent stacking. 
Closes #3511, Closes #3512, Closes #3526
- show* methods now close existing passive notifications by
  default.  They also now take an optional options object where
  existing parameters such as "delayed" and "defaultErrorText"
  can be passed in as well as the new "doNotClosePassive" flag.
- Removed all explicit calls to notifications.closePassive except
  for the few places where it makes sense to call it separately.
 2014-08-01 16:57:29 +00:00
Jason Williams
41493e1ccc Add missing model to template render. 
Closes #3530, Refs #3474
- Cleanup from #3474 which stopped passing the model into
  the render template call.
 2014-08-01 16:29:59 +00:00
Sebastian Gierlinger
42c5a32966 Merge pull request #3551 from halfdan/3540-password-reset 
Proper messaging on password reset
 2014-08-01 15:47:38 +02:00
Fabian Becker
45f2e956d0 Proper messaging on password reset 
fixes #3540
- Show proper message when reusing token
- Show message after resetting password
 2014-08-01 13:18:53 +00:00