TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-19 08:31:43 +03:00
Code Issues Projects Releases Wiki Activity
1,756 Commits 254 Branches 1,686 Tags 374 MiB
951385ec2d
Commit Graph

460 Commits

Author SHA1 Message Date
Hannah Wolfe
01736359ad Content pane update for static pages 
fixes #1350

- no concept of published page
 2013-11-28 10:48:50 +00:00
Fabian Becker
dcd3b192c1 Subdir support for admin interface 
refs #527
 2013-11-27 09:57:38 +00:00
Manuel Gellfart
28c3c5670c 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
d6aa1df49d Merge pull request #1548 from bastilian/improve_image_uploader_ui 
Improve image uploader UI
 2013-11-24 10:07:38 -08:00
Daniel Hanson
03be4abaaa 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
ae31304af0 Merge pull request #1550 from bastilian/fix_1532 
Fix tag input field
 2013-11-23 14:37:30 -08:00
Hannah Wolfe
7db5481f92 Merge pull request #1533 from jgillich/permalinks 
Add Customisable Permalinks
 2013-11-23 14:29:02 -08:00
Sebastian Gräßl
9692f1d577 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
2701f3e664 Merge pull request #1534 from jgable/passwordReset 
Improved Password Reset Tool
 2013-11-23 08:44:08 -08:00
Sebastian Gräßl
bf9b5570a1 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
83d047c0ba Add Customisable Permalinks 2013-11-23 17:02:17 +01:00
Hannah Wolfe
548079ca94 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
6394add9d6 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
34e453039b 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
184d77156a Remove unneccessary type conversion 2013-11-22 17:21:25 +01:00
Hannah Wolfe
10a44799a7 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
20ac198d05 Correct the Markdown for emphasis 2013-11-19 12:59:04 +01:00
Hannah Wolfe
8ec9108558 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
8e9b27f0b5 Remove inline script from default.hbs 
closes #1268
 2013-11-16 18:47:55 +00:00
Michael Bradshaw
0d4283176e Add support for SVG images 2013-11-12 11:37:54 -07:00
Hannah Wolfe
f022e8486d Merge pull request #1446 from JohnONolan/notifications 
Growl style desktop notifications
 2013-11-12 04:15:35 -08:00
Hannah Wolfe
b8a98660fb Merge pull request #1440 from JohnONolan/post-settings 
Post settings refactor
 2013-11-12 03:50:56 -08:00
John O'Nolan
c40357c8cb Growl style desktop notifications 
First pass. See #1349
 2013-11-12 09:58:45 +01:00
John O'Nolan
4ee1b9849b Complete post-settings menu refactor 2013-11-12 09:19:02 +01:00
Hannah Wolfe
e4f2165f0c Merge pull request #917 from jgable/publishedAtTime 
Allow published_at times to be specified
 2013-11-11 14:45:58 -08:00
Jakob Gillich
50510e63fd Show "Write a new Post" message when there are no posts 
closes #1308
 2013-11-11 22:14:01 +01:00
Jacob Gable
38bd71a36c 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
219e9601ed Merge pull request #1331 from zacgeis/dirtymessage-fix 2013-11-11 09:42:35 +00:00
Hannah Wolfe
2c3de67062 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
3fd3102486 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
340206fa4b 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
0faabe9132 Fix page errors during builds. 
fixes #1434
 2013-11-10 23:46:09 +00:00
John O'Nolan
bbc1d0207e Kill iCheck cause Hannah says it has genital warts. 2013-11-08 14:38:23 +01:00
Fabian Becker
f356745b1a Properly format publish date. 
fixes #1335
 2013-11-05 17:44:13 +00:00
John O'Nolan
62416d203a Make webkit autocomplete login styles less heinous 
Fixes #771
 2013-11-03 09:29:59 +01:00
Hannah Wolfe
9b2434be4c Merge pull request #1345 from halfdan/944-crazy-notifications 
Fix notification stacking.
 2013-11-01 09:00:56 -07:00
Ben Gladwell
69d3a1460d 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
9b188e592b 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
376a3ec2b2 Fix bug where image-delete icon was on top of floating headers 2013-10-30 14:20:44 +01:00
Tony Gaskell
404c4fb2e1 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
6de3ef1701 Fix notification stacking. 
fixes #944
 2013-10-30 01:24:21 +00:00
Hannah Wolfe
ddece0464b 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
798e5b1a4e 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
b07facbb70 Updated Breakpoint Sass 1.3.0 => 2.0.6 2013-10-27 16:25:26 +01:00
Hannah Wolfe
6869c01a28 Adding a warning message if js is not built 
closes #1205
 2013-10-27 15:16:34 +00:00
Hannah Wolfe
47e507b37e Merge pull request #1283 from halfdan/prevent-drop-event 
Prevent default drag/drop action.
 2013-10-26 08:34:07 -07:00
Hannah Wolfe
bf06c57746 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
95cbbcf07e Prevent default drag/drop action. 2013-10-25 20:19:51 +00:00
Hannah Wolfe
5c33a707e9 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
1bcb751e29 <code>/<tt> elements should wrap since they're used inline 2013-10-25 08:48:57 -05:00
Fabian Becker
aa5c0cc620 Unpublished Post should not be accessible 
fixes #1162
 2013-10-24 21:29:10 +00:00
Hannah Wolfe
6cd22c306d Merge pull request #1122 from gotdibbs/Issue814 
Simplify publish date checks
 2013-10-24 10:53:55 -07:00
Hannah Wolfe
0333ab7711 Merge pull request #1258 from gotdibbs/Issue1242 
Fix duplication of entries in infinite scroll
 2013-10-24 08:17:41 -07:00
Hannah Wolfe
5b8048506e Merge pull request #1251 from sebgie/api-refactor-move 
Move /api to /ghost/api
 2013-10-24 07:52:49 -07:00
Hannah Wolfe
ebef969f49 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
6dc3e05d21 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
6505986f6b Move /api to /ghost/api 
closes #1249
- changed routes
- changed apiRoots
 2013-10-24 14:50:17 +02:00
William Dibbern
54a6cf79d7 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
fc019fe675 Fixed style of modal in preview. 
fixes #1179
 2013-10-23 21:13:29 +01:00
StevenMcD
2aded98a3c 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
5c7dc88eda Removed special character from SCSS 
Replaced it with the escaped unicode version (\21AA).
 2013-10-23 11:38:57 +01:00
Enrique Chavez
3edd0e118d 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
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
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
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
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
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
Fabian Becker
9a975f5a45 Posts can now be featured by clicking on the star icon 
fixes #1111
 2013-10-16 19:06:03 +00: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
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
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
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
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