TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-15 03:12:54 +03:00
Code Issues Projects Releases Wiki Activity
1,082 Commits 253 Branches 1,686 Tags 364 MiB
2ee8f96829
Commit Graph

1082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Harrison-Jones
44deb1c0df Bug Fix: Action modals now have centered content and correct spacing 
This also adds functionality to Modals, so they can have multiple
styles, e.g 'wide' and 'centered'.
 2013-09-06 15:36:16 +01:00
Hannah Wolfe
75a58bcd1e Updating express-hbs to latest 
closes #630
 2013-09-06 13:33:46 +01:00
Sebastian Gierlinger
27ba9289d6 Add setting for posts per page 
closes #593
- added default setting of 6 posts per page
- added posts per page to settings page
- added limit to frontend.js (setting does not change API behavior)
 2013-09-05 14:56:09 +02:00
Hannah Wolfe
5bae29a0db Merge branch 'master' into migrations-003 
Conflicts:
	core/server/data/migration/index.js
	core/server/models/post.js
 2013-09-05 12:40:43 +01:00
Hannah Wolfe
0f70007028 Merge pull request #629 from matthojo/Scroll-Shadows 
Fixed scroll shadows not appearing
 2013-09-05 03:09:24 -07:00
Hannah Wolfe
d3d5d2f71e Merge pull request #561 from matthojo/User-Settings-Fixes 
Design fixes for the user settings panel
 2013-09-05 03:05:22 -07:00
Matthew Harrison-Jones
61ac9f7284 Design fixes for the user settings panel 
* Bio field now counts down.
* Bio filed count now turns red when < 20
* Cover image now has gradient
* Change button now has square corners
* Removed "forgot password" link
* Change password button is now red
* Change password button is now aligned with the form
* Hover state on the profile picture now reads "Edit Picture"
 2013-09-05 10:00:52 +01:00
Hannah Wolfe
6cb7252978 Merge pull request #617 from cobbspur/dropzone2 
Adds modal Image uploader on settings page
 2013-09-04 14:55:04 -07:00
cobbspur
e61f3684d5 Adds modal Image uploader on settings page 
issue #432

adds a modal template for image uploads
adds buttons to settings page to upload images for blog logo and icon
once image is uploaded displays an 'X' to reset back to dropzone
saves image and renders settings page.

ToDo

add url field when clicking on url icon

fix position of 'X' for both settings and editor
 2013-09-04 22:03:55 +01:00
Hannah Wolfe
ddcc7b78b6 Removing api calls from server side 
closes #603, issue #395

- Changed hard-coded 'JOE BLOGGS' to use author data
- We still had api calls loading data server side before rendering pages.. which is unnecessary.
- Only thing using this was editor title, which is now populated client side
- May improve content screen load time.
 2013-09-04 21:51:54 +01:00
John O'Nolan
48e45a049b Merge pull request #631 from sethlilly/typos-and-docs 
Corrected typo in code documentation
 2013-09-04 11:33:45 -07:00
Seth Lilly
57e3bed9d9 Corrected typo in code documentation 
Corrected typo in code documentation

-Changed "atricle" to "article"
 2013-09-04 13:45:14 -04:00
Matthew Harrison-Jones
3e3987754a Fixed scroll shadows not appearing 
Implemented scroll classes into a jQuery plugin and fixed shadows not appearing when scrolled
 2013-09-04 17:21:50 +01:00
Hannah Wolfe
362cd425cc Merge pull request #622 from sebgie/bug_set_null 2013-09-04 16:55:47 +01:00
Sebastian
4abaa8ceee Fix for settings view 
no issue
- removed/added availableThemes before/after saving the model
 2013-09-04 16:24:59 +01:00
Hannah Wolfe
c469d05c46 Mail settings are per environment 
closes #624

- example mail setting in development config
- updated mail module & tests
 2013-09-04 16:15:21 +01:00
Hannah Wolfe
c45f911a1e Improving underscore handling 
Additional changes to how underscores are handled.
This more closely matches codemirror, but is still not 100%.
 2013-09-04 15:20:26 +01:00
Hannah Wolfe
21487aa802 Email errors & cleanup 
closes #618

- don't send a welcome email. This appeared to be breaking tests.
- make sure we handle errors from sending emails properly
- use promises when adding notifications
 2013-09-04 15:04:25 +01:00
Hannah Wolfe
6051573d5a Merge pull request #610 from skattyadz/default-settings 2013-09-03 22:59:26 +01:00
Adam Howard
e24b5c3382 Proper settings infrastructure, allowing new features without compromising old data. 
On server load, check for settings which have not been set, and apply a default value to the settings table from a JSON file.
 2013-09-03 22:56:34 +01:00
Hannah Wolfe
978502579f Fixing incorrect stub in mail test 
- This test was failing on macs
 2013-09-03 21:57:39 +01:00
Hannah Wolfe
4059747424 Merge pull request #602 from jgable/fixCtrlS 
Fix Ctrl-S saving
 2013-09-03 13:00:52 -07:00
Hannah Wolfe
d38faddca1 Merge pull request #605 from jgable/settingsBackButton 
Fix settings back button functionality
 2013-09-03 04:20:25 -07:00
