OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,713 Commits 179 Branches 1,654 Tags 486 MiB
a3093b9b42
Commit Graph

3713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannah Wolfe
a3093b9b42 Merge pull request #4075 from jaswilli/morgan 
Adjust morgan call to avoid deprecation warning
 2014-09-19 20:39:05 +01:00
Paul Davis
67c4452787 Merge pull request #4076 from halfdan/4072-404page 
Fix ghost-ui reference
 2014-09-19 19:55:20 +01:00
Fabian Becker
3e6d11e8fa Fix ghost-ui reference 
fixes #4072
- Correct reference to ghost.min.css
 2014-09-19 18:31:21 +00:00
Jason Williams
2ac409a025 Merge pull request #4071 from TryGhost/revert-4022-master 
Revert "update CodeMirror 4.5.0"
 2014-09-19 11:56:39 -05:00
Hannah Wolfe
69ea28e951 Merge pull request #4042 from novaugust/psm2-tabs 
Add Tab components
 2014-09-19 17:33:57 +01:00
Jason Williams
12957b1918 Adjust morgan call to avoid deprecation warning 
No Issue
- Change the invocation of the morgan logging package to
  conform to the new function signature introduced in
  morgan 1.2.0.
 2014-09-19 16:31:22 +00:00
Hannah Wolfe
5cdb6510ae Merge pull request #4065 from jaswilli/transition 
Prevent transition to signup on invalid invitation
 2014-09-19 17:17:13 +01:00
Matt Enlow
3cfda5f989 Merge pull request #4070 from ErisDS/grunt-lint 
Adds grunt lint task for code style checking
 2014-09-19 10:13:43 -06:00
Matt Enlow
7ef34382f2 Merge pull request #4063 from ErisDS/issue-2703 
GhostGFM honours escaped tildes
 2014-09-19 10:04:50 -06:00
Hannah Wolfe
0d99d538e2 Revert "update CodeMirror 4.5.0" 2014-09-19 16:55:34 +01:00
Hannah Wolfe
cb9d9b748a Merge pull request #4062 from halfdan/4059-skip-not-found 
Ignore unknown setting keys on import
 2014-09-19 16:54:35 +01:00
Hannah Wolfe
5621add6c6 Merge pull request #4040 from halfdan/4036-update-check 
Delay updateCheck to +24h on error
 2014-09-19 16:30:51 +01:00
John O'Nolan
326e611c9c Merge pull request #4048 from novaugust/delete-post-shortcut 
[Feature request] Add delete post shortcut to content screen
 2014-09-19 17:22:42 +02:00
Fabian Becker
0efb449103 Delay updateCheck to +24h on error 
fixes #4036
- delay update check by 24h when an error happens
- set connection timeout to 10 seconds
 2014-09-19 17:10:30 +02:00
Hannah Wolfe
94feb8616a Adds grunt lint task for code style checking 
no issue

- convenience function runs both jshint and jscs
 2014-09-19 15:52:48 +01:00
Hannah Wolfe
28cf0a68d3 Merge pull request #4056 from halfdan/1961-wuaeh 
Have /ghost use its own express instance
 2014-09-19 15:00:03 +01:00
Hannah Wolfe
9ca6f08976 Merge pull request #4045 from halfdan/4031-mobile-content 
Mobile view menu for content screen
 2014-09-19 14:10:46 +01:00
Fabian Becker
9394fad6aa Have /ghost use its own express instance 
closes #1961
- Refactor admin to use its own express instance
- Refactor middlewares to work with /ghost mounted admin express instance
 2014-09-19 08:57:13 +00:00
Hannah Wolfe
8841be8ec8 GhostGFM honours escaped tildes 
fixes #2703

- adds an extra rule to remove the slash if a tilde is escaped as showdown
  won't do this.
 2014-09-19 09:16:33 +01:00
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
a4de40abc6 Merge pull request #3976 from halfdan/1889-generate-slug 
Cleanup reserved words in generateSlug
 2014-09-18 18:54:48 -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
