TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity
1,944 Commits 226 Branches 1,677 Tags 368 MiB
6deb7616cf
Commit Graph

1377 Commits

Author SHA1 Message Date
Patrick Garman
0ffd045fc7 Add Post Tags to RSS Feed 
Issue #1722
 2013-12-24 10:45:24 -06:00
Matt Hughes
56e9c70547 Improved comma tag completion on international keyboard layouts 
Reported in issue #1475
- `String.localeCompare` can be more reliable for keys that do not relate to cursor movement
- Adds a third key handler (`keypress`) that contains the character code rather than physical key
- `COMMA` key constant no longer required (unless `,` char should be a constant?)
 2013-12-24 10:38:05 -05:00
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
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
Michael Bradshaw
3bf28cb354 Link to the favicon using the asset helper 2013-12-22 09:35:45 -07: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
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
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
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
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
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
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
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
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
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
Harry Wolff
9090764052 Standardize file path access throughout ghost 
resolves #1390

update all string based references to file paths
to use the ./core/server/config/paths file
so that it is the single source of truth
 2013-12-12 21:27:07 -05:00
Hannah Wolfe
968176c7d7 Merge pull request #1606 from Gotvitch/issue1203 
Bug fixes for partial views
 2013-12-12 14:36:47 -08:00
Paul Adam Davis
c1b1b7ace9 Fixed admin 404 page broken image refrence 2013-12-12 21:21:58 +00:00
Seb Gotvitch
fef9b4be25 Bug fixes for partial views 
closes #1203
- Update express-hbs module to the new version (0.5.2)
- Use two instance of hbs one for the theme and an other for the admin
- Template helpers are register as partial view
- Partial views of the theme are reload when the theme changed

Remove clear partial cache in handlebars

This code will be move in `express-hbs`.
This doesn't cause a problem to remove this line but it is not clean.

Remove unused hbs instance

Resolve conflict
 2013-12-12 12:11:02 -05:00
Sebastian Gierlinger
acce957f7e Change message when unsupported node version is used 
no issue
- changed ‚the latest‘ to ‚a supported‘

Reason: the user is asked to update to the **latest** version of
node.js when v0.11.* is installed but v0.10.* is required
 2013-12-12 17:47:35 +01:00
Harry Wolff
058b82bba1 Update config.theme() after every settings edit 
fixes #1645

- removes server.get('ghost root') as it is only an alias
to config.paths().path, and adds unnecessary indirection
- removes config.theme().path as its just an alias to
config.paths().path, updated all relevant references
- update config.theme.update to only require the api/settings object,
and no longer need the config object
- modify api/settings.edit to call config.theme.update so that
the themeObject is ready for next rendering of template
 2013-12-12 08:25:08 -05:00
Hannah Wolfe
f3923c463e Merge pull request #1648 from KingKarl85/api-slashes 
backbonejs model conflict with connect-slashes
 2013-12-12 04:47:59 -08:00
Hannah Wolfe
589b4a8cea Merge pull request #1632 from hswolff/issue1582 
Debounce post settings events
 2013-12-11 15:05:53 -08:00
Karl Mikkelsen
12c307fa6d backbonejs model conflict with connect-slashes 
close #1648
- backbonejs model doesn't include tailing slash by default
- connect-slashes returns 301 for GET without tailing slash
- overwrote backbone model url method to include tailing slash
 2013-12-11 21:33:01 +11:00
Lucas
f350bf3e0f Fix typo? 2013-12-10 09:54:19 -02:00
Harry Wolff
9bbf400dfc Fix loading of static pages in frontend controller 
fixes #1644

- Fixes bug in controller/frontend
- Created functional test for posts API to test for this bug
- Created unit tests for frontend controller
- Fixed a global variable leak in core/test/utils/fixtures/data-generator
that was leaking the DataGenerator globally
- Resolved issue that arose from fixing above bug
 2013-12-09 22:38:25 -05:00
Harry Wolff
7bc4d43be7 Debounce post settings events 
fixes #1582
 2013-12-07 16:26:06 -05:00
Harry Wolff
c8c02a65fa Remove ghost.js 
fixes #1575
- Moves most code that was in ghost.js into ./core/server/index.js
- Creates ./core/server/config/theme.js to hold all theme configurations 
(which previously lived on ghost.blogGlobals())
- Removed ghost.server, passing it in as an argument where needed 
and allowing middleware to hold onto a reference for lazy use.
 2013-12-07 10:10:02 -05:00
Hannah Wolfe
7a46c36045 Merge pull request #1627 from sebgie/issue#755 
remove ghost.settings and ghost.notifications
 2013-12-07 03:36:08 -08:00
Hannah Wolfe
5ae71dd3f0 Merge pull request #1629 from sebgie/issue#1616 
Fix error when uploading logo/cover image
 2013-12-06 13:41:55 -08:00
Sebastian Gierlinger
8a83e9ea4e Fix error when uploading logo/cover image 
closes #1616
- removed pars from model
- changed checkbox handling
 2013-12-06 16:43:53 +01:00
Fabian Becker
1f853194ee Upgrade downsize to 0.0.4 
refs #1095
- added new unicode test to excerpt helper
 2013-12-06 15:43:03 +00:00
Sebastian Gierlinger
078f464197 remove ghost.settings and ghost.notifications 
covers 90% of #755
- moved ghost.settings to api.settings
- moved ghost.notifications to api.notifications
- split up api/index.js to notifications.js, posts.js, settings.js,
tags.js and users.js
- added instance.globals as temp workaround for blogglobals (Known
issue: blog title and blog description are updated after restart only)
- added webroot to config() to remove `var root = ...`
- changed `e` and `url` helper to async
- updated tests
 2013-12-06 09:51:35 +01:00
Sebastian Gierlinger
faeef9d209 Fix login test failure 
no issue
- added timeout after login limit tests
 2013-12-05 15:25:20 +01:00
Hannah Wolfe
696cfe7018 Swap url.resolve for slash handling 2013-12-04 21:20:24 +00:00
Hannah Wolfe
d2d9db3067 Add url.resolve for password reset email url 
fixes #1604
 2013-12-01 17:46:10 +00:00
Hannah Wolfe
d69e87b625 Merge pull request #1594 from halfdan/1591-excerpt-helper 
Fix excerpt/content helpers
 2013-11-30 10:16:26 -08:00
Hannah Wolfe
7c3031507d Merge pull request #1593 from ErisDS/app-proxy-update 
Direct api access for app proxy
 2013-11-30 10:15:20 -08:00
Hannah Wolfe
4765ca2cce Merge pull request #1589 from javorszky/iss499 
Adds login limiter
 2013-11-30 10:14:55 -08:00
