TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-27 12:53:13 +03:00
Code Issues Projects Releases Wiki Activity
1,534 Commits 250 Branches 1,686 Tags 400 MiB
51b9f8972b
Commit Graph

1090 Commits

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