Commit Graph

1899 Commits

Author SHA1 Message Date
Hannah Wolfe
ccaceb7310 Renamed client-side admin url helper
fixes #2254

- includes test
2014-02-25 06:44:06 +00: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
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
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
Hannah Wolfe
6af7d8fa3f Merge pull request #2205 from ErisDS/theme-debug
A first step towards theme debugging
2014-02-19 18:49:50 +00:00
Hannah Wolfe
fe34ced41d Merge pull request #2218 from hswolff/npm-package-updates
Fix package.json scripts to be more in line with
2014-02-19 18:48:40 +00:00
Sam Saccone
d9e7a05fbc Show parse error message during a failed import
adds support for outputting error message during a failed JSON.parse
This will help people identify the problem with their JSON source
and hopefully be able to aid them in resolving said issue.
2014-02-19 11:52:35 -05:00
Hannah Wolfe
f273e17e08 Merge pull request #2169 from sebgie/issue#1655
Improvements for models
2014-02-19 15:48:15 +00:00
Sebastian Gierlinger
ea6c601b01 Improvements for models
#closes #1655
- removed models as parameter for bookshelf-session
- changed to read permittedAttributes from schema.js
- changed updateTags to be executed at saved event
- added validate to execute after saving event
- added test for published_at = null (see #2015)
- fixed typo in general.hbs
2014-02-19 14:57:26 +01:00
Hannah Wolfe
f1beea09df Merge pull request #2219 from kennym/patch-1
Un-break Markdown syntax
2014-02-19 09:32:19 +00:00
Kenny Meyer
9b469e0336 Un-break Markdown syntax
Remove a superfluous "*" in the README
2014-02-19 01:03:17 -08:00
Harry Wolff
928b562948 Fix package.json scripts to be more in line with
expected behavior of npm packages

fixes #1053

- updates travis config to be more in line with
 current dev steps

- fix `grunt-cli` warning from appearing when
 running grunt
2014-02-18 22:53:21 -05:00
Hannah Wolfe
e81924282c Merge pull request #2190 from sebgie/issue#2171
Make session expiry less arsey
2014-02-18 22:05:44 +00:00
Hannah Wolfe
1eac0bd25d Merge pull request #2189 from halfdan/2112-tag-helpers
Helper updates for Tag Pages
2014-02-18 21:14:51 +00:00
Hannah Wolfe
6992e990dc Merge pull request #2185 from hswolff/tag-pages
Adds tag pages
2014-02-18 20:59:10 +00:00
Harry Wolff
9ab4b7d4d5 Adds tag pages
fixes #2111

- modified Post model to support a tag query
  param that will filter the desired post collection
  to only include posts that contain the requested tag

- in the updated Post model it includes the Tag model
  under a nested object called 'aspects'

- added tests for updated Post model, updating
  test utils to add more posts_tags relations

- adds two new routes to frontend,
  one for initial tag page,
  another to page that tag page

- for tag pages the array of posts
  is exposed to the view similarly
  to the homepeage

- on the tag view page the information
  for the tag is also accessible
  for further theme usage

- the tag view page supports a hierarchy of
  views, it'll first attempt to use a tag.hbs
  file if it exists, otherwise fall back
  to the default index.hbs file

- modified pageUrl and pagination helper
  to have it be compatible with tag paging

- added unit tests for frontend controller

- added unit tests for handlebar helper modifications

- add functional tests for new tag routes
2014-02-18 15:10:02 -05:00
Hannah Wolfe
3966391d9b Merge pull request #2215 from PaulAdamDavis/master
Fix input:focus border issues from #2088
2014-02-18 17:40:52 +00:00
Paul Adam Davis
572dc0c2d6 Fix input:focus border issues from #2088 2014-02-18 16:59:01 +00:00
Hannah Wolfe
4349cb3018 Merge pull request #2210 from halfdan/use-lodash-extend
Remove unneeded extend implementation.
2014-02-18 15:47:09 +00:00
Hannah Wolfe
679f65c50a Fix incorrect test name 2014-02-17 23:00:35 +00:00
Fabian Becker
6083cfcd85 Remove unneeded extend implementation.
refs #2179, #2156
- Replace extend with _.extend
2014-02-17 16:34:24 +00:00
Hannah Wolfe
173e60caba Merge pull request #2173 from halfdan/2103-connect-logging
Add logging config option
2014-02-16 19:59:32 +00:00
Hannah Wolfe
5124951e50 Merge pull request #2156 from javorszky/iss2081
Added package.js support for themes (and plugins)
2014-02-16 19:31:44 +00:00
Hannah Wolfe
8e78f79f9e A first step towards theme debugging
issue #2204
- allow handlebars log helper to output to console in dev mode
2014-02-15 20:46:44 +00:00
Sebastian Gierlinger
d3c641ea31 Make session expiry less arsey
closes #2171
- added authentication middleware
- removed authentication from routes
- moved authentication before CSRF validation
- moved caching rules before authentication
- changed/added test
2014-02-14 11:00:11 +01:00
Hannah Wolfe
b6b94a75d1 Merge pull request #2155 from halfdan/2127-express-fix
Update express-hbs to fix block helper issue.
2014-02-14 09:30:29 +00:00
Gabor Javorszky
212711d896 Added package.js support for themes (and plugins)
Closes #2081
* Amended require-tree to populate availableThemes and availablePlugins to use full file names (`basename.ext`) as keys instead of just basename. This way `image.jpg`, `image.png`, `image.gif` won't overwrite the `image` key.
* Amended require-tree to allow package.json file parsing to return the contents of the file as json on the `package.json` key.
* settings api populates theme data `package` if it exists. Otherwise it assigns `false` to it
* `general.hbs` (salute) was reworked to if there is the package key on the theme is not false, it will use the `name` and `version` keys of that. You can break it by not having a `name` or `version` in the package.json file.
* Added error and warning messages for package.json file parse errors and misses
2014-02-13 23:57:58 +00:00
Fabian Becker
24853c261b Update express-hbs to fix block helper issue.
fixes #2127
- Update express-hbs to 0.7.9
2014-02-13 18:32:28 +01:00
Fabian Becker
1124d9e4c0 Helper updates for Tag Pages
fixes #2112
refs #1833

- modified config.urlFor to handle tag pages

- modified {{#tags}} handlebars helper to autolink to
  tag pages. Additional autolink="false" parameter can
  be used to deactivate autolinking

- modified url handlebars helper to handle tags

- added isTag function to schema

- added unit test for additional urlFor functionality

- added unit test for {{#tags}} helper modifications

- added unit test for url handlebards helper
2014-02-13 18:32:08 +01:00
Hannah Wolfe
6b82bebd90 Merge pull request #2176 from ErisDS/issue-1053
Update to `npm install` command
2014-02-13 15:16:36 +00:00
Hannah Wolfe
b05dd64cae Update to npm install command
fixes #1053

- npm install doesn't need a path to grunt, and fails on Windows if it has one
- submodule update is handled by grunt (albeit badly... but let's fix that!)
2014-02-11 17:24:19 +00:00
Fabian Becker
691e9e773b Add logging config option
closes #2103
- Deactivate logging for testing environments
- Override logging with settings from config
2014-02-10 21:07:11 +00:00