Hannah Wolfe
14940cc397 Merge pull request #1586 from jgillich/live-reloading 
Permalinks live reloading support
 2013-11-30 10:03:15 -08:00
Fabian Becker
5c1091af10 Fix excerpt/content helpers 
fixes #1591
- Convert quoted strings to numbers
- Update code examples
- Update helper tests
 2013-11-29 18:58:58 +00:00
Hannah Wolfe
ed6455f5a4 Direct api access for app proxy 
- proxy doesn't need a ghost object :)
 2013-11-29 16:26:56 +00:00
Gabor Javorszky
c515e20ea3 Adds login limiter 
Closes #499
* On wrong passwords, statuses: `active` -> `warn-1` -> `warn-2` -> `warn-3` -> `locked`
* On login check, if user's status is `locked`, login automatically fails and user is encouraged to reset password. Does not even bother to check for passwords.
* login attempts tell user how many attempts she has remaining in notification box
* successful login will reset status to `active`
* resetting password with forgotten password emailed token resets status to `active`
* complete with a test suite
 2013-11-29 01:24:25 +00:00
Jakob Gillich
30861fbab8 Permalinks live reloading support 
issue #1395
 2013-11-28 21:24:31 +01:00
Hannah Wolfe
505b6d0d6f Scoping tag styling to the tag control 
fixes #1309
 2013-11-28 19:09:25 +00:00
Hannah Wolfe
dedc5d9239 Update activeTheme path on theme switch 
fixes #1583

- the active theme path wasn't getting updated when we were switching theme
 2013-11-28 16:10:34 +00:00
Harry Wolff
37b2fd93d8 This commit removes a lot of code from ghost.js, including: 
Move helper functions registerThemeHelper and registerAsyncThemeHelper
to the helpers module.
Also update the app proxy object to reflect this new code location,
and the tests to reflect that as well

Create ./sore/server/filters which houses all filter related behavior.
Was previously on the ghost singleton.
Also create the filters_spec file for testing
and update all code and tests to use new code location.

Create ./sore/server/helpers/template which houses all template related behavior.
Was previously on the ghost singleton.
Also create the helpers_template_spec file for testing
and update all code and tests to use new code location.

Move ghost.mail instance onto the mail module directly
and update related code and tests to use new location

Move Polyglot instance onto require module directly

Move ghost.availablePlugins to plugins module directly
 2013-11-28 09:21:53 -05:00
enahs
dddf2ec5b2 More verbose error message for invalid JSON in config.js 
if you enter an invalid json object such as:
```
{
server: "http://foo.com"
host: "0.0.0.0"
}
```
while configuring, you get errors but are still able to run forever and the message previously was not as indicative of other potential configuration problems.
 2013-11-28 13:58:28 +00:00
rektide
42dc8b4a8f Accept a config filename as an optional parameter to Ghost start-up. 
Closes #1110.
- Promotes config-loader from a validator, to the central place where configuration state is held
- Allow config-loader two means to be told of config file to be used:
  - A preferred first argument passed into Ghost
  - A secondary GHOST_CONFIG environmental variable
- Failing to see either of the above passed in, config-loader will continue to use "config.js"
- Config-loader validates the target configuration (unchanged) & then copies that object into it's own exports
- Components needing to read configuration now require config-loader to retrieve the configuration state
- Config file continues to be loaded via require(): this is assumed to be a static json file
 2013-11-28 13:47:00 +00:00
Hannah Wolfe
7b2bf5b98c Merge pull request #1577 from halfdan/527-subdir-admin 
Fix Admin interface with sub directories
 2013-11-28 05:14:23 -08:00
Hannah Wolfe
6bb92b4394 Swapping url.resolve back out 2013-11-28 13:03:05 +00:00
Hannah Wolfe
050466e23c Improvements to date handling in post settings menu 
issue #1350, #1351

- make sure we don't fire save if the date hasn't changed - and removes a few errors
 2013-11-28 12:37:34 +00:00
Hannah Wolfe
2dd1f4a635 Test bug fix 
- test should use testing config, not development config. If you run the tests whilst also running the dev server, the tests fail.
 2013-11-28 12:33:02 +00:00
Hannah Wolfe
76f3730427 Bug fixes for paths / windows & tests 
- removed path.join used for urls
- made sure async tests fail/timeout correctly
 2013-11-28 11:21:49 +00:00
Hannah Wolfe
01736359ad Content pane update for static pages 
fixes #1350

- no concept of published page
 2013-11-28 10:48:50 +00:00
Hannah Wolfe
6c5b687f13 Merge pull request #1410 from schmanu/iss1368 
Added new notification message on updating a post.
 2013-11-27 15:01:03 -08:00
Harry Wolff
89154ad997 Restore support for using ghost as a npm module fixes #1326 2013-11-27 17:39:14 +00:00
Hannah Wolfe
84ce7cc77e Removing error handling using process.stderr 
- process.stdin/out/error is problematic, see https://github.com/joyent/node/issues/3584
 2013-11-27 16:06:56 +00:00
Micheil Smith
3167a9b52c Fix several redirects in frontend and admin 
refs #527
 2013-11-27 09:57:44 +00:00
Fabian Becker
dcd3b192c1 Subdir support for admin interface 
refs #527
 2013-11-27 09:57:38 +00:00
Tim Griesser
726014f59a bumping to knex 0.5 and bookshelf 0.6.1 2013-11-26 23:10:31 +00:00
Fabian Becker
0169f47752 Fix failing migration.reset for Postgres. 
refs #1333
 2013-11-26 23:10:31 +00:00
Sebastian Gierlinger
e95b592028 Remove cookie from Frontend 
closes #1437
closes #1472

- changed cookie to path:'/ghost'
- added conditional CSRF middleware
- added redirects for signup, signin, signout to /ghost/sign*/
 2013-11-26 10:38:54 +01:00
Manuel Gellfart
28c3c5670c Restructure error and success messages for the editor. 
closes #1368
- merged the Maps for Error/Notification Messages into one JSON-structure
- this structure is more translation-friendly and influenced by I18n-standards.

Merged the Error and Message Map into one structure

The new JSON-structure is more translation friendly and similiar to i18n.
 2013-11-26 01:00:46 +01:00
Hannah Wolfe
330722efdc Merge pull request #1535 from hswolff/create-config-module 
Create config module to standardise getting paths and abs URLs
 2013-11-25 14:03:29 -08:00
Hannah Wolfe
b7a8ea5945 Merge pull request #1565 from ErisDS/redirect-fixes 
Putting back relative redirects
 2013-11-25 13:57:07 -08:00
Harry Wolff
b920662790 Create the config module, initially used 
to standardise getting paths and absolute URLs.  Easy
to extend for other configurations we may need.
 2013-11-25 16:35:16 -05:00
