Commit Graph

4761 Commits

Author SHA1 Message Date
Hannah Wolfe
96a3568c3d Merge pull request #5197 from PaulAdamDavis/new-upgrade-notifications
Move upgrade notification to /settings/about/
2015-05-13 16:47:46 +01:00
Jason Williams
4e3c469ff8 Merge pull request #5268 from ErisDS/issue-5258
Fixing 'undefined' issue with ghostPaths.url.join
2015-05-13 10:16:39 -05:00
John O'Nolan
41db67e96f Merge pull request #5267 from jaswilli/update-deps
Update html-to-text package
2015-05-13 15:21:54 +01:00
John O'Nolan
0ec3bde59c Merge pull request #5263 from harryhope/master
Prevent notifications from overlapping menus
2015-05-13 15:11:57 +01:00
Hannah Wolfe
8db1001d47 Fixing 'undefined' issue with ghostPaths.url.join
closes #5258
2015-05-13 15:08:04 +01:00
Jason Williams
ddd4a9ff6c Update html-to-text package
Closes #5264
- html-to-text@1.3.0
2015-05-13 09:01:06 -05:00
Harry Hope
1fc9ace8e1 move notifications inside main div 2015-05-12 16:35:21 -07:00
Jason Williams
479b977305 Merge pull request #5261 from ErisDS/week-session
Change session length to 7 days
2015-05-12 17:11:22 -05:00
John O'Nolan
e99afc65b6 Merge pull request #5257 from dbalders/labs-input-style
Fix up Labs Styling
2015-05-12 19:07:43 +01:00
John O'Nolan
d7a9e09049 Merge pull request #5230 from iloabn/master
Update text showing the "Quote" feature in the tutorial post
2015-05-12 19:04:28 +01:00
David Balderston
c4e2eadc33 Fix up Labs Styling
No Issue

- Fixes import button not same height as upload button
- Fixes no space between import and upload on mobile
2015-05-11 23:12:31 -07:00
Hannah Wolfe
f6b56ad865 Merge pull request #5255 from JohnONolan/private-styles
First styles for private blog login
2015-05-11 15:57:44 +01:00
John O'Nolan
443eafeeca First styles for private blog login 2015-05-11 13:11:59 +01:00
Hannah Wolfe
37f92674b8 Merge pull request #5253 from jaswilli/roles-browse-filter
Fix up filtering implementation
2015-05-11 09:55:33 +01:00
Hannah Wolfe
79ff297490 Merge pull request #5243 from jaswilli/mail-errors
Check error object before dereference
2015-05-11 09:55:25 +01:00
Jason Williams
263bbd5092 Fix up filtering implementation 2015-05-10 20:48:32 -05:00
Hannah Wolfe
52cce38137 Merge pull request #5244 from jaswilli/autosave-status
Do not allow auto-save to publish a post
2015-05-10 22:13:55 +01:00
Jason Williams
3d74d408ec Do not allow auto-save to publish a post
Refs #5235
- Do not allow background saving (i.e. post auto-save) to affect the
  published status of a post.
2015-05-10 15:22:53 +00:00
Jason Williams
251218de1d Check error object before dereference
Refs #5095
2015-05-10 15:02:09 +00:00
Hannah Wolfe
5525d0ea34 Merge pull request #5232 from jaswilli/pp-fixup
Change payload storage in session cookie
2015-05-09 22:02:43 +01:00
Hannah Wolfe
6239046ae4 Merge pull request #5234 from acburdine/patch-1
Broken link in contributing file
2015-05-09 21:56:47 +01:00
Austin Burdine
2a33dfd611 fixed reduced test case link
No issue
2015-05-08 23:17:17 -06:00
Hannah Wolfe
bdf5c9275f Change session length to 7 days
refs #5202

- this is just a stopgap to deliver minor improvement short term,
- longer term we will do the work to refresh refresh tokens & switch this to a month
2015-05-08 15:54:12 +01:00
Hannah Wolfe
3bb69015c8 Merge pull request #5224 from jaswilli/editorconfig
Add editorconfig
2015-05-07 21:45:16 +01:00
Jason Williams
0741df4736 Add editorconfig 2015-05-07 11:45:16 -05:00
Jason Williams
1e5440664e Change payload storage in session cookie 2015-05-07 13:58:09 +00:00
Fabian Miiro
575d2489a6 Changed the text showing the "Quote" feature to not feature spellcheck errors. closes #5194 2015-05-06 22:20:48 +01:00
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