TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-07 11:30:55 +03:00
Code Issues Projects Releases Wiki Activity
3,566 Commits 252 Branches 1,686 Tags 339 MiB
7936fc7d12
Commit Graph

3566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hannah Wolfe
d4888afddd Merge pull request #3914 from halfdan/3864-db-config 
Add alternative names for pg
 2014-09-02 16:28:08 +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
Fabian Becker
33a6b3d6a6 Add alternative names for pg 
refs #3864
- map alternative valid pg names to pg
 2014-09-01 21:29:12 +00:00
Hannah Wolfe
17f5ce6a2c Merge pull request #3888 from felixrieseberg/iss3884-content 
Return leading image for {{content words="0"}}
 2014-09-01 20: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
Hannah Wolfe
245d859699 Merge pull request #3906 from halfdan/patch-1 
Fix regex from #3898
 2014-09-01 15:34:42 +01:00
Fabian Becker
5ab8c661ec Fix regex from #3898 
refs #3898
 2014-09-01 15:39:53 +02:00
Sebastian Gierlinger
57b5f4da00 Merge pull request #3841 from halfdan/3619-configuration-api 
Implements new Configuration API
 2014-09-01 15:15:05 +02:00
Sebastian Gierlinger
6ea7ab3294 Merge pull request #3898 from halfdan/fix-uncap-api 
Restrict uncapitalise middleware for API
 2014-09-01 15:00:58 +02:00
Fabian Becker
a0b7941439 Restrict uncapitalise middleware for API 
no ref
- Do not lowercase anything after /api/v0.1/<resource>/ to protect :key/:slug
 2014-09-01 12:38:06 +00:00
John O'Nolan
92377321b2 Merge pull request #3905 from PaulAdamDavis/fix-extends 
Fix notification styles
 2014-09-01 09:36:48 +02:00
Fabian Becker
688b3914e4 Implements new Configuration API 
closes #3619
- adds new permissions for configuration API
- adds integration tests
- adds configuration API for reading allowed values
 2014-08-31 20:54:17 +00: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
19465af6cf Merge pull request #3901 from TryGhost/master-with-ui 
Merge Ghost-UI Back into Ghost
 2014-08-31 14:33:40 +01: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
584d4ce60f Merge pull request #2098 from hswolff/remove-file-shims 
Remove shim files that were created to address #1873
 2014-08-30 14:04:26 +01:00
Harry Wolff
4951f267f9 Remove shim files that were created to address #1873. 
refs #1873

- Removes all shim files.
 2014-08-29 17:39:54 -04:00
Hannah Wolfe
1ed286d09e Merge pull request #3866 from hswolff/config-updates 
Move config module to be instance based and merge bootstrap into config.
 2014-08-29 21:35:56 +01:00
Hannah Wolfe
589da7deee Merge pull request #3891 from jaswilli/import-tests 
Run import run operations in order.
 2014-08-28 18:43:53 +01:00
Felix Rieseberg
1b203dc42a Return leading image for {{content words="0"}} 
Closes #3884
- This PR includes a reimplementation of Downsize@0.0.5 with `words: "0"`. It uses the same parsing methods, therefore guarunteeing identical behavior.
- Tests have been updated to be more extensive.
 2014-08-28 09:51:00 -07:00
Jason Williams
35e2387541 Run import run operations in order. 
Closes #1977, Refs #3473
- Ensure that import operations are run in sequence.
  Previously the operations were started in order but subsequent
  ops were allowed to begin before the previous finished, which would
  result in out-of-order execution.
- Fix bug in attach() where a model property was being passed in
  instead of a transaction object.  If the call was made when a
  transaction was in process, it could cause bookshelf/knex to
  hang and never finish the transaction.
 2014-08-28 00:21:13 +00:00
Sebastian Gierlinger
efddc98f53 Merge pull request #3887 from ErisDS/oops 
Uncapitalise middleware should not affect tokens
 2014-08-27 09:26:26 +02:00
Hannah Wolfe
25ad4b39fd Uncapitalise middleware should not affect tokens 
no issue