Hannah Wolfe
4730ff78e2 Merge pull request #1557 from alicoding/issue1556 
Issue #1556 - Fix meta_title is undefined
 2013-11-25 13:31:34 -08:00
Hannah Wolfe
5ad2d6178b Putting back relative redirects 
issue #1523

- also added some comments to indicate the difference between the two custom middleware files.
 2013-11-25 21:00:27 +00:00
Sebastian Gierlinger
3627d48445 Fix failing casper tests 
no issue
- spam test: changed waitForSelector to waitForText
- feature test: changed waitForRessource to watiForSelector
 2013-11-25 16:03:54 +01:00
ali
7946431b8d Issue #1556 - Fix meta_title is undefined 
Closes #1556 and #1530

This should also fix meta_description in #1530 as well as the other bug that is not
filed for body_class
 2013-11-25 13:47:56 +00:00
Fabian Becker
e210e75e97 Install in sub-directory support. 
refs #527
 2013-11-24 21:11:34 +00:00
Hannah Wolfe
53af625c49 Merge pull request #1247 from sebgie/bookshelf-session 
Replace cookieSession with session
 2013-11-24 10:43:26 -08:00
Hannah Wolfe
d6aa1df49d Merge pull request #1548 from bastilian/improve_image_uploader_ui 
Improve image uploader UI
 2013-11-24 10:07:38 -08:00
Hannah Wolfe
fd3010b07c Merge pull request #1552 from bastilian/markdown-underscores 
Modified ghostdown markdown extension to allow for 4+ inline underscores
 2013-11-24 09:48:47 -08:00
Daniel Hanson
03be4abaaa Modified ghostdown markdown extension to allow for 4+ inline underscores 
See #1113
- added additional regex rule to replace 4+ underscores with their coded equivalent: _
 2013-11-24 17:39:01 +01:00
Sebastian Gräßl
038e0cf3c1 add test for allowing 4 underscores in markdown 2013-11-24 17:38:12 +01:00
Sebastian Gierlinger
3f2258e95b Replace cookieSession with session 
- changed cookieSession to session
- added session.regenerate for login and logout
- added bookshelf session store
- added session table to database
- added import for databaseVersion 001
- added grunt task test-api
- cleanup of gruntfile to start express when needed only
- moved api tests to functional tests
 2013-11-24 15:29:36 +01:00
Hannah Wolfe
80eb56edd2 Merge pull request #1539 from niedbalski/master 
[Feature Request] Theme API: add has_tag helper to coreHelpers.
 2013-11-24 06:19:18 -08:00
danschumann
4eaf544ad7 Update base.js 
No longer need `|| 'development'`, since it is defaulted in the top index.   If we did need `|| 'development'` here, we'd need it on the next line too, otherwise it breaks.
 2013-11-23 22:29:08 -08:00
Hannah Wolfe
ae31304af0 Merge pull request #1550 from bastilian/fix_1532 
Fix tag input field
 2013-11-23 14:37:30 -08:00
Hannah Wolfe
7db5481f92 Merge pull request #1533 from jgillich/permalinks 
Add Customisable Permalinks
 2013-11-23 14:29:02 -08:00
Sebastian Gräßl
9692f1d577 fix tag input field 
closes #1532
- giving higher priority to css selector for .tag-input in order to override global input-style
- remove padding set by global input-style to align nicely with already set tags
 2013-11-23 19:45:42 +01:00
Hannah Wolfe
ab2eb18b86 Temporary fix for config loader 
issue #1521

- Reverting some of the refactor towards including Ghost as a module as it prevented Ghost from loading when no config was available.
 2013-11-23 17:54:47 +00:00
Hannah Wolfe
2701f3e664 Merge pull request #1534 from jgable/passwordReset 
Improved Password Reset Tool
 2013-11-23 08:44:08 -08:00
Sebastian Gräßl
bf9b5570a1 Improve image uploader UI 
closes #1356
- add button to toggle back to uploader from image-url interface
- put save button next to url-input
- make box-height consistent
- position ui-elements to have equal padding all around to border
 2013-11-23 17:33:38 +01:00
Jakob Gillich
83d047c0ba Add Customisable Permalinks 2013-11-23 17:02:17 +01:00
Harry Wolff
e76d23cb19 Make it possible to require ghost as a module. fixes #1326 2013-11-22 22:59:14 -05:00
Hannah Wolfe
7a1503cf52 Merge pull request #1415 from sebgie/import-transaction 
Add transactions for import
 2013-11-22 14:14:34 -08:00
Hannah Wolfe
548079ca94 Merge pull request #1544 from ErisDS/client-model-fix 
Bugfix handle model and collection separately
 2013-11-22 14:07:36 -08:00
Hannah Wolfe
c6b3eb33cf Merge pull request #1540 from jgillich/fix 
Remove unneccessary type conversion
 2013-11-22 14:07:29 -08:00
Hannah Wolfe
6394add9d6 Bugfix handle model and collection separately 
issue #1533

- replaces templateModel which was a weird hybrid with progressModel and progressCollection
 2013-11-22 21:48:37 +00:00
Jacob Gable
34e453039b Improved Password Reset Tool 
Closes #1471

- add api and User model methods for generating and validating tokens
- add routes and handlers for reset password pages
- add client styles and views for reset password form
- some basic integration tests for User model methods
 2013-11-22 10:46:19 -06:00
Jakob Gillich
184d77156a Remove unneccessary type conversion 2013-11-22 17:21:25 +01:00
Jorge Niedbalski
3782e26516 Added has_tag helper to coreHelpers, added has_tag unit tests. passing OK 2013-11-22 11:19:26 -03:00
Hannah Wolfe
216dd75b2c Merge pull request #1524 from jgillich/rss 
Set RSS link title to blog title
 2013-11-22 02:34:33 -08:00
Hannah Wolfe
6406eefae7 Merge pull request #1531 from jamesbloomer/issue-974 
Allow newline when quotes are used at start of a sentence
 2013-11-22 02:32:58 -08:00
Hannah Wolfe
cdf268e1d5 Merge pull request #1444 from hswolff/ghostjs-cleanup 
Reduce size of server.js, moving code to their related files
 2013-11-22 02:26:16 -08:00
Hannah Wolfe
c6f31ec8fd Merge pull request #1482 from jgable/appProxy 
Pass proxy Ghost interface to Apps
 2013-11-21 14:45:30 -08:00
jamesbloomer
b2ffc2e326 Allow newline when quotes are used at start of a sentence 
closes #974
 2013-11-21 13:56:43 +00:00
Sebastian Gierlinger
77ed7f8ac6 Add transactions for import 
closes #837
- added transaction handling for import
- added transactions to model functions
- added simple tests for failing imports
 2013-11-20 21:36:02 +01:00
