Commit Graph

597 Commits

Author SHA1 Message Date
Hannah Wolfe
584a6bfd73 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
db12bb2c5b 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
dbbb78a459 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
30a20553ea 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
a60fa5f970 Fixing URL-based image uploads on settings screen 2013-10-17 21:54:51 +01:00
Hannah Wolfe
c5431184bd 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
775d55bbd6 Merge pull request #4 from sebgie/sec/3
Sec/3
2013-10-17 10:49:40 -07:00
Sebastian Gierlinger
f1ef797d6b 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
John O'Nolan
f8bcbdb44f 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
7009dce97c Merge pull request #1090 from bnchdrff/user-image-ff-fix
fixes firefox user image disappearance
2013-10-17 14:04:34 +01:00
Talon
db1f147dbf 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
Fabian Becker
e4ee695aa5 Posts can now be featured by clicking on the star icon
fixes #1111
2013-10-16 19:06:03 +00:00
William Dibbern
2fea2733b4 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
Michael Nason
34e0e9c66c 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
e863f42491 Fixed further firefox display bugs
See #1090
2013-10-16 17:26:28 +02:00
John O'Nolan
d96686e912 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
d7b99ba090 fixes firefox user image disappearance
take advice from @JohnONolan and subtract border-width
2013-10-16 10:47:06 -04:00
John O'Nolan
3539ffc549 Merge pull request #1098 from hansondr/floatingheader
tweaked .floatingheader background for non-webkit browsers
2013-10-16 01:18:31 -07:00
Karolis Dzeja
623a2362ac 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
abe33
aceaf0beb7 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
Daniel Hanson
7ea112afc9 tweaked .floatingheader background for non-webkit browsers 2013-10-15 13:29:56 -06:00
Hannah Wolfe
4fa188f949 Merge pull request #1050 from jgable/fixCssErrors
Fix extra semi-colon in sass
2013-10-14 14:53:25 -07:00
buddhamagnet
d3fd327d94 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
Fabian Becker
93eb1f6804 Fix emphasize notation in Markdown modal.
fixes #1008
2013-10-14 18:12:55 +00:00
Jacob Gable
adbb027306 Fix extra semi-colon in sass
Related to #1033 but needs TryGhost/Casper#32 to close

- Remove extra semi-colon
2013-10-14 12:45:46 -05:00
Hannah Wolfe
d1d0d86d68 Merge branch '0.3.2-wip'
Conflicts:
	core/client/assets/lib/uploader.js
2013-10-11 20:56:15 +01:00
cobbspur
9ac01e02b4 fixed image upload url synchronicity and url removed on cancel
closes #988, closes #956, closes #975

- fixed multiple ids and refactored triggers
- persistence requirement overridden
- trash can now removes url in editor
- if empty url is saved http:// is inserted and dropzone initialized

Conflicts:
	core/client/assets/lib/uploader.js
2013-10-11 18:15:17 +01:00
Hannah Wolfe
c427318fdd Merge branch '0.3.2-wip'
Conflicts:
	core/test/unit/api_posts_spec.js
2013-10-10 16:37:35 +01:00
Hannah Wolfe
7d32ba8e98 Merge pull request #925 from matthojo/New-line
Added new paragraph keyboard shortcut
2013-10-09 11:32:43 -07:00
Hannah Wolfe
8c87d44b6d Swapping escape to sanitze
issue #938

- rather than using escape, use node-validatiors santize function which is designed for preventing xss vectors
- added listener for changes to both editor and settings page
- added more sanitization to the user model
- consistently use triple-braces when outputting blog post titles
2013-10-09 19:13:16 +01:00
Matthew Harrison-Jones
14818fac61 Added in functionality for a working loading bar 2013-10-08 16:39:07 +01:00
Matthew Harrison-Jones
15d270840c Revert "loading bar implementation"
This reverts commit 46d37fb637cca71b169b6c61f56fd12f31450152 and 3187448867921f4de2aa9f22eca2626665226e99
2013-10-08 14:12:46 +01:00
Hannah Wolfe
16cdcda475 Merge pull request #954 from jgable/fixChangePasswordEnter
Fix pressing enter key on user settings
2013-10-05 12:25:26 -07:00
Hannah Wolfe
11f7b05700 Merge pull request #918 from gotdibbs/Issue877
Fix a couple of issues when there are no posts
2013-10-03 07:40:11 -07:00
Sebastian Gierlinger
998f28209e Fix for dropzone
no issue
- dropzone is disabled when fileStorage = false
2013-10-02 13:34:16 +02:00
Sebastian Gierlinger
bcc7ad9a41 Disable filestorage
closes #937
- fixed bug where ![] is replaced with ![](http://) for image url
- added fileStorage setting to uploader
- added fileStorage helper (could become standard way of providing config data for frontend???)
- added data element to editor and settings
- if no config value is set fileStorage: true is default
2013-10-02 11:39:34 +02:00
Jacob Gable
ed5bd3b808 Fix pressing enter key on user settings
Specified type='button' for the buttons in the form so they don't get
pseudo clicked on enter key in inputs.  Added a keyup handler to check
for enter keys in the inputs and do the proper action based on where you
are in the form.
2013-10-01 10:05:12 -05:00
Matthew Harrison-Jones
73d37fc445 Refactored loading bar SCSS 2013-09-30 15:02:51 +01:00
John O'Nolan
1a2d4134e0 Initial loading bar implementation
See #726

Becomes visible when <body> has a class of `js-loading`
2013-09-30 11:17:06 +02:00
John O'Nolan
2489c60fb9 Smushed mobile app icons 2013-09-30 10:33:18 +02:00
John O'Nolan
61c4eab250 Adding support for Apple, Android, and Microsoft app icons 2013-09-28 15:54:12 +02:00
Hannah Wolfe
7a3e72e983 Merge branch '0.3.1-wip'
Conflicts:
	core/server/controllers/admin.js
2013-09-27 17:22:55 +01:00
Matthew Harrison-Jones
2db73f87a1 Added new paragraph keyboard shortcut
`Ctrl / Cmd + Enter` now enters a new paragraph, but only if the user is not on a new line.
2013-09-27 14:41:38 +01:00
Hannah Wolfe
a1a8df8053 Adding extra class for url uploads 2013-09-27 13:34:39 +01:00
John O'Nolan
74ed7ede58 Fix tiny alignment issue on Ghost logo 2013-09-27 11:23:24 +02:00
John O'Nolan
aae81c1232 Fixed fucked up modal padding 2013-09-27 11:21:23 +02:00
William Dibbern
b49473fc4a Fix couple of issues when there are no posts
Fixes #877

- Updated the blog/content view to check `collection.length` before
attempting to pull another record.
- In the event an item is removed and the collection now has zero items,
still redraw the preview pane, just with no data.
2013-09-26 23:44:01 -05:00
Hannah Wolfe
71a2d44b5d Merge pull request #913 from ErisDS/0.3.1-html-handling
Treat markdown as text in editor
2013-09-26 14:53:37 -07:00
Hannah Wolfe
57bfcda78b Merge pull request #912 from cobbspur/saveposition
fixes position of save button in image uploader
2013-09-26 13:26:01 -07:00
Hannah Wolfe
e1b1885750 Treat markdown as text in editor
closes #857

- markdown is inserted into codemirror with .text() not .html()
2013-09-26 21:06:52 +01:00