2283 Commits

Author SHA1 Message Date
Lala Sabathil
d3ed4ad75f
Merge branch 'master' into distinct-shouts-and-follows 2019-03-07 16:45:52 +01:00
Lala Sabathil
0c2a8783d6
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-07 16:45:28 +01:00
Lala Sabathil
ae88db1dbe
Merge pull request #208 from Human-Connection/dependabot/npm_and_yarn/apollo-link-http-1.5.12
Bump apollo-link-http from 1.5.11 to 1.5.12
2019-03-07 16:44:39 +01:00
Lala Sabathil
b6cc03cbe8
Merge branch 'master' into dependabot/npm_and_yarn/apollo-link-http-1.5.12 2019-03-07 16:23:39 +01:00
Lala Sabathil
6341e467f9
Merge pull request #159 from Human-Connection/dependabot/submodules/Nitro-Web-d848929
Bump Nitro-Web from `d857252` to `d848929`
2019-03-07 16:11:44 +01:00
Lala Sabathil
c90fcea15c
Merge pull request #160 from Human-Connection/dependabot/submodules/Nitro-Backend-2813de4
Bump Nitro-Backend from `c5c62d2` to `2813de4`
2019-03-07 16:11:35 +01:00
Armin
d16a1f62ff Refactoring + adding helmet for some basic security 2019-03-07 15:22:34 +01:00
Grzegorz Leoniec
7e844e7625
Added fuzzy searching 2019-03-07 11:54:48 +01:00
Grzegorz Leoniec
da3b10065c
Fixed and improved search and updated styleguide 2019-03-07 10:53:57 +01:00
dependabot[bot]
aefca6da32
Bump Nitro-Backend from c5c62d2 to 2813de4
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `c5c62d2` to `2813de4`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](c5c62d2839...2813de4f8b)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-07 04:17:28 +00:00
dependabot[bot]
5195991e71
Bump Nitro-Web from d857252 to d848929
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `d857252` to `d848929`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](d8572520e8...d848929302)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-07 04:17:27 +00:00
mattwr18
572862e8aa
Merge branch 'master' into 27_disable_posts 2019-03-06 22:11:42 -03:00
Grzegorz Leoniec
23cfbb0687
Updated yarn.lock 2019-03-06 19:01:30 +01:00
Grzegorz Leoniec
63077d8a2f
Someone broke the package json :-\ 2019-03-06 18:57:41 +01:00
Grzegorz Leoniec
cd50d80671
Undo sorting of newsfeed 2019-03-06 18:49:53 +01:00
Grzegorz Leoniec
fcb51e4eda
Merge remote-tracking branch 'origin/master' into 37-full-text-search-top-bar 2019-03-06 18:49:34 +01:00
Grzegorz Leoniec
ab7c857750
Merged master in 2019-03-06 18:48:37 +01:00
Grzegorz Leoniec
c71f6fb07c
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-06 18:46:16 +01:00
Grzegorz Leoniec
d848929302
Improved countTo component 2019-03-06 18:45:57 +01:00
Robert Schäfer
389f447186
Merge branch 'master' into 27_disable_posts 2019-03-06 17:21:56 +01:00
Robert Schäfer
8072939458 Tiny performance improvement 2019-03-06 17:21:49 +01:00
Robert Schäfer
f40a67b7a8 Implement disabling of comments+users+posts 2019-03-06 17:13:36 +01:00
Robert Schäfer
1c34f10f96 Test refactoring: Check comments + posts 2019-03-06 17:13:36 +01:00
Grzegorz Leoniec
6617aaefc3
Merge branch 'master' into distinct-shouts-and-follows 2019-03-06 16:34:25 +01:00
Grzegorz Leoniec
7a00e7f1c7
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-06 13:23:04 +01:00
Grzegorz Leoniec
2813de4f8b
Fixed organization seeder 2019-03-06 13:20:33 +01:00
Grzegorz Leoniec
78c9b83282
Fixed follow stats 2019-03-06 13:08:26 +01:00
dependabot[bot]
09ec8c3602
Bump apollo-link-http from 1.5.11 to 1.5.12
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.11 to 1.5.12.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.11...apollo-link-http@1.5.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-06 04:31:31 +00:00
dependabot[bot]
995ae36f21
Merge pull request #188 from Human-Connection/dependabot/npm_and_yarn/@vue/cli-shared-utils-3.4.1 2019-03-06 03:40:42 +00:00
dependabot[bot]
70416b4722
Bump @vue/cli-shared-utils from 3.4.0 to 3.4.1
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.4.1/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-06 01:24:16 +00:00
dependabot[bot]
b3e42fc444
Merge pull request #225 from Human-Connection/dependabot/npm_and_yarn/@nuxtjs/axios-5.4.1 2019-03-06 01:21:53 +00:00
Robert Schäfer
5cff508bd6 Disable/enable fullfills tests 2019-03-06 01:07:04 +01:00
dependabot[bot]
4efe4f42e9
Bump @nuxtjs/axios from 5.3.6 to 5.4.1
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.3.6 to 5.4.1.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.3.6...v5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-05 23:05:15 +00:00
dependabot[bot]
8fcd108eb6
Merge pull request #221 from Human-Connection/dependabot/npm_and_yarn/eslint-5.15.1 2019-03-05 23:02:08 +00:00
Robert Schäfer
0a73ddd46d Refactor: custom resolvers for moderation 2019-03-05 23:59:54 +01:00
Grzegorz Leoniec
865fdebc5f
Fixed linting issues inside tests 2019-03-05 18:58:17 +01:00
Grzegorz Leoniec
c2aea104f4
Added basic tests for follow mutation 2019-03-05 18:44:39 +01:00
Grzegorz Leoniec
4fdb1562f9
Added test for shoutedByCurrentUser flag on posts 2019-03-05 18:34:35 +01:00
Grzegorz Leoniec
a292a522e9
Fixed an issue and added basic testing for (un)shout 2019-03-05 18:30:28 +01:00
Robert Schäfer
2b7576521c Fix lint
+ return more attributes in post factory for convenience
2019-03-05 18:17:02 +01:00
Robert Schäfer
592f25b978 Implement update of .disabled field 2019-03-05 18:14:25 +01:00
Robert Schäfer
99cebc8d64 Implementation ready except disabled attr. 2019-03-05 17:45:10 +01:00
Grzegorz Leoniec
29dac5c5a3
Removed unused voted var from author component 2019-03-05 17:37:48 +01:00
Grzegorz Leoniec
8792f02932
Improved follow button optimistic behavior 2019-03-05 17:35:41 +01:00
Grzegorz Leoniec
d9b633c5ae
Make follow button update instant 2019-03-05 17:26:20 +01:00
Grzegorz Leoniec
d30649164a
Improved following and shout behavior 2019-03-05 17:19:35 +01:00
Robert Schäfer
f2e7e515a4 Check from: User! matches the authenticated user 2019-03-05 16:46:39 +01:00
Robert Schäfer
85d9d7043e Setup isModerator permission for disable relation 2019-03-05 16:25:01 +01:00
Robert Schäfer
420ea8a4d6 Scaffold some tests for disabledBy relation 2019-03-05 16:15:31 +01:00
Robert Schäfer
f644507e4f Intermediate commit 2019-03-05 15:47:03 +01:00