Commit Graph

911 Commits

Author SHA1 Message Date
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
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