Commit Graph

4733 Commits

Author SHA1 Message Date
Hannah Wolfe
d3feda719a Merge pull request #5225 from jaswilli/update-deps
Update dependencies
2015-05-06 11:26:14 +01:00
Hannah Wolfe
3b5db4b026 Merge pull request #5226 from jaswilli/update-bluebird
Update bluebird promise library
2015-05-06 11:25:03 +01:00
Jason Williams
5cfc1f8ddd Merge pull request #5222 from rwjblue/guard-against-missing-element
Only attempt to `scrollTop` if element is available.
2015-05-05 20:23:57 -05:00
Jason Williams
25a8f9d963 Update bluebird promise library
No Issue
- bluebird@2.9.25
2015-05-06 00:50:28 +00:00
Jason Williams
181cb780bc Update dependencies
No issue
- express@4.12.3
- moment@2.10.2
- request@2.55.0
- sqlite3@3.0.6
- validator@3.39.0
- (dev) grunt-contrib-jshint@0.11.2
- (dev) grunt-mocha-cli@1.13.0
- (dev) should@6.0.1
2015-05-06 00:27:39 +00:00
Robert Jackson
27e52c8979 Only attempt to scrollTop if element is available.
In later versions of Ember, the views and components can be stable
and are not guaranteed to be torn down before a new controller is
set on them.

In this case, the controller is initially set before the element has been
rendered to the DOM causing errors when invoking `closest` on undefined.
2015-05-05 19:05:36 -04:00
Jason Williams
cc7c5be75b Merge pull request #5220 from ErisDS/api-route-tweak
Remove unneeded code from API route
2015-05-05 15:07:21 -05:00
Jason Williams
d3498483ab Merge pull request #5221 from rwjblue/undefined-this-in-helpers
Replace gh-blog-url helper with a component.
2015-05-05 14:28:52 -05:00
Robert Jackson
b16284f1ed Replace gh-blog-url helper with a component.
Accessing `this` inside an `Ember.HTMLBars.makeBoundHelper` will not
always return the containing `view` object. Instead, use a component.
2015-05-05 14:40:18 -04:00
Hannah Wolfe
15b434df96 Merge pull request #5219 from acburdine/controller-refactor
Frontend Controller Refactor
2015-05-05 18:18:07 +01:00
Austin Burdine
8ac168794e refactors the frontend controller
closes #5192
- combines homepage, author, tag routes into one function (with different hash params)
- provides some abstraction for channels
2015-05-05 07:35:08 -05:00
Hannah Wolfe
95a546171a Remove unneeded code from API route 2015-05-05 12:50:23 +01:00
Jason Williams
2ac3b146b1 Merge pull request #5218 from ErisDS/dep-clean
Removing unused dependency
2015-05-04 17:55:55 -05:00
Hannah Wolfe
3b286e4d00 Removing unused dependency 2015-05-04 23:26:24 +01:00
Hannah Wolfe
6244165841 Merge pull request #5208 from Artie18/master
Fixed issue with word count for non ASCII letters.
2015-05-03 18:23:33 +01:00
Artyom Fedenko
075c4fbf46 Added support for all letters in word-count (not only ASCII) and added xregexp bower module to a project 2015-05-02 22:56:33 +03:00
Hannah Wolfe
7fe63b260f Merge pull request #5103 from acburdine/passprotect
Password Protection
2015-05-02 15:14:00 +01:00
Matt Enlow
81e12a209a Merge pull request #5198 from ErisDS/bower-update
Updating bower dependencies
2015-05-01 22:00:57 +01:00
John O'Nolan
ed3d94e644 Merge pull request #5196 from PaulAdamDavis/minor-code-injection-fixes
Code injection syntax colour change
2015-05-01 15:50:14 +02:00
Hannah Wolfe
ef7492a5c6 Merge pull request #5204 from JohnONolan/preview-link
Minor preview link style amends
2015-05-01 11:51:38 +01:00
John O'Nolan
8e46b06c67 Update preview post link styling, add view post link 2015-05-01 12:19:25 +02:00
Austin Burdine
2865662ee5 added password protection
closes #4993
- brings password protection to the frontend of blogs
- adds testing for password protection
- upgrades bcrypt-js to 2.1.0
2015-04-30 23:44:43 -05:00
Matt Enlow
f4a9f0c82d Merge pull request #5203 from jaswilli/jscs-whitespace
Upgrade grunt-jscs to fix whitespace linting.
2015-05-01 00:04:14 +01:00
Hannah Wolfe
f089e1d544 Updating bower dependencies
- tying as many things to proper versions rather than repos as possible
- upgrading various packages, with the exception of anything to do with jQuery
- leaving normalize as-is due to previous issues
2015-04-30 22:43:31 +01:00
Jason Williams
dae66d00be Upgrade grunt-jscs to fix whitespace linting.
No issue.
- grunt-jscs@1.8.0
- Fix formatting
2015-04-30 16:14:19 -05:00
Paul Davis
3893b18479 Merge pull request #5200 from novaugust/preview_step_1
Add post preview via uuid (/p/:uuid)
2015-04-30 12:48:19 +01:00
Matt Enlow
433956c102 Add post preview via uuid (/p/:uuid)
Refs #5097

