Commit Graph

5567 Commits

Author SHA1 Message Date
Hannah Wolfe
5a1893d64b Merge pull request #5953 from kevinansfield/fix-invite-revoke
Fix "revoke invite" feature on /team page
2015-10-21 17:56:59 +01:00
Hannah Wolfe
649cd489b9 Merge pull request #5952 from kevinansfield/tag-settings-ui
Minor tag settings validation updates & fixes
2015-10-21 17:40:53 +01:00
Hannah Wolfe
b2ada638c5 Merge pull request #5897 from kevinansfield/fix-cover-post
Fix empty image when navigating to new editor from an editor with image
2015-10-21 17:39:18 +01:00
Delgermurun
b37c0f2e91 Apply pipeline to db api endpoint
refs #5508
- adds pipeline to export, import and delete all methods
2015-10-21 09:33:31 +08:00
Hannah Wolfe
a4cadd50bb Merge pull request #5975 from kevinansfield/bump-ember-tests-timeout
Increase timeout in ember tests
2015-10-20 19:17:36 +01:00
Kevin Ansfield
2839dbc420 Increase timeout in ember tests
no issue
- increases individual test timeout from 5sec to 15sec

It seems Travis is occasionally _very_ slow and will timeout on heavier acceptance tests resulting in random failures. Hopefully this will reduce the number of random test failures we see.
2015-10-20 16:00:16 +01:00
Kevin Ansfield
839ba6300e Merge pull request #5974 from acburdine/issue-5973
Fix session data loading in settings/labs
2015-10-20 14:11:43 +01:00
Austin Burdine
bf0a20c1e8 fix session data loading in settings/labs
closes #5973
- updating session data loading to new esa 1.0 api
2015-10-20 07:50:41 -05:00
Kevin Ansfield
d49991f8fc Fix empty image when navigating to new editor from an editor with image
closes #5840
- calls `reset()` on the uploader when re-rendered with a blank image
- calls `reset()` and `initWithImage()` on the uploader when re-rendered with an image and the uploader is still in the "blank" state
2015-10-19 11:55:31 +01:00
Kevin Ansfield
fd73ca72cd Minor tag settings validation updates & fixes
refs #5845
- add tests for `tag-settings` validator
- add validation for tag slug length
- fix display of error message when saving tag fails on the server
- add max chars text to description char count, remove error message as the count/input colour already indicates an error
2015-10-19 10:45:41 +01:00
Kevin Ansfield
5d7ca080c9 Merge pull request #5955 from acburdine/esa-1.0
deps: ember-simple-auth@1.0.0
2015-10-19 10:40:35 +01:00
Sebastian Gierlinger
b9daff6932 Merge pull request #5960 from JohnONolan/emailerror
Email error message cleanup
2015-10-19 10:30:30 +02:00
Austin Burdine
87e54c0d54 deps: ember-simple-auth@1.0.0
closes #5951
- update to esa 1.0
2015-10-18 13:17:02 -05:00
Kevin Ansfield
afa0058f04 Merge pull request #5959 from JohnONolan/pwreset
Fix broken active state on password reset button
2015-10-18 13:11:27 +01:00
Sebastian Gierlinger
c6b505569b Merge pull request #5963 from ErisDS/auth-strategy-refactor
Auth strategy refactor
2015-10-18 11:56:47 +02:00
Austin Burdine
a8de01848f set the settings-menu max width for mobile devices < 350px wide
fixes #5933
- sets the max-width of the settings-menu to 100%
2015-10-17 09:08:10 -05:00
Hannah Wolfe
2c51a89b66 Refactor auth-strategies to use findOne
- Simplifies both strategy & test code
- Should have no side effects
2015-10-16 19:40:02 +01:00
Hannah Wolfe
58e31f3bd8 Refactor auth strategy tests to not use DB
- unit tests are not intended to call out to the db
- this fakes the response from the model layer
2015-10-16 19:40:01 +01:00
Sebastian Gierlinger
0a1e17ac33 Merge pull request #5962 from ErisDS/rss-update
deps: rss@1.2.0
2015-10-16 19:42:22 +02:00
Hannah Wolfe
106dcb77be deps: rss@1.2.0
- Required test fix, as newline has been removed from the end of the <?xml decl
2015-10-16 17:53:22 +01:00
Sebastian Gierlinger
d8272e4b03 Merge pull request #5954 from ErisDS/deps
Dependency updates
2015-10-16 13:51:09 +02:00
John O'Nolan
cd8544858a Email error message cleanup 2015-10-16 12:07:09 +02:00
John O'Nolan
f19fd3ba80 Fix broken active state on password reset button 2015-10-16 11:32:02 +02:00
Hannah Wolfe
6e446a2b09 deps: validator@4.1.0 2015-10-15 19:01:00 +01:00
Hannah Wolfe
10b12ba3ef deps: unidecode@0.1.7 2015-10-15 18:49:07 +01:00
Hannah Wolfe
c2008aad42 deps: sqlite3@3.1.0 2015-10-15 18:43:13 +01:00
Hannah Wolfe
c34d042e44 deps: semver@5.0.3 2015-10-15 18:39:13 +01:00
Hannah Wolfe
24a9a05c6f deps: request@2.65.0 2015-10-15 18:30:22 +01:00
Sebastian Gierlinger
611f1e969b Merge pull request #5619 from ErisDS/issue-4439-get
The {{#get}} helper
2015-10-15 16:21:37 +02:00
Hannah Wolfe
2e3949fe14 deps: path-match@1.2.3 2015-10-15 14:57:10 +01:00
Hannah Wolfe
e368bd4eab deps: passport@0.3.0 2015-10-15 14:53:47 +01:00
Hannah Wolfe
babafc2eb0 deps: morgan@1.6.1 2015-10-15 14:20:20 +01:00
Hannah Wolfe
192af4b4d7 deps: moment@2.10.6 2015-10-15 14:17:07 +01:00
Hannah Wolfe
6d25c81a3d deps: lodash@3.10.1 2015-10-15 14:16:37 +01:00
Hannah Wolfe
a188c0a9ca deps: html-to-text@1.3.2 2015-10-15 14:14:55 +01:00
Hannah Wolfe
91e414c2be deps: glob@5.0.15 2015-10-15 14:14:55 +01:00
Hannah Wolfe
b2e54f5d37 deps: fs-extra@0.24.0 2015-10-15 14:14:55 +01:00
Hannah Wolfe
641b6d18e7 deps: extract-zip@1.1.1 2015-10-15 14:14:54 +01:00
Hannah Wolfe
06de243efa deps: express@4.13.3 2015-10-15 14:14:54 +01:00
Hannah Wolfe
1a1868c423 deps: cookie-session@1.2.0 2015-10-15 14:14:54 +01:00
Hannah Wolfe
5f3b80fd08 deps: compression@1.6.0 2015-10-15 14:14:54 +01:00
Hannah Wolfe
172c6bd2a7 deps: chalk@1.1.1 2015-10-15 14:14:53 +01:00
Hannah Wolfe
877d314552 deps: busboy@0.2.11 2015-10-15 14:14:53 +01:00
Hannah Wolfe
ea4c6a63b7 deps: body-parser@1.14.1 2015-10-15 14:14:53 +01:00
Hannah Wolfe
cdb659d542 deps: bluebird@2.10.2 2015-10-15 14:14:53 +01:00
Hannah Wolfe
aed8717890 deps: bcryptjs@2.3.0 2015-10-15 14:14:52 +01:00
Kevin Ansfield
dd85bdc9d4 Fix "revoke invite" feature on /team page
refs #5947
- override the `findRecord` method of the user adapter to always include "status=all" when querying by ID
2015-10-15 12:45:48 +01:00
Sebastian Gierlinger
678ca9a574 Merge pull request #5949 from ErisDS/frontend-refactor1
Frontend controller refactor & test improvements
2015-10-15 13:16:35 +02:00
Hannah Wolfe
c8bb6081ab Frontend controller refactor & test improvements
no issue

- Split context out of frontend controller
- Add 100% test coverage for context
- Add tests for preview & improve other bits of coverage
- Further refactors (WIP) will make it easier to reach 100% coverage on the frontend
2015-10-15 10:17:42 +01:00
Hannah Wolfe
a28029afad Merge pull request #5950 from kevinansfield/fix-jscs
Fix "Unsupported rule: jsDoc" when linting
2015-10-15 09:32:44 +01:00