4669b9c7fe Merge pull request #4060 from halfdan/4058-no-posts 
Properly handle no posts
 2014-09-18 18:43:19 -06:00
Matt Enlow
a5f4fca7b2 Merge pull request #3992 from halfdan/favicon 
Let Ghost serve favicon instead of using dependency
 2014-09-18 18:40: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
Matt Enlow
5021ac8b08 Merge pull request #4061 from ErisDS/issue-3795 
Updating express to 4.9.2 & related packages
 2014-09-18 08:35:21 -06:00
Fabian Becker
12f117cfbe Properly handle no posts 
fixes #4058
- Set noPosts in setupController
 2014-09-18 16:29:03 +02:00
Fabian Becker
4cc1f509ac Ignore unknown setting keys on import 
fixes #4059
- Ignore NotFound setting keys
 2014-09-18 12:48:18 +00:00
Fabian Becker
c9b0df752f Cleanup reserved words in generateSlug 
closes #1889
- Adds a new filter for slugs
- Move slugs to config.slugs
 2014-09-18 13:56:51 +02:00
Fabian Becker
f2fcb5b62b Let Ghost serve favicon instead of using dependency 
no ref
- Remove static-favicon dependency
- Refactor robots.txt middleware to also serve favicon
- Add ETag
 2014-09-18 13:51:41 +02:00
Hannah Wolfe
aad595de7d Updating express to 4.9.2 & related packages 
ref #3795

- express updated to 4.9.2
- express 4.9.0 introduced res.sendStatus() to replace res.status().end()
- we no longer need express-session, connect or cookie-parser
- body-parser, busboy, compression, express-hbs, morgan, all bumped to
  latest versions as well - there doesn't seem to be any breaking changes
 2014-09-18 11:50:28 +01:00
Hannah Wolfe
c38c0cdfe1 Merge pull request #4001 from hswolff/jscs 
Add jscs task to grunt file and clean up files to adhere to jscs rules
 2014-09-18 11:48:05 +01: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
Jason Williams
781f2b9328 Merge pull request #4039 from misterdjules/output-tests-results-to-files 
Add option to specify reporter and output file via grunt.
 2014-09-17 19:35:14 -05:00
Julien Gilli
454abc51ce Support --reporter and --reporter-output when running tests. 
When running any Grunt task that runs tests with Mocha, the two
following command line options are now supported:
- --reporter: allows to specify a reporter, default is 'spec'.
- --reporter-output: allows to specify a file where Mocha's output will
  be stored.

These two command line options make it easier to retrieve and parse test
results when tests are run on a continuous integration platform like
Jenkins.

Fixes #4038.
 2014-09-17 15:46:39 -07:00
Matt Enlow
692a82cb8f Merge pull request #4054 from ErisDS/dev-deps 
Updating dev dependencies
 2014-09-17 13:05:07 -06:00
Hannah Wolfe
62efa05798 Updating dev dependencies 
refs #3795

- updates all dev dependencies to their latest version number
- jshint now complains about the Promise global, removed it from predef in
  lieu of a better solution
- changes in should require minor updates to the tests
- tests are passing and all major grunt commands appear to work: clean,
  init, prod, validate and release
 2014-09-17 16:44:30 +01: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
f37af86a23 Merge pull request #3894 from hswolff/image-path-update 
Updates image upload directories to be number based.
 2014-09-16 19:00:35 +01:00
Hannah Wolfe
411e8dc44f Merge pull request #4044 from novaugust/issue4032 
Abstract mobile transition interactions
 2014-09-16 18:34:23 +01:00
Harry Wolff
457f360765 Updates image upload directories to be number based. 
resolves #2285

- Moves to using moment.format('MM') to use the date formatting of a month
 2014-09-16 13:23:29 -04: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
Hannah Wolfe
6054086feb Fix lint error in tests 2014-09-15 22:00:08 +01:00