Commit Graph

1928 Commits

Author SHA1 Message Date
Brian White
a2074d310c Update busboy to v0.2.3 2014-03-01 20:37:15 -05:00
Hannah Wolfe
b84c8a4726 Merge pull request #2297 from javorszky/iss2296
Update link to clean up history in contributing.md
2014-03-01 10:17:47 +00:00
Hannah Wolfe
055237b8f2 Merge pull request #2295 from seanhellwig/issue2290
Add plugin icons to Apps menu item in Ghost settings
2014-03-01 10:11:42 +00:00
Sean Hellwig
561ea0edbb Add plugin icons to Apps menu item in Ghost settings
closes #2290
- added css entry in settings.scss for to display plugin icon for apps menu item
- remove unused css entry for .plugins in settings.scss
2014-03-01 01:13:19 -08:00
Gabor Javorszky
b461cc6138 Update link to clean up history in contributing.md
Fixes #2296
Also replaces line endings, not sure why (tried with all the settings,
git would just not have it)
2014-03-01 08:57:14 +00:00
Hannah Wolfe
708ba6f8b0 Merge pull request #2220 from sebgie/issue#1401
Add validation from schema.js
2014-02-28 23:04:04 +00:00
Hannah Wolfe
35ad5e6e5e Merge pull request #2280 from sebgie/api-cleanup 2014-02-28 22:50:59 +00:00
Sebastian Gierlinger
7155d95f9d Add JSON API tests & cleanup
first 10 % of #2124
- added initial version of JSON API tests
- renamed error.errorCode to error.code
- renamed tags.all to tags.browse for consistency
2014-02-28 22:26:03 +00:00
Hannah Wolfe
d996ff68e7 Merge pull request #2284 from sebgie/issue#1654
Remove res.redirect from db.exportContent
2014-02-28 21:30:58 +00:00
Hannah Wolfe
028d396185 Merge pull request #2266 from sebgie/issue#2244
Fix problems from importing 0.4.0 file
2014-02-28 21:20:42 +00:00
Hannah Wolfe
ea7385abbc Merge pull request #2243 from hswolff/custom-page-templates
Custom Page Templates
2014-02-28 19:58:35 +00:00
Hannah Wolfe
9fc0116dd8 Merge pull request #2247 from javorszky/iss2083 2014-02-28 14:15:59 +00:00
Gabor Javorszky
667888aeb3 Implements Initial lifecycle and App UI start
Closes #2083

* Added hbs template for apps listing
* Added settings to read the activeApps
* Added viewcontrol to activate / deactivate apps
* Added API handler to store activeApps (by `name` in the `package.json` file)
* On button click it turns the button into "Working" and changes class to `button` (grey one)
* On success, rerenders the pane, adds success notification about apps being saved
* On error, rerenders the pane, adds error notification with error message

Missing:
* tests: couldn't figure out how to add mock apps with mock package.json data
* actually registering, etc, re #2140
* icon from the sidebar
2014-02-28 14:06:36 +00:00
Hannah Wolfe
c64148f361 Merge pull request #2256 from caerphoto/1795-typography
Add support for typographically-correct punctuation
2014-02-28 10:49:06 +00:00
Andy
b49f10c33d Add support for typographically-correct punctuation
Closes #1795
- Added typography.js Showdown extension
- Updated RSS test to support new typographic quotes
2014-02-28 09:44:08 +00:00
Hannah Wolfe
36102d4f9f Merge pull request #2246 from knunery/issue#1432
Fixes client side bio character counter.
2014-02-27 16:02:13 +00:00
Hannah Wolfe
895180fbf0 Merge pull request #2252 from jondavidjohn/from-address-default
Change fallback from address to webmaster@[blog.url]
2014-02-27 15:56:46 +00:00
Sebastian Gierlinger
67611045e7 Remove res.redirect from db.exportContent
closes #1654
- added frontend route /ghost/export/
- removed request handling from API
2014-02-27 16:48:38 +01:00
Hannah Wolfe
5524787509 Merge pull request #2153 from halfdan/2115-has-block-helper 2014-02-27 11:37:01 +00:00
Fabian Becker
12f8f99088 Implements the #has Block helper
closes #2115
- Added new #has block helper
- Added several tests for #has helper
2014-02-27 11:16:21 +00:00
Hannah Wolfe
7a6f4811f6 Merge pull request #2258 from ErisDS/admin-ctrl-cleanup
Cleanup naming & order in admin controller
2014-02-26 22:14:43 +00:00
John O'Nolan
fb917c8baa ReadMe Improvements
SEMANTICS ALL UP IN THIS WHAT
2014-02-26 22:19:32 +01:00
Sebastian Gierlinger
ae06239834 Fix problems from importing 0.4.0 file
fixes #2244
- added mysql ‚true’/‚false‘ values as ‚0‘/‚1‘
- removed all core settings from import
2014-02-25 20:15:32 +01:00
Hannah Wolfe
310fcab7ed Cleanup naming & order in admin controller
no issue

 There seemed to be no convention or order to the functions in the admin controller, so I have:
 - organised them
 - reordered them
 - added a small doc-block
 - reordered some routes
 - updated tests accordingly
