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
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
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
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
Hannah Wolfe
3eae0a3939
Merge pull request #1103 from b1nd/merge
...
Removed unused variables and updated commenting
2013-10-16 03:31:57 -07:00
Hannah Wolfe
7419e05b3a
Merge pull request #1092 from halfdan/uc-helper
...
Added new helper to escape URIs called 'encode'
2013-10-16 02:23:13 -07:00
Fabian Becker
788987d04a
Added new helper to escape URIs called 'encode'
...
fixes #1089
2013-10-16 09:19:26 +00:00
John O'Nolan
a76a702e6e
Merge pull request #1098 from hansondr/floatingheader
...
tweaked .floatingheader background for non-webkit browsers
2013-10-16 01:18:31 -07:00
Karolis Dzeja
88d0303093
Fix notification bug
...
The date stored in the model is in a different format and needs to be converted before being checked. Otherwise, any blur event will trigger the notification that the date has been changed, even if the date is the same.
2013-10-16 00:30:25 -05:00
b1nd
c61806c1c8
Removed unused variables and updated commenting
2013-10-16 11:32:44 +11:00
abe33
c6b9b80e18
Fix style issue on user-image on Firefox and Opera
...
On both Firefox and Opera (OSX) the user image badge in
the settings page wasn't displayed.
Also, on firefox the badge overlay didn't have the proper size.
I don't know if there's a specific use case requiring a `display:
table` instead of a plain `display: block` but that was failing on
Firefox and Opera.
Using a block instead seems works perfectly (at least on Opera, Chrome,
Safari, Safari Mobile IOS7 and Firefox) regarding the badge size issue.
On Opera, though, the border radius wasn't applied properly to the
image. Adding a `border-radius: 100%;`fix that.
2013-10-16 00:25:03 +02:00