TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 02:44:33 +03:00
Code Issues Projects Releases Wiki Activity
470 Commits 250 Branches 1,686 Tags 408 MiB
810f97eaf8
Commit Graph

467 Commits

Author SHA1 Message Date
Karl Mikkelsen
84bda76c18 backbonejs model conflict with connect-slashes 
close #1648
- backbonejs model doesn't include tailing slash by default
- connect-slashes returns 301 for GET without tailing slash
- overwrote backbone model url method to include tailing slash
 2013-12-11 21:33:01 +11:00
Lucas
9c0e7be43a Fix typo? 2013-12-10 09:54:19 -02:00
Harry Wolff
f08633d1a6 Debounce post settings events 
fixes #1582
 2013-12-07 16:26:06 -05:00
Sebastian Gierlinger
56de932492 Fix error when uploading logo/cover image 
closes #1616
- removed pars from model
- changed checkbox handling
 2013-12-06 16:43:53 +01:00
Hannah Wolfe
0c5b315d54 Scoping tag styling to the tag control 
fixes #1309
 2013-11-28 19:09:25 +00:00
Hannah Wolfe
b8c9128d20 Merge pull request #1577 from halfdan/527-subdir-admin 
Fix Admin interface with sub directories
 2013-11-28 05:14:23 -08:00
Hannah Wolfe
5165386f0d Improvements to date handling in post settings menu 
issue #1350, #1351

- make sure we don't fire save if the date hasn't changed - and removes a few errors
 2013-11-28 12:37:34 +00:00
Hannah Wolfe
c03f475c6d Content pane update for static pages 
fixes #1350

- no concept of published page
 2013-11-28 10:48:50 +00:00
Fabian Becker
62f656cc53 Subdir support for admin interface 
refs #527
 2013-11-27 09:57:38 +00:00
Manuel Gellfart
1fd03b846b Restructure error and success messages for the editor. 
closes #1368
- merged the Maps for Error/Notification Messages into one JSON-structure
- this structure is more translation-friendly and influenced by I18n-standards.

Merged the Error and Message Map into one structure

The new JSON-structure is more translation friendly and similiar to i18n.
 2013-11-26 01:00:46 +01:00
Hannah Wolfe
a85e5cd265 Merge pull request #1548 from bastilian/improve_image_uploader_ui 
Improve image uploader UI
 2013-11-24 10:07:38 -08:00
Daniel Hanson
f0c7af3be7 Modified ghostdown markdown extension to allow for 4+ inline underscores 
See #1113
- added additional regex rule to replace 4+ underscores with their coded equivalent: _
 2013-11-24 17:39:01 +01:00
Hannah Wolfe
d7a29d069f Merge pull request #1550 from bastilian/fix_1532 
Fix tag input field
 2013-11-23 14:37:30 -08:00
Hannah Wolfe
5ec7a95d54 Merge pull request #1533 from jgillich/permalinks 
Add Customisable Permalinks
 2013-11-23 14:29:02 -08:00
Sebastian Gräßl
da38d1ae9f fix tag input field 
closes #1532
- giving higher priority to css selector for .tag-input in order to override global input-style
- remove padding set by global input-style to align nicely with already set tags
 2013-11-23 19:45:42 +01:00
Hannah Wolfe
0f96b718ae Merge pull request #1534 from jgable/passwordReset 
Improved Password Reset Tool
 2013-11-23 08:44:08 -08:00
Sebastian Gräßl
003ae8f4f9 Improve image uploader UI 
closes #1356
- add button to toggle back to uploader from image-url interface
- put save button next to url-input
- make box-height consistent
- position ui-elements to have equal padding all around to border
 2013-11-23 17:33:38 +01:00
Jakob Gillich
a2cb218d9a Add Customisable Permalinks 2013-11-23 17:02:17 +01:00
Hannah Wolfe
9842a2e016 Merge pull request #1544 from ErisDS/client-model-fix 
Bugfix handle model and collection separately
 2013-11-22 14:07:36 -08:00
Hannah Wolfe
ddc135f222 Bugfix handle model and collection separately 
issue #1533

- replaces templateModel which was a weird hybrid with progressModel and progressCollection
 2013-11-22 21:48:37 +00:00
Jacob Gable
2020c3dddb Improved Password Reset Tool 
Closes #1471

- add api and User model methods for generating and validating tokens
- add routes and handlers for reset password pages
- add client styles and views for reset password form
- some basic integration tests for User model methods
 2013-11-22 10:46:19 -06:00