2014-02-25 10:51:12 +00:00
Hannah Wolfe
aa15b464c8 /ghost/reset/* should not redirect to signin
fixes #2257
2014-02-25 10:44:16 +00:00
Hannah Wolfe
ccaceb7310 Renamed client-side admin url helper
fixes #2254

- includes test
2014-02-25 06:44:06 +00:00
Jonathan Johnson
917eca3244 Change fallback from address to webmaster@[blog.url]
This change is needed because the previous default of the user's email
address is too often mismatched against the site domain, triggering spam filters.

Fixes #2145
- added `fromAddress()` to GhostMailer to handle this logic
- added unit tests to `mail_spec.js`
2014-02-24 20:28:37 -07:00
Hannah Wolfe
2246b8a803 Cleaning up unused blocks 2014-02-24 17:43:24 +00:00
Hannah Wolfe
f1ecfbb491 Fixing config unit test for Windows 2014-02-24 16:39:07 +00:00
Hannah Wolfe
eec07a5306 Merge pull request #2239 from hswolff/package-json-updates
Update package.json for publishing to npm
2014-02-24 14:54:20 +00:00
Hannah Wolfe
1a7bf7a9fc Merge pull request #2241 from bdougherty/issue2027
Update delete all content button labels
2014-02-24 14:13:27 +00:00
Kyle Nunery
6e1d5e8e0d Fixes client side bio character counter.
closes #1432
2014-02-23 16:16:45 -06:00
Harry Wolff
d7815f4dff Update package.json for publishing to npm
address #2078

- removes private: true flag from package.json
- created .npmignore file and moved all of buildGlob
 file patterns into here, negating all patterns as
 the npmignore file defines what is to be excluded
 and not included.
- gruntfile now uses the inverse of the .npmignore file
 to define what files to include in a release
2014-02-23 09:38:47 -05:00
Harry Wolff
2cb02b55e1 Custom Page Templates
fixes #1969

- creates new ./server/helpers/tempalte.js method
 which returns the correct view to use when rendering

- updates fronted controller to check if a custom page template
 exists and if so then uses that to render the static page

- adds additional class name to body_class helper when
 a custom page template is being rendered

- adds tests to address all new features
2014-02-22 21:17:02 -05:00
Brad Dougherty
64840cf042 Update delete all content button labels
issue #2027
2014-02-22 14:13:51 -05:00
Hannah Wolfe
4b64336119 Merge pull request #2226 from bdougherty/delete-post-fix
Update delete post button labels
2014-02-22 20:04:20 +01:00
Brad Dougherty
ccc499f0e2 Update delete post button labels
Closes #2027
2014-02-22 12:09:53 -05:00
Hannah Wolfe
54f0c3993f Merge pull request #2236 from sebgie/issue#2234
Fix importer adds the same tags to every post
2014-02-22 16:39:40 +00:00
Sebastian Gierlinger
b1c35a9b6c Fix importer adds the same tags to every post
fixes #2234
- updateTags used tags that were overwritten by an async operation
2014-02-21 22:54:56 +01:00
Hannah Wolfe
819d82ac9e Merge pull request #2222 from knunery/issue#2216
Updated pageUrl helper to page_url
2014-02-20 21:56:01 +00:00
Kyle Nunery
89cd1a3640 Updated pageUrl helper to page_url
issue #2216
2014-02-20 15:29:14 -06:00
Hannah Wolfe
7c2fd9fde8 Merge pull request #2228 from PaulAdamDavis/master
Fix Firefox <select> height issue
2014-02-20 19:17:58 +00:00
Hannah Wolfe
23bc9413e6 Merge pull request #2224 from mjbshaw/useless-regex
Remove useless regex for redirecting /ghost -> /ghost/
2014-02-20 18:51:28 +00:00
Hannah Wolfe
f2d2757a31 Merge pull request #2223 from mjbshaw/fix-subdir
Respect subdirectory in authenticate middleware
2014-02-20 18:51:11 +00:00
Michael Bradshaw
b410f5833b Respect subdirectory in authenticate middleware 2014-02-20 09:46:20 -07:00
Paul Adam Davis
2581fb1822 Fix Firefox <select> height issue
closes #1109
- Use moz-specific selector to make <select> elements use auto height
2014-02-20 12:16:43 +00:00
Michael Bradshaw
cb6d0d8dfe Remove useless regex for redirecting /ghost -> /ghost/ 2014-02-19 18:19:42 -07:00
Hannah Wolfe
a791db1779 Merge pull request #2221 from samccone/sjs/clean-up-mobile-actions
abstract mobile interactions js
2014-02-19 21:14:27 +00:00
Hannah Wolfe
bee5bde491 Merge pull request #2071 from samccone/sjs/show-error-on-import-failure
Show parse error message during a failed import
2014-02-19 20:56:01 +00:00
Sam Saccone
43dc4da7e2 abstract mobile interactions js
DRY up repeated code and simplify logic.
2014-02-19 15:52:37 -05:00