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
f12a3cecf7
Fixing URL-based image uploads on settings screen
2013-10-17 21:54:51 +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
d9c9ca0e33
Merge pull request #4 from sebgie/sec/3
...
Sec/3
2013-10-17 10:49:40 -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
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
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
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
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
Daniel Hanson
0bcc111025
tweaked .floatingheader background for non-webkit browsers
2013-10-15 13:29:56 -06: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
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
Fabian Becker
72f7404d2f
Fix emphasize notation in Markdown modal.
...
fixes #1008
2013-10-14 18:12:55 +00:00
Jacob Gable
c153a3ca01
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
119b0ea430
Merge branch '0.3.2-wip'
...
Conflicts:
core/client/assets/lib/uploader.js
2013-10-11 20:56:15 +01:00
cobbspur
c52a10cd1a
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
9466a9753b
Merge branch '0.3.2-wip'
...
Conflicts:
core/test/unit/api_posts_spec.js
2013-10-10 16:37:35 +01:00
Hannah Wolfe
f5d617d8d4
Merge pull request #925 from matthojo/New-line
...
Added new paragraph keyboard shortcut
2013-10-09 11:32:43 -07:00
Hannah Wolfe
95f9fce3be
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
58417c2a8d
Added in functionality for a working loading bar
2013-10-08 16:39:07 +01:00
Matthew Harrison-Jones
fdf5e3d69e
Revert "loading bar implementation"
...
This reverts commit de6b8ee9b3
and 16742bcaef
2013-10-08 14:12:46 +01:00
Hannah Wolfe
cd929f19b3
Merge pull request #954 from jgable/fixChangePasswordEnter
...
Fix pressing enter key on user settings
2013-10-05 12:25:26 -07:00
Hannah Wolfe
4bc8db57cc
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
40acf28321
Fix for dropzone
...
no issue
- dropzone is disabled when fileStorage = false
2013-10-02 13:34:16 +02:00
Sebastian Gierlinger
0220cf2448
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
986d5c6299
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
de6b8ee9b3
Refactored loading bar SCSS
2013-09-30 15:02:51 +01:00
John O'Nolan
16742bcaef
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
8cbb09124d
Smushed mobile app icons
2013-09-30 10:33:18 +02:00
John O'Nolan
137a8dfc58
Adding support for Apple, Android, and Microsoft app icons
2013-09-28 15:54:12 +02:00
Hannah Wolfe
6bd62538af
Merge branch '0.3.1-wip'
...
Conflicts:
core/server/controllers/admin.js
2013-09-27 17:22:55 +01:00
Matthew Harrison-Jones
32aebc40d3
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
d841e749f9
Adding extra class for url uploads
2013-09-27 13:34:39 +01:00
John O'Nolan
9df4955bcb
Fix tiny alignment issue on Ghost logo
2013-09-27 11:23:24 +02:00
John O'Nolan
8ce4d4b7c5
Fixed fucked up modal padding
2013-09-27 11:21:23 +02:00
William Dibbern
c5438c5fff
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
18ca744c98
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
0ef99ad393
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
fc881229f4
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
cobbspur
3119fc5388
fixes position of save button in image uploader
...
closes #911
- adds display block to save button centre class
2013-09-26 20:15:48 +01:00
cobbspur
2a55595191
Increased visibility of trash can in image uploader for broken url
...
closes #838
- adds a min height value to pre-image-uploader scss
2013-09-26 18:33:09 +01:00
John O'Nolan
58873a9fc3
Stripped obsolete CSS3 prefixes
2013-09-26 15:26:00 +01:00
John O'Nolan
d1957958e3
Cleanup indentation and quotes
...
Aligns all requirements vertically for easier reading + adds single quote standard consistently throughout Ghost, except in long strings.
2013-09-26 15:06:31 +01:00
Hannah Wolfe
b787cc6639
Image upload start event fired earlier
...
issue #882
2013-09-26 12:35:03 +01:00
cobbspur
90e4637ede
Image Upload URl saves in the right place
...
closes #864
- adds trigger - uploadstart to url handler
2013-09-26 12:34:59 +01:00
Matthew Harrison-Jones
67132ff28b
Bug Fix: Date Keyboard Shortcut no-longer crashes the browser
2013-09-26 11:22:02 +01:00