Jakob Gillich
0c02161db7 Set RSS link title to blog title 2013-11-20 17:42:37 +01:00
Harry Wolff
985a23f446 Move server middleware configuration to related file 2013-11-19 21:05:57 -05:00
Harry Wolff
ea8d12a607 Reduce size of ghost.js by moving related Routing code to their own files 2013-11-19 21:05:09 -05:00
Hannah Wolfe
1c5a811760 Merge pull request #1449 from sebgie/issue#1398 
Add schema.js
 2013-11-19 11:45:53 -08:00
Hannah Wolfe
10a44799a7 Merge pull request #1485 from Archanium/MinorIssues 
Danish language file and a correction to Markdown modal
 2013-11-19 04:35:13 -08:00
Thomas Faurbye Nielsen
20ac198d05 Correct the Markdown for emphasis 2013-11-19 12:59:04 +01:00
Hannah Wolfe
8ec9108558 Merge pull request #1353 from thgaskell/1350-static-page-checkbox 
Allow user to set static page before saving
 2013-11-19 03:29:35 -08:00
Hannah Wolfe
ae233f01d8 Merge pull request #1505 from halfdan/1498-lower-email 
Lowercase email address.
 2013-11-19 03:10:41 -08:00
Hannah Wolfe
315ca052a9 Merge pull request #1489 from sebgie/issue#1466 
Fix wrong error message
 2013-11-19 03:00:04 -08:00
Sebastian Gierlinger
639c0d0627 Add schema.js 
closes #1398
closes #1399
closes #1400
- added schema.js with database version '000'
- refactored migration to use schema.js
- if new table is added to schema.js and databaseVersion is increased, table will be added
- if new table is deleted to schema.js and databaseVersion is increased, table will be deleted
- alter table from issue #1400 is delayed until knex supports column modification
- changed import pre checks to work again (will be refactored separately)
- added basic PostgreSQL support (Attention: not supported/tested)
- changed error handling in server.js
 2013-11-18 15:21:15 +01:00
Fabian Becker
89201a5c84 Lowercase email address. 
fixes #1498
 2013-11-18 00:34:51 +00:00
Hannah Wolfe
8e9b27f0b5 Remove inline script from default.hbs 
closes #1268
 2013-11-16 18:47:55 +00:00
Sebastian Gierlinger
fd60a12469 Fix wrong error message 
closes #1466
- added status code for error object
- added test for frontend errors
 2013-11-15 15:27:06 +01:00
Jacob Gable
ef9f5dc33f Pass proxy Ghost interface to Apps 
Closes #1478

- Create new proxy.js that exposes createProxy method
- Pass proxy to App activate/install in lieu of Ghost instance
 2013-11-14 20:36:27 -06:00
Hannah Wolfe
9d55e68689 Merge pull request #1458 from mjbshaw/svg 
Add support for SVG images
 2013-11-14 12:53:26 -08:00
Harry Wolff
688dd363cd Move plugin init code into plugin.js and have it called from server.js 2013-11-12 22:52:31 -05:00
Michael Bradshaw
0d4283176e Add support for SVG images 2013-11-12 11:37:54 -07:00
Hannah Wolfe
f022e8486d Merge pull request #1446 from JohnONolan/notifications 
Growl style desktop notifications
 2013-11-12 04:15:35 -08:00
Hannah Wolfe
3235a3a3e2 Merge pull request #1442 from Decad/user-gravatar 
Add users Gravatar on signup
 2013-11-12 03:53:49 -08:00
Hannah Wolfe
b8a98660fb Merge pull request #1440 from JohnONolan/post-settings 
Post settings refactor
 2013-11-12 03:50:56 -08:00
John O'Nolan
c40357c8cb Growl style desktop notifications 
First pass. See #1349
 2013-11-12 09:58:45 +01:00
John O'Nolan
4ee1b9849b Complete post-settings menu refactor 2013-11-12 09:19:02 +01:00
Declan cook
cbe8c15dc8 Add users Gravatar on signup 
When a user registers try to find their gravatar.
 2013-11-11 23:45:47 +00:00
Hannah Wolfe
e4f2165f0c Merge pull request #917 from jgable/publishedAtTime 
Allow published_at times to be specified
 2013-11-11 14:45:58 -08:00
Hannah Wolfe
256cd6ecd0 Merge pull request #1317 from jgillich/no-posts 
Show "Write a new Post" message when there are no posts
 2013-11-11 14:35:56 -08:00
Hannah Wolfe
cd12210b0b Further grunt & test cleanup 2013-11-11 21:38:52 +00:00
Jakob Gillich
50510e63fd Show "Write a new Post" message when there are no posts 
closes #1308
 2013-11-11 22:14:01 +01:00
Hannah Wolfe
2e64fcc5d2 Coverage report task fix for Windoze 2013-11-11 20:56:36 +00:00
Hannah Wolfe
61d693cac9 Merge pull request #1429 from germanrcuriel/add-coverage-report-with-blanket 
Add Coverage report for Unit and Integration tests
 2013-11-11 12:50:49 -08:00
Jacob Gable
38bd71a36c Allow published_at times to be specified 
Fixes #907

- Modified the PostSettings view to use moment.js formats that include hours and minutes
- Add 12:00 to value if it is not specified
 2013-11-11 14:43:47 -06:00
Hannah Wolfe
15da975c06 image upload controller refactor 
issue #635

- upload controller shouldn't assume fs
- filesystem module proxies all the fs work
- proxies and exposes middleware for serving images
- creating a date based path and unique filename is a base object util
- unit tests updated
 2013-11-11 16:10:57 +00:00
Hannah Wolfe
778e626f85 Rename rss file to prevent errors confusing output 
issue #1434

- This is a hack until we can get a PR merged into casperjs
 2013-11-11 10:46:54 +00:00
Hannah Wolfe
b0c61720d9 Test file cleanup on accoutn of OCD 2013-11-11 10:37:09 +00:00
Hannah Wolfe
9dd15edab7 Merge pull request #1372 from hswolff/cleanup-middleware 
Move all middleware into middleware module.
 2013-11-11 02:05:16 -08:00
Hannah Wolfe
219e9601ed Merge pull request #1331 from zacgeis/dirtymessage-fix 2013-11-11 09:42:35 +00:00
Hannah Wolfe
2c3de67062 Preventing incorrectly shown unload alert 
issue #1327

- IE9 fires an unload when using Backbone.history.navigate which meant the alert always got shown on first save when the url changes from from /editor/ to /editor/id. Not sure if other browsers do this, but this workaround fixes it
 2013-11-11 09:36:29 +00:00
Hannah Wolfe
3fd3102486 Moving dirty editor handling out of uploadMgr 
issue #1327

- just moved to be in editor obj, everything else is the same
 2013-11-11 09:14:18 +00:00