- Whilst testing on next, I noticed trying to signup didn't prepopulate email addresses any more, and this is why
 2014-08-26 22:30:33 +01:00
Hannah Wolfe
3fec767df7 Upgrading Casper to 1.0.1 2014-08-26 21:14:42 +01:00
Hannah Wolfe
93e4cfdadf Merge pull request #3855 from felixrieseberg/iss3844-importer 
Importer: Sanitize UUIDs
 2014-08-26 16:51:49 +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
Hannah Wolfe
5e126dfcd9 Fixing settings tests 2014-08-26 12:18:00 +01:00
Sebastian Gierlinger
42d6cc3983 Merge pull request #3859 from ErisDS/issue-1299 
Update editor markdown tests
 2014-08-26 12:21:36 +02:00
Sebastian Gierlinger
cab8254539 Merge pull request #3860 from ErisDS/issue-3857 
Redirect uppercase routes to lowercase version
 2014-08-26 12:19:52 +02:00
Sebastian Gierlinger
bb9eee9b4c Merge pull request #3865 from ErisDS/issue-3750 
Delete tokens before deleting a user
 2014-08-26 12:16:49 +02: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
Hannah Wolfe
65d56b07bc Merge pull request #3873 from jaswilli/issue-3839 
Show warning dialog if session has ended in editor
 2014-08-25 21:04:37 +01: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
Hannah Wolfe
5856cdd67e Merge pull request #3861 from cobbspur/metas 
Added correct contextual Meta Titles and Descriptions
 2014-08-24 18:58:23 +01:00
Hannah Wolfe
48ef6d26e5 Merge pull request #3863 from jaswilli/issue-3856 
Adjust setup and teardown of route tests.
 2014-08-24 18:33:28 +01:00
Hannah Wolfe
62df6fb415 Merge pull request #3862 from novaugust/settings-menu-gui-update 
Fix mobile settings menu transitions with new GUI
 2014-08-24 18:32:03 +01:00
Felix Rieseberg
6fe93f6a50 Importer: Sanitize UUIDs 
Closes #3844
- Before importing, all data is checked for incorrect UUIDs. If check
fails, data is sanitized and outfitted with correct UUIDS.
- Scaffolding allows for easy implementation of additional
sanitization, should that be required in the future.
- Test included, old tests updated.
 2014-08-23 18:02:23 -07:00
Jason Williams
c02240dd5f Adjust setup and teardown of route tests. 
Closes #3856
- No longer call clearData and initData in test setup because
  migration.init is run during Ghost startup.  The unhandled
  error was a result of clearData removing all the tables while
  Ghost was running--there was a timing issue with the oauth middleware
  checking the refreshtokens table when it had just been deleted.
 2014-08-23 21:22:01 +00:00
Harry Wolff
583c7970d9 Move config module to be instance based and merge bootstrap into config. 
helps with #827, otherwise no issue

- This is general code clean-up and unification.
- Merges code from bootstrap.js into config module as they were both
concerned with managing the config file and as such should be in one
location.
- Updates all relevant tests.
 2014-08-23 15:54:43 -04:00
Hannah Wolfe
74c6a341be Delete tokens before deleting a user 
fixes #3750

- Updated tests to create tokens for one user. This caused the tests to
  fail for MySQL exposing the bug.
- Delete user's tokens along with posts
 2014-08-23 20:13:17 +01:00
Matt Enlow
77a2d341aa Fix mobile settings menu transitions with new GUI 
Ref #3810
 2014-08-23 12:24:00 -06:00
Hannah Wolfe
0005c1b88c Merge pull request #3826 from jaswilli/bluebird 
Replace when with bluebird
 2014-08-23 18:55:13 +01:00
Jason Williams
07ad400ee0 Replace the when promise library with bluebird. 
Closes #968
 2014-08-23 17:15:40 +00:00
Hannah Wolfe
6a52fc8ace Redirect uppercase routes to lowercase version 
fixes #3857

- adds uncapitalise middleware which detects uppercase in req.path and
  redirects to the lowercase equivalent
- change the ghost route to a regex, just so it's consistent with other
  routes in the file
 2014-08-23 17:59:58 +01:00