TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-01 05:50:35 +03:00
Code Issues Projects Releases Wiki Activity
1,197 Commits 237 Branches 1,680 Tags 387 MiB
e2cf362395
Commit Graph

1197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John O'Nolan
cf9b5d9441 Merge pull request #1199 from pborreli/typos 
Fixed typos
 2013-10-21 05:19:35 -07:00
John O'Nolan
614eb59bfb Merge pull request #1208 from jacques/master 
Correct spelling of GitHub
 2013-10-21 05:18:06 -07:00
Hannah Wolfe
495f7bc3a7 Bump express and express-hbs to latest versions 
closes #875, issue #876, issue #830
 2013-10-21 10:21:57 +01:00
Jacques Marneweck
494003d7e0 Correct spelling of GitHub 
Signed-off-by: Jacques Marneweck <jacques@powertrip.co.za>
 2013-10-21 10:58:33 +02: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
Hannah Wolfe
1181cdacf7 Merge pull request #1187 from headcanon/patch-1 
Bump connect-slashes to 0.0.10
 2013-10-20 01:30:54 -07:00
Nick Donohue
2eb5758bc5 Bump connect-slashes to 0.0.10 
seems to kill warning `npm WARN package.json connect-slashes@0.0.9 No repository field.`
 2013-10-20 01:46:19 -04:00
Hannah Wolfe
f085be4128 Readme update re password reset 2013-10-18 16:55:01 +01:00
Hannah Wolfe
e100ef40d6 Merge pull request #5 from sebgie/cookies 
Revert sessions to cookieSessions
 2013-10-18 04:30:58 -07: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
a53d996372 Merge pull request #1140 from halfdan/casperjs-warning 
Fix CasperJS warning when running tests
 2013-10-18 02:01:05 -07:00
Fabian Becker
58f07cefa3 Fix CasperJS warning. 2013-10-18 08:50:49 +00:00
Hannah Wolfe
1fc6d18635 Merge pull request #1134 from luk-/doc-enoent 
clarify npm install step to help new npm users
 2013-10-17 15:37:37 -07:00
Hannah Wolfe
0437e16a7a Version bump to 0.3.3 2013-10-17 22:49:24 +01: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
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
Hannah Wolfe
a230b5adcd Merge pull request #1 from sebgie/security 
Security improvements
 2013-10-17 07:53:21 -07: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
John O'Nolan
14df3e7a69 Merge pull request #1123 from sjama/package.json 
fixed license url
 2013-10-17 03:45:11 -07:00
John O'Nolan
5eb4f22497 Merge pull request #1138 from LegitTalon/patch-1 
fixed typo in comments of manage.scss
 2013-10-17 03:40:02 -07: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
Luke Arduini
1749b8f90a clarify ENOENT on npm install for new users 2013-10-16 16:17:32 -07: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
sjama
e6b4c80542 fixed license url 2013-10-16 18:46:44 +01: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
Hannah Wolfe
2dfadcbbcd README and CONTRIBUTING docs updates 
- removed note about ssh
- added links to docs and forum
- added note about grunt prod
- more troubleshooting tips
 2013-10-16 15:55:54 +01:00
Hannah Wolfe
75ba76c25a Merge pull request #1024 from dmyers/submodule 
Changed git submodule to use git instead of ssh
 2013-10-16 07:55:40 -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