Commit Graph

1784 Commits

Author SHA1 Message Date
Hannah Wolfe
aec94f2ad1 Merge pull request #1748 from ErisDS/asset-stuff
jQuery link and min map 404 fixes
2013-12-24 03:34:25 -08:00
Hannah Wolfe
1d0ba6e44d Merge pull request #1742 from haswalt/master 2013-12-24 11:23:52 +00:00
Harry Walter
7b390e73e6 Correctly order posts in admin and frontend
issue #1303
2013-12-24 11:18:32 +00:00
Hannah Wolfe
38e781c8da jQuery link and min map 404 fixes
fixes #1652

- removes the min map thing which doesn't work properly #551, #766, #1479
2013-12-23 21:43:13 +00:00
Hannah Wolfe
2175310b1c Merge pull request #1738 from mjbshaw/user-error.hbs-favicon
Link to the favicon using the asset helper
2013-12-23 13:42:43 -08:00
Michael Bradshaw
3bf28cb354 Link to the favicon using the asset helper 2013-12-22 09:35:45 -07:00
Hannah Wolfe
94ce669d37 Merge pull request #1733 from mjbshaw/update-config-example
Subdirs are now supported, don't say they aren't
2013-12-22 07:47:23 -08:00
Hannah Wolfe
bc29b14cde Merge pull request #1728 from mjbshaw/clean-admin-regex
Don't use unnecessary (and unescaped) regex
2013-12-22 07:46:31 -08:00
Michael Bradshaw
247cc81b9c Subdirs are now supported, don't say they aren't 2013-12-21 16:51:14 -07:00
Michael Bradshaw
7ee3235a68 Don't use unnecessary (and unescaped) regex
closes #1731
2013-12-21 16:32:57 -07:00
Hannah Wolfe
1018e9ab79 Merge pull request #1732 from ErisDS/fix-1730
Date helper fix, moment breaks with null values
2013-12-21 15:16:19 -08:00
Hannah Wolfe
f0b0291007 Merge pull request #1729 from mjbshaw/escape-regex
Escape URL for use in regex
2013-12-21 15:15:55 -08:00
Hannah Wolfe
a0424a733d Date helper fix, moment breaks with null values
fixes #1730
2013-12-21 21:43:38 +00:00
Michael Bradshaw
a785696115 Escape URL for use in regex 2013-12-21 14:19:23 -07:00
Hannah Wolfe
e9e99371a6 Merge pull request #1719 from ErisDS/fix-1718
Fix unhandled errors in mail.js
2013-12-21 12:51:35 -08:00
Hannah Wolfe
bdbeffb262 Merge pull request #1716 from ErisDS/post-order
API refactor / cleanup
2013-12-21 12:46:57 -08:00
Hannah Wolfe
545f426c37 Merge pull request #1704 from ErisDS/featured-star
Markup & style fixes for post list statuses
2013-12-21 12:37:39 -08:00
Hannah Wolfe
b80054c4e4 Merge pull request #1714 from sebgie/issue#1680 2013-12-21 20:18:35 +00:00
Sebastian Gierlinger
17225d4928 Set cookie secure flag
closes #1680
- added secure flag for cookies if SSL is forced
2013-12-21 20:18:13 +00:00
Hannah Wolfe
4e37443ae9 Merge pull request #1726 from halfdan/527-utils 2013-12-21 19:49:26 +00:00
Fabian Becker
c81c43a96a Complete subdir support.
fixes #527
- Fix image upload in backend
- Use config.paths().webroot where necessary
2013-12-21 19:43:58 +00:00
Hannah Wolfe
9ec7e4ea38 Merge pull request #1615 from gotdibbs/Issue1227
Switch from multipart to busboy
2013-12-21 10:25:05 -08:00
Hannah Wolfe
b6d70cee31 Merge pull request #1717 from omeid/master
Package.json: Incorrect node version fix.
2013-12-20 07:31:08 -08:00
Hannah Wolfe
b8d6d7d526 Merge pull request #1707 from jondavidjohn/contrib-edit
Simplify "Working on Core" setup instructions
2013-12-20 07:24:51 -08:00
Hannah Wolfe
52ab9fc93d Merge pull request #1653 from AgtLucas/master
Fix typo?
2013-12-20 07:24:37 -08:00
Hannah Wolfe
78737b35ff API refactor / cleanup
closes #1303

- removed where and orderBy from being passed from the API through to bookshelf, and ultimately knex
- ordering is now consistent across both front and backend, which fixes #1303
- validated / cleaned up all the API parameters
- added API tests for the status and staticPages parameters
2013-12-20 13:07:01 +00:00
Hannah Wolfe
3863f09c5c Fix unhandled errors in mail.js
fixes #1718

