Commit Graph

1420 Commits

Author SHA1 Message Date
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
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
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
Fabian Becker
9a975f5a45 Posts can now be featured by clicking on the star icon
fixes #1111
2013-10-16 19:06:03 +00:00
sjama
e6b4c80542 fixed license url 2013-10-16 18:46:44 +01:00
William Dibbern
3e1b37e194 Simplify publish date checks
Fixes #814

- Changed to compare instances of `moment` using it's built in
comparison function instead of string compare with the date from the
database.
- Ensure compared date is parsed with the correct formats that we were
supporting before #1107.
- Moved date formats to variables to reduce chance for error in future.
2013-10-16 11:32:20 -05: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
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
840aa363b9 Merge pull request #1102 from vineet-sinha/patch-2
Instructions to start the server.
2013-10-16 03:26:59 -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
931897ed75 Updated package.json with Ghost details 2013-10-16 11:09:20 +02: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
Hannah Wolfe
a5c35d451a Merge pull request #1107 from karolisdzeja/pub-date-bug-fix
Fix notification bug
2013-10-16 00:37:48 -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
Vineet Sinha
7e9f3957fa Instructions to start the server. 2013-10-15 18:43:47 -04: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
Hannah Wolfe
5f3f0d013b Merge pull request #1099 from sjama/license
renamed LICENSE.txt to LICENSE
2013-10-15 14:44:06 -07:00
sjama
609f009c9f renamed LICENSE.txt to LICENSE 2013-10-15 22:08:11 +01:00
Daniel Hanson
0bcc111025 tweaked .floatingheader background for non-webkit browsers 2013-10-15 13:29:56 -06:00
Hannah Wolfe
930309363d Merge pull request #1020 from padhg/omit-uri-scheme
Allow omission of URI Scheme in config.js url
2013-10-15 12:26:18 -07:00
Jacob Kaplan-Moss
2acb546028 Fix #896 - work around errors in pagination under Postgresql. 2013-10-15 11:09:08 -05:00
John O'Nolan
35347795a8 Merge pull request #1082 from bnchdrff/1081-update-contrib-instrs
Change contrib instructions to reflect #579
2013-10-15 06:16:08 -07:00
Benjamin Chodoroff
bc9e4fea1b fixes #1081: change contrib instructions to reflect #579 2013-10-15 12:17:27 +00:00
Hannah Wolfe
60c529b1e3 Merge pull request #1079 from matthojo/Grunt-Fix
Included NProgress in Production Grunt concat
2013-10-15 03:48:26 -07:00
Matthew Harrison-Jones
87269513d9 Included NProgress in Production Grunt concat 2013-10-15 11:18:57 +01:00
Hannah Wolfe
581d0c6e11 Switching Travis button from private to public 2013-10-15 10:29:06 +01:00
Hannah Wolfe
0bf5c99f08 Merge pull request #1067 from gotdibbs/Issue1064
Clean up test database after tests
2013-10-15 01:28:44 -07:00
William Dibbern
ac33cea0a1 Clean up test database after tests
Fixes #1064

- Updated grunt config for unit and functional tests to remove the test
database after each is run.
- Cleaned up a couple of issues with the functional tests that may have
been causing travis builds to fail randomly, including: the start page
is now `about:blank` instead of whatever page the last test suite left
off at, added some checks in the logout tests to ensure they're truly
independent of the other test suites.
2013-10-14 22:39:52 -05:00
Hannah Wolfe
18f78875ed Merge pull request #1050 from jgable/fixCssErrors
Fix extra semi-colon in sass
2013-10-14 14:53:25 -07:00
Hannah Wolfe
cef3175dbd Merge pull request #1046 from buddhamagnet/cache-selector-in-after-render
Cache selector in afterRender function
2013-10-14 13:47:23 -07:00
buddhamagnet
0662817cea Cache selector in afterRender function
- cache selector in a variable to prevent recomputing it in the function.
2013-10-14 20:56:20 +01:00
Hannah Wolfe
2a459b508a Merge pull request #1035 from pdehaan/patch-1
Update Gruntfile.js
2013-10-14 12:38:09 -07:00
Hannah Wolfe
3cb955fb44 Merge pull request #1041 from halfdan/markdown-modal
Fix emphasize notation in Markdown modal.
2013-10-14 12:20:01 -07:00