Jakob Gillich
8ac1afe65d Remove unneccessary type conversion 2013-11-22 17:21:25 +01:00
Hannah Wolfe
ad67b0dd50 Merge pull request #1485 from Archanium/MinorIssues 
Danish language file and a correction to Markdown modal
 2013-11-19 04:35:13 -08:00
Thomas Faurbye Nielsen
bbba5d36c1 Correct the Markdown for emphasis 2013-11-19 12:59:04 +01:00
Hannah Wolfe
7d253f20e4 Merge pull request #1353 from thgaskell/1350-static-page-checkbox 
Allow user to set static page before saving
 2013-11-19 03:29:35 -08:00
Hannah Wolfe
bf867ec6fd Remove inline script from default.hbs 
closes #1268
 2013-11-16 18:47:55 +00:00
Michael Bradshaw
3125bd5575 Add support for SVG images 2013-11-12 11:37:54 -07:00
Hannah Wolfe
682853537f Merge pull request #1446 from JohnONolan/notifications 
Growl style desktop notifications
 2013-11-12 04:15:35 -08:00
Hannah Wolfe
a6fcf8cac7 Merge pull request #1440 from JohnONolan/post-settings 
Post settings refactor
 2013-11-12 03:50:56 -08:00
John O'Nolan
d85826b821 Growl style desktop notifications 
First pass. See #1349
 2013-11-12 09:58:45 +01:00
John O'Nolan
6e3abb1ad4 Complete post-settings menu refactor 2013-11-12 09:19:02 +01:00
Hannah Wolfe
07d98c333f Merge pull request #917 from jgable/publishedAtTime 
Allow published_at times to be specified
 2013-11-11 14:45:58 -08:00
Jakob Gillich
a20d2f3f82 Show "Write a new Post" message when there are no posts 
closes #1308
 2013-11-11 22:14:01 +01:00
Jacob Gable
38ced35054 Allow published_at times to be specified 
Fixes #907

- Modified the PostSettings view to use moment.js formats that include hours and minutes
- Add 12:00 to value if it is not specified
 2013-11-11 14:43:47 -06:00
Hannah Wolfe
e995b95e6a Merge pull request #1331 from zacgeis/dirtymessage-fix 2013-11-11 09:42:35 +00:00
Hannah Wolfe
3df01ab2c7 Preventing incorrectly shown unload alert 
issue #1327

- IE9 fires an unload when using Backbone.history.navigate which meant the alert always got shown on first save when the url changes from from /editor/ to /editor/id. Not sure if other browsers do this, but this workaround fixes it
 2013-11-11 09:36:29 +00:00
Hannah Wolfe
5b230d6013 Moving dirty editor handling out of uploadMgr 
issue #1327

- just moved to be in editor obj, everything else is the same
 2013-11-11 09:14:18 +00:00
Zach Geis
b70b712c97 Displays alert if editor is dirty before unload 
closes #1327
- Prevents user from accidently losing changes
 2013-11-11 09:00:15 +00:00
Fabian Becker
2da011a834 Fix page errors during builds. 
fixes #1434
 2013-11-10 23:46:09 +00:00
John O'Nolan
cf7b03bfff Kill iCheck cause Hannah says it has genital warts. 2013-11-08 14:38:23 +01:00
Fabian Becker
b5c8789c54 Properly format publish date. 
fixes #1335
 2013-11-05 17:44:13 +00:00
John O'Nolan
650eee85ab Make webkit autocomplete login styles less heinous 
Fixes #771
 2013-11-03 09:29:59 +01:00
Hannah Wolfe
dfa75f0c74 Merge pull request #1345 from halfdan/944-crazy-notifications 
Fix notification stacking.
 2013-11-01 09:00:56 -07:00
Ben Gladwell
b809bdbe1c Remove unparam:true from jslint config in Gruntfile.js 
issue #1365
- added /*jslint unparam:true*/ to functions where absolutely necessary
- added /*jslint unparam:true*/ to functions in which keeping parameter
  list added clarity to the underlying api, even when those parameters
  are not currently used
- removed unused parameters in a few places
 2013-10-31 14:02:34 -04:00
John O'Nolan
d08f0ab7b7 Improved image cancel button 
* Removed duplicate references
* Adjusted hover styles
* Imroved visibility of icon on dark images
 2013-10-30 14:35:24 +01:00
John O'Nolan
329359a6b7 Fix bug where image-delete icon was on top of floating headers 2013-10-30 14:20:44 +01:00
Tony Gaskell
1569c46eea Allow user to set static page before saving 
fixes #1350
- jQuery event.preventDefault() stops the user from selecting the checkbox
 2013-10-30 02:33:58 -10:00