- check for existence of mail before using properties
- return the promise properly
2013-12-20 12:57:21 +00:00
Hannah Wolfe
c518e14bfb Merge pull request #1687 from sebgie/issue#1685
Fix 'dbHash' not found
2013-12-20 04:36:44 -08:00
Hannah Wolfe
05c603ee2c Markup & style fixes for post list statuses
fixes #1703, fixes #1712

- featured star appears immediately for both draft and published items
- featured star is never red & alignment /style is updated
- improved markup and styling of statuses in general
- added to feature tests
2013-12-20 12:29:47 +00:00
omeid
1a794733d2 Package.json: Incorrect node version fix. 2013-12-20 15:17:18 +11:00
Hannah Wolfe
72420d2aa0 Merge pull request #1713 from JohnONolan/ghost-png 2013-12-19 15:25:47 +00:00
John O'Nolan
fd2a2ad037 Update Ghost logo image fixture 2013-12-19 15:21:26 +00:00
Hannah Wolfe
9c96ec1990 Merge pull request #1677 from nickpfisterer/default-fixture-update
Update default fixture to give clearer direction
2013-12-19 07:07:46 -08:00
Jonathan Johnson
ead47275fd Simplify "Working on Core" setup instructions 2013-12-18 10:13:50 -07:00
Hannah Wolfe
574218130a Merge pull request #1695 from sebgie/gravatar-ssl
Remove fixed scheme from gravatar url
2013-12-18 03:45:48 -08:00
William Dibbern
bf7692b151 Switch from multipart to busboy
Fixes #1227

- Removed deprecated `multipart` references.
- Setup `busboy` to pass along file streams and do a naive parse of form
values.
- Updated logic in file storage and db import to handle file streams
instead of the temporary files created by `multipart`.
2013-12-17 17:24:30 -06:00
Sebastian Gierlinger
05ca5edeeb Remove fixed scheme from gravatar url
no issue
- removed scheme from gravatar url

Reason:
Gravatar supports ssl and the fixed scheme will cause ‚insecure
content‘ warnings.
2013-12-17 17:21:00 +01:00
Nick Pfisterer
f7e63eecaa Update default fixture to give better direction
closes #1561
- altered perspective of intro paragraph to reading from the blog
instead of from the content page
- added copy directing users to sign in to the admin area at /ghost/ and
edit the post before reading the 'Getting Started' section
- this should give the Markdown lessons better context and avoid users
getting confused as to what 'the left hand panel of Ghost' is
2013-12-16 18:18:35 -08:00
Sebastian Gierlinger
7ae543289d Fix 'dbHash' not found
closes #1685
- changed dbHash initialization from db direct access to api access
- added dbHash to default-settings.json
- added dbHash to tests
2013-12-16 11:16:06 +01:00
Hannah Wolfe
96f246533b CasperJS waitForOpaque fails more gracefully 2013-12-15 18:30:15 +00:00
Hannah Wolfe
1c52e3a980 Merge pull request #1636 from hswolff/standardize-path-access
Standardize file path access throughout ghost
2013-12-15 06:42:34 -08:00
Hannah Wolfe
088dac6099 Merge pull request #1675 from sebgie/issue#1640
Improve Helpers
2013-12-15 03:41:03 -08:00
Hannah Wolfe
db362b30cd Bug fixes, undefined should not be a string 2013-12-15 11:36:01 +00:00
Hannah Wolfe
d4c1babe3c Merge pull request #1542 from pmgarman/ssl 2013-12-15 10:52:23 +00:00
Patrick Garman
a914077145 Add Force SSL Configuration/Middleware
Solves #1300
- Adds forceAdminSSL bool config value
- Adds checkSSL middleware
- Adds redirectSSL helper function
2013-12-15 10:01:02 +00:00
Sebastian Gierlinger
05810b318c Improve Helpers
closes #1640
closes #1672
- changed to include config using require
- deleted has_tag helper
- deleted json helper
- removed fileStorage and ghostScriptTags helpers from frontend
- added fileStorage and url helper to admin
2013-12-14 17:28:54 +01:00
Hannah Wolfe
9715e66ba9 Merge pull request #1674 from ErisDS/css-fixes
CSS and layout fixes for image uploader
2013-12-14 08:11:18 -08:00
Hannah Wolfe
d7b5144775 CSS and layout fixes for image uploader
closes #1673
- dropzone icon doesn't appear when filestorage is false
- proper cursor and no selection on icon
- cleaned up some sass
2013-12-14 15:55:44 +00:00
Hannah Wolfe
51b9f8972b Merge pull request #1662 from PaulAdamDavis/master
Fixed admin 404 page broken image refrence
2013-12-13 15:11:44 -08:00
Hannah Wolfe
409cc34c1d Merge pull request #1651 from hswolff/issue-1645
Update config.theme() after every settings edit
2013-12-13 15:05:18 -08:00