2283 Commits

Author SHA1 Message Date
Grzegorz Leoniec
66edec0dc8
Translated shot button 2019-03-05 14:30:02 +01:00
Grzegorz Leoniec
656be9416a
Merge branch 'distinct-shouts-and-follows' of github.com:appinteractive/hc-prototype-api into distinct-shouts-and-follows 2019-03-05 14:18:27 +01:00
Grzegorz Leoniec
45a004662f
Disable shouting of own content 2019-03-05 14:18:22 +01:00
Grzegorz Leoniec
1423101ca5
Disable shouting for own content 2019-03-05 14:18:06 +01:00
Grzegorz Leoniec
ec85602b4f
Merge branch 'master' into distinct-shouts-and-follows 2019-03-05 14:17:25 +01:00
Grzegorz Leoniec
33ef91ee08
Fixed an issue with following state update 2019-03-05 13:47:33 +01:00
Grzegorz Leoniec
e20d3fb214
Improved following button and translated it 2019-03-05 13:43:09 +01:00
Robert Schäfer
979c7d4a18
Merge pull request #206 from Human-Connection/dependabot/npm_and_yarn/eslint-5.15.1
Bump eslint from 5.15.0 to 5.15.1
2019-03-05 13:03:27 +01:00
Grzegorz Leoniec
c27204d56e
Merge branch 'master' into distinct-shouts-and-follows 2019-03-05 12:54:24 +01:00
Grzegorz Leoniec
975c0c80f9
Added unshout functionality to shout button 2019-03-05 12:53:46 +01:00
Grzegorz Leoniec
30e7c57764
Fixed shout and follow behavior 2019-03-05 11:39:55 +01:00
Grzegorz Leoniec
dc13467294
Use new follow mutation 2019-03-05 11:21:19 +01:00
Grzegorz Leoniec
c40f6521d1
Use new shout mutation 2019-03-05 11:19:23 +01:00
Grzegorz Leoniec
d7b1ea88c4
Fixed shouts and follows 2019-03-05 11:18:59 +01:00
Matt Rider
8633f62a39 Modify test importing our styleguide 2019-03-05 07:10:48 -03:00
Matt Rider
1ac2c15947 Merge branch '37-full-text-search-top-bar' of github.com:Tirokk/Nitro-Web into 37-full-text-search-top-bar 2019-03-05 07:07:08 -03:00
Grzegorz Leoniec
e2add5a730
Added (un)shout and (un)follow mutations 2019-03-05 10:56:47 +01:00
Matt Rider
87b20d4e89 Merge branch '37-full-text-search-top-bar' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-05 06:28:33 -03:00
Matt Rider
3b8eff00dd Merge branch '37-full-text-search-top-bar' of github.com:Tirokk/Nitro-Web into 37-full-text-search-top-bar 2019-03-05 06:23:29 -03:00
dependabot[bot]
fd87c0dd7d
Bump eslint from 5.14.1 to 5.15.1
Bumps [eslint](https://github.com/eslint/eslint) from 5.14.1 to 5.15.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.14.1...v5.15.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-05 04:18:55 +00:00
dependabot[bot]
0db91530fe
Bump eslint from 5.15.0 to 5.15.1
Bumps [eslint](https://github.com/eslint/eslint) from 5.15.0 to 5.15.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.15.0...v5.15.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-05 04:18:26 +00:00
Grzegorz Leoniec
303e1f399f
Merge pull request #203 from Human-Connection/27_fix_disabled_deleted_on_mutation
Fix current build
2019-03-04 21:55:15 +01:00
Robert Schäfer
180491c08c Put isAuthor in permissions middleware
I find it dirty to access the database in a middleware, ie. I would like
to put all access on the database as close to the resolver as possible.
However, in this case that would mean to put the authorization check in
the resolver, where nobody expects it to be.

CC @appinteractive
2019-03-04 19:43:24 +01:00
Robert Schäfer
2f9ab97b14 Fix cypress test with more specific matcher 2019-03-04 19:31:01 +01:00
Robert Schäfer
b64ea75011 Add a deleted post and a disabled post to seeds 2019-03-04 18:41:05 +01:00
Robert Schäfer
c869724d29 Let all tests pass 💚 2019-03-04 18:41:05 +01:00
Robert Schäfer
b2520258a3 Improve specification of posts resolver
* only authors are alllowed to update/delete their own posts
* set disabled+deleted to false if not provided
2019-03-04 18:41:05 +01:00
Grzegorz Leoniec
cbf697c031
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-04 17:37:23 +01:00
Grzegorz Leoniec
28fe77db6b
Use Styleguide 0.5.5 2019-03-04 17:18:55 +01:00
Robert Schäfer
6f116b6963 Remove custom error page
I find the custom error page out of scope of this PR so I will create
another tracking PR to get this feature merged as soon as possible.

See: https://github.com/Human-Connection/Nitro-Web/pull/216
2019-03-04 15:56:56 +01:00
Grzegorz Leoniec
adcedb264f
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-04 15:56:32 +01:00
Grzegorz Leoniec
4d0af7688d
Merge pull request #192 from Human-Connection/27_disable_posts
Show disabled or deleted posts for moderators
2019-03-04 15:55:38 +01:00
Grzegorz Leoniec
9d1c1e76a8
Merge branch 'master' into distinct-shouts-and-follows 2019-03-04 15:51:42 +01:00
Robert Schäfer
1672db0dfb Implement custom error page
We need styling and additional translation for other
HTTP error codes.

CC @appinteractive
2019-03-04 15:39:09 +01:00
Robert Schäfer
cfbd19b428 Quickfix of different virtual DOM on client/server 2019-03-04 15:39:09 +01:00
Robert Schäfer
eaa2017ba4 This technically lets the cypress tests pass
@appinteractive when I run the whole apollo request in `asyncData` I get
errors that there is a mismatch of the virtual DOM trees for client and
server. Any ideas?
2019-03-04 15:39:09 +01:00
Robert Schäfer
804cb796b8 Fix lint 2019-03-04 15:39:09 +01:00
Robert Schäfer
370748ce55 Sketch cypress test to hide posts from the public 2019-03-04 15:39:09 +01:00
Robert Schäfer
82bbdd12c4
Merge branch 'master' into 27_disable_posts 2019-03-04 15:35:46 +01:00
Robert Schäfer
f496b3f329
Merge pull request #202 from Human-Connection/dependabot/npm_and_yarn/eslint-5.15.0
Bump eslint from 5.14.1 to 5.15.0
2019-03-04 15:35:24 +01:00
Grzegorz Leoniec
78f6da8399
Fixed Search Input 2019-03-04 11:24:48 +01:00
dependabot[bot]
b23380d593
Bump eslint from 5.14.1 to 5.15.0
Bumps [eslint](https://github.com/eslint/eslint) from 5.14.1 to 5.15.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.14.1...v5.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-04 04:21:10 +00:00
Grzegorz Leoniec
76c4e4cd8f
Show status of follows and shouts for currently logged in user 2019-03-03 19:30:54 +01:00
Grzegorz Leoniec
f39e27c47c
Added followedByCurrentUser and shoutedByCurrentUser 2019-03-03 19:29:40 +01:00
Grzegorz Leoniec
257183ac3f
added currentUserId to cypher params 2019-03-03 19:29:25 +01:00
Grzegorz Leoniec
83b36e8e35
Output distinct counts 2019-03-03 15:55:11 +01:00
dependabot[bot]
802736e562
Merge pull request #183 from Human-Connection/dependabot/npm_and_yarn/@babel/core-7.3.4 2019-03-03 14:40:23 +00:00
Robert Schäfer
4a64755df7
Merge branch 'master' into 27_disable_posts 2019-03-03 15:27:27 +01:00
Robert Schäfer
cb78a30195 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/@babel/core-7.3.4 2019-03-03 15:27:02 +01:00
Robert Schäfer
db30f4d2d4
Merge pull request #195 from Human-Connection/194-create-unit-test-for-badges
[WIP] Write API test badge creation
2019-03-03 15:22:21 +01:00