TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-26 20:34:02 +03:00
Code Issues Projects Releases Wiki Activity
1,222 Commits 250 Branches 1,686 Tags 400 MiB
3185078238
Commit Graph

1222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b76eeef27f Merge pull request #1167 from manzoid/add-target-to-grunt-test-functional 
add a `target` arg to `grunt test-functional`
 2013-10-22 14:45:37 -07:00
Hannah Wolfe
01874b1fcf Merge pull request #1211 from matheusazzi/patch-1 
Update package.json
 2013-10-22 14:41:09 -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
Hannah Wolfe
a7838fa454 Merge pull request #1185 from commadelimited/1178-add-title-attribute-to-action-items 2013-10-22 22:31:45 +01: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
Hannah Wolfe
173221606b Merge pull request #1193 from ZDroid/tag_way 2013-10-22 21:23:21 +01:00
Zlatan Vasović
fb8336100e Use less markup for links 2013-10-22 21:22:35 +01: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
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
Matheus Azzi
6555534608 Update package.json 
Update grunt-contrib-watch
 2013-10-21 08:44:10 -02: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
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
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
Tim Mansfield
725d1541d7 add a target arg to grunt test-functional 
The idea here is to slightly speed up test development by allowing you
to specify a single test file to run.
 2013-10-18 17:13:07 -07: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
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