Zach Geis
340206fa4b Displays alert if editor is dirty before unload 
closes #1327
- Prevents user from accidently losing changes
 2013-11-11 09:00:15 +00:00
Fabian Becker
0faabe9132 Fix page errors during builds. 
fixes #1434
 2013-11-10 23:46:09 +00:00
germanrcuriel
afbbee031e Add Coverage report for Unit and Integration tests 
issue #361
- Added shell:coverage task to generate coverage report
- Registered test-coverage Grunt task as shortcut of shell:coverage
- Added coverage files to .gitignore
- Added require-cli and blanket to package.json
 2013-11-09 18:58:27 +01:00
John O'Nolan
bbc1d0207e Kill iCheck cause Hannah says it has genital warts. 2013-11-08 14:38:23 +01:00
Harry Wolff
901d189bf0 Move middleware functions into middleware module and create associated tests 
Note: this only moves middleware functions that have associated tests.
 2013-11-07 23:05:51 -05:00
Sebastian Gierlinger
a137d9c93e Add X-Cache-Invalidation Tests 
closes #1397
- added checks for x-cache-invalidation to api tests
 2013-11-07 16:08:39 +00:00
Sebastian Gierlinger
e2cee5be66 Move API tests to /integration/ 
closes #1396
- moved core/test/unit/api* to core/test/integration/api/
- moved core/test/integration/model* to core/test/integration/model/
- moved core/test/unit/utils to core/test/utils
- moved core/test/unit/fixtures to core/test/utils/fixtures/
- changed gruntfile.js to execute api tests with target 'integration'
 2013-11-07 14:26:47 +01:00
Hannah Wolfe
ae236068dd Merge pull request #1412 from egdelwonk/feature/1329_page_template 
Render a page template if it exists in a theme for a post marked as page
 2013-11-06 12:31:14 -08:00
Hannah Wolfe
ab878decef Merge pull request #1408 from halfdan/1285-unidecode 
Automatically replace unicode characters with ascii characters for slugs...
 2013-11-06 05:44:10 -08:00
William Golden
766ce1ac51 Render a page template if it exists in a theme for a post marked as page. 
Closes #1329.
 2013-11-05 21:43:13 -06:00
Fabian Becker
88d7682605 Automatically replace unicode characters with ascii characters for slugs. 
fixes #1285
 2013-11-05 21:00:29 +00:00
Fabian Becker
f356745b1a Properly format publish date. 
fixes #1335
 2013-11-05 17:44:13 +00:00
Sebastian Gierlinger
8574813660 Bugfixes for tests 2013-11-05 15:02:12 +00:00
Fabian Becker
0908ecf6b7 Run tests on MySQL and use travis-$DB environments. 
refs #921
fixes #1385
 2013-11-05 15:01:10 +00:00
Hannah Wolfe
5e8f3d927f Remove timeouts on tests 2013-11-04 12:26:11 +00:00
Sebastian Gierlinger
bb17e1c0e9 Add API tests 
closes #1189
- added tests
- added request module
- added status codes to API calls
- fixed return values of API calls
- fixed that drafts caused an error when being deleted
- fixed X-Invalidate-Cache headers
- moved testUtils.js to utils/index.js
 2013-11-03 18:13:19 +01:00
Hannah Wolfe
dee054e2c3 Merge pull request #1388 from germanrcuriel/add-canonical-support 
Add rel='canonical' support
 2013-11-03 06:50:35 -08:00
Hannah Wolfe
6626c3e7eb Merge pull request #1384 from halfdan/1377-fs-extra 
Fix image upload issue.
 2013-11-03 06:00:43 -08:00
germanrcuriel
97bd8c40ea Add rel='canonical' support 
closes #1341
- Added canonical link to header using ghost_head helper.
 2013-11-03 14:37:33 +01:00
Fabian Becker
48d3b10649 Fix image upload issue. 
fixes #1377
 2013-11-02 11:16:00 +00:00
John O'Nolan
62416d203a Make webkit autocomplete login styles less heinous 
Fixes #771
 2013-11-03 09:29:59 +01:00
Hannah Wolfe
9b2434be4c Merge pull request #1345 from halfdan/944-crazy-notifications 
Fix notification stacking.
 2013-11-01 09:00:56 -07:00
Hannah Wolfe
6b29d4392a Merge pull request #1375 from jamesbloomer/image-refactor2 
Tidy up the local file storage for images
 2013-11-01 08:48:12 -07:00
jamesbloomer
f42e977fa7 Tidy up the local file storage for images 2013-11-01 13:08:27 +00:00
Hannah Wolfe
0db907ada2 Bump grunt-jslint and fix issues 2013-11-01 12:12:01 +00:00
Hannah Wolfe
df1571cecc Merge pull request #1369 from bengladwell/jslint-params 
Remove unparam:true from jslint config in Gruntfile.js
 2013-11-01 04:39:50 -07:00
Hannah Wolfe
cfe272e175 Functional tests for home and post page 
closes #1373

- Note that the tests fail if you run them pre #1363, thus future proofing us from this happening again.
- Added submodule handling to travis
- Added a new test for each of the home and post pages
 2013-11-01 11:33:50 +00:00
Hannah Wolfe
422403c40b Merge pull request #1363 from jgable/fixAsyncHelperContext 
Fix async helpers losing proper "this" context
 2013-11-01 03:59:06 -07:00
Fabian Becker
933a8c764a Separate model tests to separate tasks/directory. 
refs #921
 2013-11-01 09:38:42 +00:00
Hannah Wolfe
5df0acf37d Merge pull request #1361 from halfdan/update-should 
Update should.js and fix tests.
 2013-11-01 02:00:01 -07:00
Ben Gladwell
69d3a1460d Remove unparam:true from jslint config in Gruntfile.js 
issue #1365
- added /*jslint unparam:true*/ to functions where absolutely necessary
- added /*jslint unparam:true*/ to functions in which keeping parameter
  list added clarity to the underlying api, even when those parameters
  are not currently used
- removed unused parameters in a few places
 2013-10-31 14:02:34 -04:00
jamesbloomer
ec79069a1c Convert local file system image storage to use promises 
Part of #635
 2013-10-31 08:25:25 +00:00
Hannah Wolfe
2983e657a6 Unit test fixes 
issue #635
 2013-10-31 08:25:24 +00:00
jamesbloomer
6e44280b96 Moving file system storage to a module 
issue #635

- refactored file system storage into module
- convert save to return a promise
- convert admin controller to use storage module
 2013-10-31 08:25:24 +00:00
Jacob Gable
257169e8c9 Fix async helpers losing proper "this" context 
Fixes #1357

- Instead of calling the passed function directly, use .call(this,
  options)
 2013-10-30 21:07:17 -05:00