Hannah Wolfe
6978dec198 Global settings cleanup 2013-09-03 11:38:10 +01:00
Hannah Wolfe
36874badd5 Merge pull request #587 from javorszky/iss288 
Email sending with Sendgrid plus password reset
 2013-09-02 15:44:48 -07:00
Hannah Wolfe
888cf2131e Merge pull request #585 from cobbspur/dropzone2 
Updates to modals
 2013-09-02 15:36:53 -07:00
Hannah Wolfe
83a4a77703 Updating to Casper 0.9 
Casper has had a lovely redesign & has been updated to use all the new theme helper awesomeness
 2013-09-02 23:24:18 +01:00
Hannah Wolfe
d1db0db073 Merge pull request #614 from ErisDS/theme-globals 
Theme globals
 2013-09-02 15:07:08 -07:00
Hannah Wolfe
552a25018f Absolute option for {{url}} helper 
- pass absolute to {{url}} to get an absolute url rather than a relative one
 2013-09-02 22:06:16 +01:00
Hannah Wolfe
f0cebf9925 Merge pull request #613 from ErisDS/rss-feed-detection 
RSS Feed Autodetection
 2013-09-02 14:04:55 -07:00
Hannah Wolfe
599d233be9 RSS Feed Autodetection 
closes #599

- {{ghost_head}} now outputs feed link tag
 2013-09-02 21:57:26 +01:00
Hannah Wolfe
1ff9550e1f User property aliases 
issue #389

 - Temporary aliases for user model, schema will be changed soon, in the meantime we want themes to be built using the right properties
 2013-09-02 20:58:49 +01:00
Hannah Wolfe
53063366e0 Fallbacks and defaults for {{date}} helper 
closes #608

If no context is specified, falls back to using published_at
If published_at is not available, will output today's date
 2013-09-02 20:58:49 +01:00
Hannah Wolfe
be62a550f9 Global settings for themes 
issue #389

 - Upgrade express-hbs to get template options access
 - Grab config & settings with a hacky new method in ghost & pass to template options
 - Settings are no longer passed to res.locals
 2013-09-02 20:58:49 +01:00
Hannah Wolfe
40c3b7fe31 Merge pull request #612 from cobbspur/bodyclass 
Modified body_class helper
 2013-09-02 12:57:46 -07:00
cobbspur
e43029e894 Modified body_class helper 
closes #591

- body_class helper returns archive-template class on archive pages
- added to unit tests
 2013-09-02 20:13:48 +01:00
Hannah Wolfe
859e20d8a3 Merge pull request #590 from ErisDS/showdown-gfm-fix 
GFM Auto-linking fixes
 2013-09-02 10:58:34 -07:00
Hannah Wolfe
13646f9ef6 Blog URL per environment 
closes #572

 - Moved the siteUrl setting into each individual env config.
 - Updated app start and RSS to use the new config
 2013-09-02 15:50:14 +01:00
Hannah Wolfe
4d4d4ac0e6 Merge pull request #604 from jgable/fixRssLink 
Fix RSS urls
 2013-09-02 07:41:56 -07:00
Hannah Wolfe
56b7f925da Improved theme loading 
- In some cases, Ghost exploded when the active theme did not have a partials directory
- Added handling for if the active theme was not present
- Probably will conflict with #574 I need to fix this.
 2013-09-02 11:35:09 +01:00
Hannah Wolfe
76c2ff6818 Merge pull request #574 from sebgie/issue#488-2 
Adding theme switcher to settings/general
 2013-09-02 03:25:10 -07:00
Jacob Gable
972aeac037 Fix settings back button functionality 
Added a redirect call to the router instead of defaulting the pane. To
handle using the back button after clicking through to other tabs I
added an event listener on the route:settings event.
 2013-09-01 22:54:19 -05:00
Jacob Gable
3d2f03a08f Fix RSS urls 2013-09-01 20:34:26 -05:00
Hannah Wolfe
7570599252 Merge pull request #564 from skattyadz/tags-squashed 
Add post tagging functionality
 2013-09-01 17:50:21 -07:00
Jacob Gable
67901ff699 Fix Ctrl-S saving 
Refactored into separate button handler that passes the status.
Although, it doesn't look like the status is on the button element any
more.
 2013-09-01 19:38:06 -05:00
cobbspur
6caed50915 Updates to modals 
issue #432

- adds configurable button classes
- adds optional title
- added afterRender callback
- changed context for accept and reject methods
 2013-09-01 19:44:31 +01:00
John O'Nolan
d2cafe87b6 Standardising license text. 2013-09-01 17:35:31 +02:00
Hannah Wolfe
684150d36d GFM Auto-linking fixes 
closes #577

- auto-linking was interfering with things that were already a link
- now checks to ensure we are not in a HTML or markdown link already
- added tonnes of new tests
 2013-09-01 16:32:54 +01:00
Gabor Javorszky
5999d01b7d Repaired email sending, implement password reset 
Closes #288
* I use SendGrid for sending the emails, and it works fine (provided you supply the correct credentials in `config.mail` in `config.js`)
* Generates a random 12 char long alphanumeric password, replaces user's pw, and sends an email about it.
 2013-09-01 00:20:12 +02:00
Ricardo Tomasi
56619a87f8 Implement e-mail sending 2013-08-31 22:21:33 +02:00