- All drafts will show a preview link (this needs real css)
- Published posts will redirect
- prev/next post helpers only activate on published posts
- Powered by ~10 pints between the two of us (@ErisDS, @novaugust)
2015-04-30 11:57:37 +01:00
Paul Adam Davis
9377694bba Code injection syntax colour change
Closes #5179

- Overwrites the yellow code injection syntax highlighting (such as vendor prefixes in CSS) to be black, to match the rest of the property
- Adds rounded corners to the code injection CodeMorror wrapper to match its parents rounded corners (inherits the same value)
2015-04-28 16:35:14 +01:00
Hannah Wolfe
18638d378e Merge pull request #5191 from jaswilli/issue-5155
Allow admin app to run when active theme missing
2015-04-26 08:47:17 +01:00
Jason Williams
5cfb2e701e Allow admin app to run when active theme missing
Closes #5155
- If the theme that has been set to active is missing, set
  a default express-hbs instance on the express app and allow
  middleware processing to continue so that the admin client can
  be accessed.
- Log a warning when this happens.
- Fix issue where frontend error page was not being rendered
  correctly.
2015-04-25 20:00:04 +00:00
Hannah Wolfe
1e6f6237e1 Merge pull request #5184 from lmoe/master
Added res.locals into the prePostsRender filter call
2015-04-24 17:05:40 +01:00
Hannah Wolfe
0623dd49b3 Merge pull request #5189 from Wilhansen/rss-ssl-protocolfix
Provide secure post and image links if RSS accessed over SSL
2015-04-24 16:39:34 +01:00
Wilhansen Li
d02bcbacc2 Provide secure post links if RSS accessed over SSL 2015-04-24 18:20:38 +08:00
Hannah Wolfe
62c60c8834 Merge pull request #5182 from sebgie/update-test-all
Remove lint task from test-all
2015-04-23 11:14:32 +01:00
lmoe
03dcb71b08 Added res.locals into the prePostsRender filter call
closes #2559

 - Added res.locals as a second parameter to the prePostsRender filter
call.
 - This allows accessing the relative url and makes it possible to
react to certain urls.
2015-04-22 23:22:31 +02:00
Hannah Wolfe
d10ae70982 Version bump to 0.6.2 2015-04-22 22:14:03 +01:00
Hannah Wolfe
498a0aaad1 Upgrading Casper to 1.2.2 2015-04-22 22:12:25 +01:00
Hannah Wolfe
3d5fe130c2 Merge pull request #5181 from sebgie/issue#5178
Rename error.type to error.errorType
2015-04-22 22:00:08 +01:00
Sebastian Gierlinger
a0330b2418 Remove task from test-all
no issue
- listing takes like forever and stalls running the tests during
development
- grunt test-all only runs tests, make sure to run grunt validate
before submitting a PR
2015-04-22 22:39:35 +02:00
Sebastian Gierlinger
599af34ba8 Merge pull request #5180 from ErisDS/issue-5177
Fix previous and next helpers
2015-04-22 22:33:47 +02:00
Sebastian Gierlinger
fdcb67d3cc Rename error.type to error.errorType
closes #5178
- renamed error.type to error.errorType
2015-04-22 22:29:45 +02:00
Hannah Wolfe
eb5eca6eda Don't pass helper options to API for next/prev
fixes #5177

- this combined with a change passing options through to toJSON results in a really flukey bug with next/prev
  where the name option from the helper clashes with a name option inside of toJSON
2015-04-22 20:24:22 +01:00
Hannah Wolfe
32125c2f46 Filter options passed to toJSON
fixes #5177

- we now pass API/model options directly to toJSON, which is unsafe as these options haven't always been filtered before they are passed.
- this fix adds a filter so that toJSON only uses the options it needs
- additionally, rename the 'name' option to something more specific to prevent clashes
2015-04-22 20:20:27 +01:00
Sebastian Gierlinger
f94a6be9dd Merge pull request #5176 from ErisDS/travis-test
Switch to using grunt raw on travis
2015-04-22 21:12:45 +02:00
Sebastian Gierlinger
2cc139bb43 Merge pull request #5175 from ErisDS/release-fix
Fix issue with npm-shrinkwrap in release
2015-04-22 20:50:24 +02:00
Hannah Wolfe
509163998b Switch to using grunt raw on travis
- hoping this will fix an issue with builds failing
2015-04-22 19:40:12 +01:00
Hannah Wolfe
7c1159616b Fix issue with npm-shrinkwrap in release
- wrong order of commands prevented shrinkwrap file from being correctly included in zip file
2015-04-22 17:46:26 +01:00
Hannah Wolfe
d480ee4912 Version bump to 0.6.1 2015-04-22 14:31:08 +01:00
Hannah Wolfe
651e88718c Upgrading Casper to 1.2.1 2015-04-22 14:09:52 +01:00
Matt Enlow
fc142b3dff Merge pull request #5161 from ErisDS/test-coverage
Switch test coverage to use Istanbul
2015-04-21 19:14:35 +02:00