Fabian Becker
297d853ddb Update should.js and fix tests. 
fixes #1360
 2013-10-31 00:28:53 +00:00
Hannah Wolfe
0005d763af Merge pull request #1336 from cobbspur/cleanhelpers 
improve layout of code to jslint standards in helpers unit tests
 2013-10-30 09:39:58 -07:00
John O'Nolan
9b188e592b Improved image cancel button 
* Removed duplicate references
* Adjusted hover styles
* Imroved visibility of icon on dark images
 2013-10-30 14:35:24 +01:00
John O'Nolan
376a3ec2b2 Fix bug where image-delete icon was on top of floating headers 2013-10-30 14:20:44 +01:00
Tony Gaskell
404c4fb2e1 Allow user to set static page before saving 
fixes #1350
- jQuery event.preventDefault() stops the user from selecting the checkbox
 2013-10-30 02:33:58 -10:00
Fabian Becker
6de3ef1701 Fix notification stacking. 
fixes #944
 2013-10-30 01:24:21 +00:00
cobbspur
b316e2fd70 improve layout of code to jslint standards in helpers unit tests 2013-10-29 20:16:59 +00:00
Hannah Wolfe
8a8dacb0e4 Merge pull request #1323 from ErisDS/test-fixes 
Wait for menu to open in editor test
 2013-10-29 04:37:41 -07:00
Hannah Wolfe
6a0a453a96 Read activePlugins from settings & improve error handling 
issue #769

- activePlugins were being read from settings in two different ways, this has been simplified
- error handling has been improved so that plugins do not crash Ghost
- used full error messaging capabilities to make it easier to recover from errors
 2013-10-29 11:27:52 +00:00
Jacob Gable
507174a00b Plugin API Refactor: Filter and Theme Helpers 
issue #769

- Refactor doFilter to allow returning a promise from a filter handler
  and to also return a promise itself
- Move the logic out of the registerThemeHelper calls and into their own methods so
  we could test them in isolation.
- Assign the server to the ghost instance so the initPlugins method can
  get access to it.
 2013-10-29 11:27:52 +00:00
Hannah Wolfe
ddece0464b Merge pull request #1301 from ErisDS/js-build-warn 
Adding a warning message if js is not built
 2013-10-28 15:24:19 -07:00
Hannah Wolfe
68f78c9cc4 Merge pull request #1315 from cobbspur/suffix 
added suffix to tag helper
 2013-10-28 15:24:11 -07:00
Fabian Becker
798e5b1a4e Allow user to mark a post as static page 
- Increased post-settings width to properly display "Static Page"
- Changed templates to display "Static Page" if set
- Added unit test for body_class helper

fixes #969
 2013-10-28 22:01:03 +00:00
Hannah Wolfe
d3a61b93e9 Wait for menu to open in editor test 
issue #1287

- also contains some misc cleanup
 2013-10-28 22:00:17 +00:00
cobbspur
d605100709 added suffix to tag helper 
closes #607

- added suffix as optional parameter to tag helper
 2013-10-28 21:38:36 +00:00
Hannah Wolfe
c364ec472a Merge pull request #1288 from zacgeis/codeformat-fix 
Avoid filtering markdown code blocks
 2013-10-28 04:19:55 -07:00
John O'Nolan
b07facbb70 Updated Breakpoint Sass 1.3.0 => 2.0.6 2013-10-27 16:25:26 +01:00
Hannah Wolfe
6869c01a28 Adding a warning message if js is not built 
closes #1205
 2013-10-27 15:16:34 +00:00
Zach Geis
1f15df41ef Avoid filtering markdown code blocks 
closes #1045
- Fixed markdown code block format issue.
- Added test case to verify fix.
 2013-10-26 12:16:47 -05:00
Hannah Wolfe
47e507b37e Merge pull request #1283 from halfdan/prevent-drop-event 
Prevent default drag/drop action.
 2013-10-26 08:34:07 -07:00
Hannah Wolfe
bf06c57746 Merge pull request #1279 from willglynn/code_wrap 
<code>/<tt> elements should wrap since they're used inline
 2013-10-26 07:45:26 -07:00
Fabian Becker
95cbbcf07e Prevent default drag/drop action. 2013-10-25 20:19:51 +00:00
Hannah Wolfe
5c33a707e9 Merge pull request #1164 from halfdan/1162-unpublished-posts 
Unpublished Post should not be accessible
 2013-10-25 13:18:39 -07:00
Hannah Wolfe
dfced52abc Merge pull request #1281 from halfdan/regression 
Fixes regression introduced in #1218.
 2013-10-25 13:13:38 -07:00
Fabian Becker
134f9a2b10 Fixes regression introduced in #1218. 2013-10-25 19:31:53 +00:00
Simone D'Amico
c4bf0123c8 Added quotes to changepw admin controller 2013-10-25 20:11:33 +02:00
Will Glynn
1bcb751e29 <code>/<tt> elements should wrap since they're used inline 2013-10-25 08:48:57 -05:00
Fabian Becker
0997eae716 Remove .txt from blacklist. 
fixes #1263
 2013-10-25 00:15:39 +00:00
Fabian Becker
aa5c0cc620 Unpublished Post should not be accessible 
fixes #1162
 2013-10-24 21:29:10 +00:00
Hannah Wolfe
6cd22c306d Merge pull request #1122 from gotdibbs/Issue814 
Simplify publish date checks
 2013-10-24 10:53:55 -07:00
Hannah Wolfe
ca6bc7525d Merge pull request #1238 from jgable/exposeKnex 
Store the Bookshelf instance on the Bookshelf module
 2013-10-24 08:18:29 -07:00
Hannah Wolfe
0333ab7711 Merge pull request #1258 from gotdibbs/Issue1242 
Fix duplication of entries in infinite scroll
 2013-10-24 08:17:41 -07:00
Hannah Wolfe
5b8048506e Merge pull request #1251 from sebgie/api-refactor-move 
Move /api to /ghost/api
 2013-10-24 07:52:49 -07:00
Hannah Wolfe
a190a209c0 Merge pull request #1252 from halfdan/531-lines-to-spaces 
Replace new-lines with spaces in excerpt helper.
 2013-10-24 07:30:49 -07:00
Hannah Wolfe
ebef969f49 Merge pull request #1245 from StevenMcD/issue/1007 
Issue/1007: Corrected the behaviour of the HOME and END keys on the Code...
 2013-10-24 07:24:41 -07:00
Hannah Wolfe
37359dc7d6 Merge pull request #1222 from mduvall/encoding-image-upload 
r# the commit.
 2013-10-24 14:37:23 +01:00
Matt DuVall
6dc3e05d21 Allow only images to be uploaded in the upload modal 
Fixes #1221