Fabian Becker
c4e5991687 Fix notification stacking. 
fixes #944
 2013-10-30 01:24:21 +00:00
Hannah Wolfe
bd4a227f57 Merge pull request #1301 from ErisDS/js-build-warn 
Adding a warning message if js is not built
 2013-10-28 15:24:19 -07:00
Fabian Becker
83595b9ca8 Allow user to mark a post as static page 
- Increased post-settings width to properly display "Static Page"
- Changed templates to display "Static Page" if set
- Added unit test for body_class helper

fixes #969
 2013-10-28 22:01:03 +00:00
John O'Nolan
ca224ecda4 Updated Breakpoint Sass 1.3.0 => 2.0.6 2013-10-27 16:25:26 +01:00
Hannah Wolfe
949bc5aa21 Adding a warning message if js is not built 
closes #1205
 2013-10-27 15:16:34 +00:00
Hannah Wolfe
589cfc98df Merge pull request #1283 from halfdan/prevent-drop-event 
Prevent default drag/drop action.
 2013-10-26 08:34:07 -07:00
Hannah Wolfe
2908c81843 Merge pull request #1279 from willglynn/code_wrap 
<code>/<tt> elements should wrap since they're used inline
 2013-10-26 07:45:26 -07:00
Fabian Becker
b0ec81d51e Prevent default drag/drop action. 2013-10-25 20:19:51 +00:00
Hannah Wolfe
4eebe20329 Merge pull request #1164 from halfdan/1162-unpublished-posts 
Unpublished Post should not be accessible
 2013-10-25 13:18:39 -07:00
Will Glynn
361195dd88 <code>/<tt> elements should wrap since they're used inline 2013-10-25 08:48:57 -05:00
Fabian Becker
c008312670 Unpublished Post should not be accessible 
fixes #1162
 2013-10-24 21:29:10 +00:00
Hannah Wolfe
6c52422777 Merge pull request #1122 from gotdibbs/Issue814 
Simplify publish date checks
 2013-10-24 10:53:55 -07:00
Hannah Wolfe
11da233015 Merge pull request #1258 from gotdibbs/Issue1242 
Fix duplication of entries in infinite scroll
 2013-10-24 08:17:41 -07:00
Hannah Wolfe
598a5ccdcd Merge pull request #1251 from sebgie/api-refactor-move 
Move /api to /ghost/api
 2013-10-24 07:52:49 -07:00
Hannah Wolfe
edc783f44d Merge pull request #1245 from StevenMcD/issue/1007 
Issue/1007: Corrected the behaviour of the HOME and END keys on the Code...
 2013-10-24 07:24:41 -07:00
Matt DuVall
5413cf0d2d Allow only images to be uploaded in the upload modal 
Fixes #1221

- This changes the accepted encodings on the files upload input field to
  be only "image/*" now
-
 2013-10-24 14:37:08 +01:00
Sebastian Gierlinger
f460d77307 Move /api to /ghost/api 
closes #1249
- changed routes
- changed apiRoots
 2013-10-24 14:50:17 +02:00
William Dibbern
4632c073ba Fix duplication of entries in infinite scroll 
Fixes #1242

- Switched to render each new item as its added to the collection when
retrieving via scroll checks.
- Added check to remove all subviews whenever `render` is called on
`ContentList` as a preventative measure.
- Cached the jquery reference to the ordered list in `render`.
 2013-10-24 01:19:09 -05:00
Fabian Becker
1f3221fc20 Fixed style of modal in preview. 
fixes #1179
 2013-10-23 21:13:29 +01:00
StevenMcD
59295487dc Issue/1007: Corrected the behaviour of the HOME and END keys on the CodeMirror editor by overriding their calls in the extraKeys config of the editor 2013-10-23 15:56:53 +02:00
Matthew Harrison-Jones
877bddf897 Removed special character from SCSS 
Replaced it with the escaped unicode version (\21AA).
 2013-10-23 11:38:57 +01:00
Enrique Chavez
ec84ea1232 Validate negative numbers in the posts per page setting 
issue #1236
- added validation to not allow number less than 0
 2013-10-22 23:15:38 +01:00
Hannah Wolfe
9dda7e6c7b 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
andy matthews
1af54a15b8 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
8edaef35c6 Show proper error message when image upload fails 
fixes #994
 2013-10-22 21:08:26 +00:00
Hannah Wolfe
9bf0f5a2aa 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
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