- This changes the accepted encodings on the files upload input field to
  be only "image/*" now
-
 2013-10-24 14:37:08 +01:00
Sebastian Gierlinger
6505986f6b Move /api to /ghost/api 
closes #1249
- changed routes
- changed apiRoots
 2013-10-24 14:50:17 +02:00
Hannah Wolfe
0ddd7e8dd1 Merge pull request #1254 from halfdan/943-login-notification 
Only show notifications when logged in.
 2013-10-24 03:35:37 -07:00
Fabian Becker
f5d65d7ac4 Only show notifications when logged in. 
fixes #943
 2013-10-24 08:47:27 +00:00
William Dibbern
54a6cf79d7 Fix duplication of entries in infinite scroll 
Fixes #1242

- Switched to render each new item as its added to the collection when
retrieving via scroll checks.
- Added check to remove all subviews whenever `render` is called on
`ContentList` as a preventative measure.
- Cached the jquery reference to the ordered list in `render`.
 2013-10-24 01:19:09 -05:00
Fabian Becker
16f72ba865 Replace new-lines with spaces in excerpt helper. 
fixes #531
 2013-10-23 20:28:36 +00:00
Fabian Becker
fc019fe675 Fixed style of modal in preview. 
fixes #1179
 2013-10-23 21:13:29 +01:00
Hannah Wolfe
5ba8959e83 Merge pull request #986 from sebgie/issue#952 2013-10-23 19:43:12 +01:00
Sebastian Gierlinger
c558cb7648 Add validation for importer 
closes #952
- moved api.js to api/index.js
- added api/db.js for import and export functions
- moved /ghost/debug/db/export to GET /api/v0.1/db
- moved /ghost/debug/db/import to POST /api/v0.1/db
- removed /ghost/debug/db/reset
- added validation for import
- added constraints object to migration
 2013-10-23 19:42:55 +01:00
Hannah Wolfe
6356ff9e94 Merge pull request #1248 from halfdan/bcryptjs 
Replace nodejs-bcrypt with bcryptjs
 2013-10-23 11:41:03 -07:00
Fabian Becker
1af17725fc Replace nodejs-bcrypt with bcryptjs 
* https://github.com/shaneGirish/bcrypt-nodejs
* https://github.com/dcodeIO/bcrypt.js
 2013-10-23 15:43:45 +00:00
Hannah Wolfe
80bbcf7205 Merge pull request #1239 from cobbspur/tagsprefix 
adds prefix option to tag helper
 2013-10-23 08:11:22 -07:00
Hannah Wolfe
40ba763f0f Merge pull request #1218 from halfdan/1212-themable-error-pages 
Allow themes to provide custom error template.
 2013-10-23 08:00:56 -07:00
StevenMcD
2aded98a3c Issue/1007: Corrected the behaviour of the HOME and END keys on the CodeMirror editor by overriding their calls in the extraKeys config of the editor 2013-10-23 15:56:53 +02:00
Matthew Harrison-Jones
5c7dc88eda Removed special character from SCSS 
Replaced it with the escaped unicode version (\21AA).
 2013-10-23 11:38:57 +01:00
Enrique Chavez
3edd0e118d Validate negative numbers in the posts per page setting 
issue #1236
- added validation to not allow number less than 0
 2013-10-22 23:15:38 +01:00
b1nd
8f74eb0b83 Added server validation for location field 2013-10-22 23:00:12 +01:00
cobbspur
b85e5b6196 adds prefix option to tag helper 
closes #607

 - added prefix attributetor tags helper
 - will add prefix only if tags are present
 - adds unit tests for prefix
 2013-10-22 22:57:31 +01:00
Hannah Wolfe
3185078238 Merge pull request #1204 from Gotvitch/error-code 
Keep the status code generate by connect in case of error.
 2013-10-22 14:55:17 -07:00
Hannah Wolfe
2d1e28335c Merge pull request #1197 from halfdan/994-image-uploads 
Show proper error message when image upload fails
 2013-10-22 14:40:47 -07:00
andy matthews
8743766071 Add tooltip text to icons in admin section 
Closes #1178

* Add tooltip text to assorted icons within CMS
* Add tooltip for blog URL to Ghost logo
* Change 'Options' to 'Post Settings'

Change 'Options' to 'Post Settings'
 2013-10-22 22:31:02 +01:00
Fabian Becker
27e66f75f3 Show proper error message when image upload fails 
fixes #994
 2013-10-22 21:08:26 +00:00
Hannah Wolfe
0d1fd56c0e Fixing client-side jslint exclude 
- Gruntfile had an exclude for all of client/assets rather than client/assets/vendor
- Fixes missed jsLint errors
 2013-10-22 22:06:22 +01:00
Hannah Wolfe
b319e5b800 Merge pull request #1232 from thgaskell/master 
Undefined post data causing server to crash
 2013-10-22 13:35:03 -07:00
Jacob Gable
34343e893d Store the Bookshelf instance on the Bookshelf module 
- Assigns the ghostBookshelf instance to the Bookshelf.ghost property
 2013-10-22 15:32:46 -05:00
Hannah Wolfe
fb97dd6e29 Merge pull request #1226 from halfdan/csrf-token 
Fix CSRF propery deprecated warning
 2013-10-22 13:18:27 -07:00
Hannah Wolfe
fc53bc8a15 Merge pull request #1152 from jgillich/status-code 
Set correct HTTP status code on error
 2013-10-22 13:05:22 -07:00
Hannah Wolfe
15a2eacaac Merge pull request #1141 from halfdan/246-helper-tests 
Improved test coverage of theme helpers.
 2013-10-22 12:45:07 -07:00
Hannah Wolfe
3e2ce74c90 Merge pull request #1121 from abe33/fix_user_image_border_in_settings 
Fix style issue on user-image on Firefox and Opera
 2013-10-22 12:40:07 -07:00
Hannah Wolfe
7ddc2fa287 Merge pull request #1119 from halfdan/featured-post-button 
Posts can now be featured by clicking on the star icon
 2013-10-22 12:38:43 -07:00
Hannah Wolfe
e2cf362395 Merge pull request #1117 from halfdan/featured-posts 
Add featured class when post is featured
 2013-10-22 12:38:33 -07:00
Hannah Wolfe
d64f2cde4c Merge pull request #1051 from nason/settingsResetOnImageUpload 
Fixes #1017. Save all settings when the logo or cover is saved
 2013-10-22 09:05:38 -07:00
Hannah Wolfe
5d169610ce Merge pull request #1133 from gotdibbs/Issue1124 
Fixed intermittent test errors
 2013-10-22 07:59:50 -07:00
Hannah Wolfe
4480d3bd02 Merge pull request #1088 from jacobian/postgres-fix 
Fix #896 - work around errors in pagination under Postgresql.
 2013-10-22 07:08:15 -07:00
Tony Gaskell
2809e405d5 fixed bug where an undefined variable could be dereferenced 
which could cause the server to choke.
 2013-10-22 03:20:09 -10:00
Fabian Becker
7099091c28 Fix CSRF deprecated warning 2013-10-22 07:33:30 +00:00
Fabian Becker
57bd929d2c Allow themes to provide custom error template. 
fixes #1212, #1213
 2013-10-21 19:12:22 +00:00
Seb Gotvitch
596cd13ca5 Keep the status code generate by connect in case of error. 
The status code generate by connect/express in case of error was always
replace by 500 status.
 2013-10-21 01:53:26 -04:00
Pascal Borreli
14c420c8d1 Fixed typos 2013-10-20 20:33:51 +00:00
Hannah Wolfe
accf525061 Temporarily removing API test 2013-10-20 11:02:06 +01:00
Hannah Wolfe
65dcb17117 Merge branch '0.3.3-wip' 
Conflicts:
	core/client/views/blog.js
	core/server/api.js
	core/server/views/default.hbs
	package.json
 2013-10-20 10:09:39 +01:00
Sebastian Gierlinger
2ee8f96829 Revert sessions to cookieSessions 
no issue
- modified sessions to use cookieSession
- set max-age to 12 hrs
- modified logout to delete cookie completely
 2013-10-18 13:24:01 +02:00
Hannah Wolfe
158d237122 Improved error handling 
fixes #845

- only returns an error page for get requests, otherwise returns a response
- no more admin menu when not logged in
- no more error message about theme error template
- logWarn is available
 2013-10-17 22:49:14 +01:00
Hannah Wolfe
f12a3cecf7 Fixing URL-based image uploads on settings screen 2013-10-17 21:54:51 +01:00
Hannah Wolfe
4f8ac2a4fd Current user data update 2013-10-17 21:38:49 +01:00
Hannah Wolfe
5916844835 Fixes for content screen 
fixes #1125

- fixes an error in the console when there are no posts
- resolves the issue whereby content disappears after scroll
 2013-10-17 21:06:01 +01:00
Jakob Gillich
0f048eeb79 Set correct HTTP status code on error 
closes #1055
 2013-10-17 21:52:40 +02:00
Hannah Wolfe
e29a598fa5 CSRF for debug screen 2013-10-17 20:52:09 +01:00
Hannah Wolfe
2a6e77752f API JSON updates 2013-10-17 20:52:05 +01:00
Hannah Wolfe
d9c9ca0e33 Merge pull request #4 from sebgie/sec/3 
Sec/3
 2013-10-17 10:49:40 -07:00
Hannah Wolfe
491651da59 Merge pull request #2 from ErisDS/bookshelf-knex-update 
Updating to bookshelf 0.5.7 & knex 0.4.11
 2013-10-17 10:49:28 -07:00
Tim Griesser
13639ad8d1 Updating to bookshelf 0.5.7 & knex 0.4.11 2013-10-17 18:23:36 +01:00
Sebastian Gierlinger
374c41e138 Remove private data from API 
no issue
- added removal to user.browse, posts.read, posts.browse
- fixed removal for user.read
 2013-10-17 17:15:25 +02:00
Sebastian Gierlinger
90176e1f40 Security improvements 
no issue
- added CSRF protection
- changed session handling to express.session
- changed session handling to change session id
- added config property useCookieSession
- added file extension check for /ghost/upload
- removed /ghost/debug/db/reset
 2013-10-17 15:28:28 +02:00
Hannah Wolfe
daa87e92c2 Merge pull request #1026 from jenius/master 
Remove unneeded info from /user api response
 2013-10-17 14:12:13 +01:00
John O'Nolan
1bd8002858 Fixed further firefox display bugs 
See #1090

Conflicts:
	core/client/tpl/settings/user-profile.hbs
 2013-10-17 14:10:49 +01:00
John O'Nolan
c6d805cd28 Merge pull request #1090 from bnchdrff/user-image-ff-fix 
fixes firefox user image disappearance
 2013-10-17 14:04:34 +01:00
Fabian Becker
dfa7793d44 Improved test coverage of theme helpers. 
refs #246
 2013-10-17 07:53:11 +00:00
Talon
675d02d466 fixed typo in comments of manage.scss 
The mage posts screen is probably supposed to be the manage posts screen.
 2013-10-16 20:43:59 -06:00
William Dibbern
702a016547 Fixed intermittent test errors 
Fixes #1124

- Updated default mocha timeout to 15 seconds. Any future tests that
depend on a timeout (and thus might be better off with a lower value)
can override the default setting which is now 15 seconds.
- Removed test-specific timeout overrides for the mocha tests.
- Fixed the editor/splitbutton tests to wait for the appropriate
selector instead of assuming the dom has been updated immediately.
Should resolve intermittent timeouts when checking the splitbutton's
applied classes.
 2013-10-16 17:57:52 -05:00
Fabian Becker
9a975f5a45 Posts can now be featured by clicking on the star icon 
fixes #1111
 2013-10-16 19:06:03 +00:00
William Dibbern
3e1b37e194 Simplify publish date checks 
Fixes #814

- Changed to compare instances of `moment` using it's built in
comparison function instead of string compare with the date from the
database.
- Ensure compared date is parsed with the correct formats that we were
supporting before #1107.
- Moved date formats to variables to reduce chance for error in future.
 2013-10-16 11:32:20 -05:00
Hannah Wolfe
9b879f6edb Merge pull request #1108 from nason/signupErrorHandler 
Add otherwise error callback to redirectToSignup promise. Fixes #1071
 2013-10-16 08:43:23 -07:00
nason
6a5e399997 Add error handling to redirectToSignup promise 
Fixes #1078
- Add an otherwise error callback to the redirectToSignup promise
 2013-10-16 08:39:58 -07:00
Michael Nason
7044d97d73 Save all settings when the logo or cover save button is clicked. 
Fixes #1017.
- Call saveSettings for cover and blog logo photos
- Call saveUser for profile and profile cover photos
 2013-10-16 08:39:24 -07:00
John O'Nolan
0e5dc9275c Fixed further firefox display bugs 
See #1090
 2013-10-16 17:26:28 +02:00
John O'Nolan
b1edd889b9 Merge pull request #1090 from bnchdrff/user-image-ff-fix 
fixes firefox user image disappearance
 2013-10-16 07:57:56 -07:00
Benjamin Chodoroff
672bb01d15 fixes firefox user image disappearance 
take advice from @JohnONolan and subtract border-width
 2013-10-16 10:47:06 -04:00
Fabian Becker
f4ac715f97 Add featured class when post is featured 
fixes #1112
 2013-10-16 11:41:49 +00:00