16408 Commits

Author SHA1 Message Date
Grzegorz Leoniec
9602632ddf
Improved moderation list 2019-01-15 10:54:47 +01:00
Grzegorz Leoniec
538cf34989
Added report option for comments 2019-01-15 09:40:05 +01:00
Grzegorz Leoniec
3bf42da9ea
More translations 2019-01-15 09:39:48 +01:00
Grzegorz Leoniec
879ec5a40c
Improved moderation list 2019-01-15 09:39:36 +01:00
Grzegorz Leoniec
36d6d5a3f5
Min with for popover menus 2019-01-15 09:39:20 +01:00
Grzegorz Leoniec
4aaff6cb50
Improved report dropdown description 2019-01-15 08:13:09 +01:00
dependabot[bot]
c2c3440077
Merge pull request #111 from Human-Connection/dependabot/submodules/Nitro-Web-6326e24 2019-01-15 04:40:19 +00:00
dependabot[bot]
36eb2054ce
Merge pull request #110 from Human-Connection/dependabot/submodules/Nitro-Backend-79749e6 2019-01-15 04:39:48 +00:00
dependabot[bot]
25a2e170d6
Bump Nitro-Web from c334a81 to 6326e24
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `c334a81` to `6326e24`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](c334a81410...6326e243f4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-15 04:39:23 +00:00
dependabot[bot]
575d86a0b1
Bump Nitro-Backend from 617a62a to 79749e6
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `617a62a` to `79749e6`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](617a62a40c...79749e6570)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-15 04:39:23 +00:00
Robert Schäfer
9d4c1c6e1a CMD and EXPOSE is valid for all docker stages
FYI: @mattwr18 and @ksinkar
I wanted to test cypress with the Travis configuration. I had
to add `command: ...` to the `docker-compose.travis.yml` which I find
quite annoying. So I put CMD and EXPOSE at the top of the Dockerfile,
thus making it a default for all stages including build-and-test.
2019-01-15 01:35:09 +01:00
Robert Schäfer
9e28704d9b Fix all cypress tests but one
@appinteractive, it's super strange but apparently the JWT has to be
enclosed in quotes whereas the MAPBOX_TOKEN must not be enclosed. This
commit fixes almost all tests running in the docker containers on my
machine. The remaining test case is:
```
About me and and location
I set my location to "Mecklenburg-Vorpommern" (example #2)
```

@appinteractive when I try to repeat the cypress test on my machine I
get no results for "Mecklenburg-Vorpommern" only cities and states. can
you check if regions really work?
2019-01-15 01:29:38 +01:00
Robert Schäfer
b2d1685b06 WIP: Integrate permissionless app into setup hooks 2019-01-15 00:39:06 +01:00
Robert Schäfer
9d541d8f27 Clean up helper.js 2019-01-14 23:31:00 +01:00
Robert Schäfer
6f487e2687 Fix non-deterministic erros in testing
Without the `--runInBand` flag, jest will create a worker pool of child
processes and run the tests withing. No surprise, why the tests were
running completely non-deterministically! If we clear the database in
the middle of the tests we will end up with no records, or if we run the
factories in several tests we end up with many duplicate records.

FYI: @mattwr18 @appinteractive @tansaku @Kachulio1
2019-01-14 23:22:12 +01:00
Robert Schäfer
70b20302fe Probably exposed #106 2019-01-14 23:00:21 +01:00
Robert Schäfer
75ee9bf9b4 Fix seed data in docker environment
@appinteractive

Running
```
docker-compose -f ../Nitro-Backend/docker-compose.yml -f ../Nitro-Backend/docker-compose.travis.yml up
```
from the Nitro-Web folder gives me an error when running seed data.

The configuration in this commit fixes it on my machine. I guess that
will fix the frontend build, too.
2019-01-14 21:50:42 +01:00
Robert Schäfer
d0b975e782 Getting strange non-deterministic errors 2019-01-14 20:54:11 +01:00
Grzegorz Leoniec
a8a18314f8
Fixed modal setup 2019-01-14 18:12:18 +01:00
Grzegorz Leoniec
a20430f3e9
Improved modal 2019-01-14 17:54:26 +01:00
Grzegorz Leoniec
bfd0feae49
Merge branch 'master' into report-content 2019-01-14 17:17:48 +01:00
Grzegorz Leoniec
8635cd162f
Merge branch 'master' into report-content 2019-01-14 17:16:19 +01:00
Grzegorz Leoniec
77b8277906
Fixed settings and admin menues 2019-01-14 17:12:04 +01:00
Grzegorz Leoniec
79749e6570
Fixed isOwner permission 2019-01-14 17:07:20 +01:00
Grzegorz Leoniec
6e0380e5f6
Fixed LocaleSwitch issue with new Menu 2019-01-14 16:10:26 +01:00
Grzegorz Leoniec
d93c360cb7
merged master in 2019-01-14 16:09:05 +01:00
Grzegorz Leoniec
6a343ccd94
remove disabled styling for inputs 2019-01-14 16:07:58 +01:00
Robert Schäfer
6bbc76911a Refactor test cases 2019-01-14 16:07:52 +01:00
Grzegorz Leoniec
c9008a23cb
Use matcher for user menu 2019-01-14 16:07:42 +01:00
Grzegorz Leoniec
989a723d4d
use standard exact router link class in nuxt 2019-01-14 16:06:09 +01:00
Grzegorz Leoniec
598dd9cda7
Added matcher prop for menu 2019-01-14 16:05:55 +01:00
Robert Schäfer
6326e243f4
Merge pull request #130 from Human-Connection/language-menu
Language menu
2019-01-14 15:25:05 +01:00
Grzegorz Leoniec
1cb4156422
Fixed linting issue 2019-01-14 14:52:16 +01:00
Grzegorz Leoniec
07c437ccaa
Fixed issues after styleguide upgrade 2019-01-14 14:45:42 +01:00
Grzegorz Leoniec
cb773eb2ce
Upgrade Styleguide 2019-01-14 13:57:52 +01:00
dependabot[bot]
2383e24faf
Merge pull request #109 from Human-Connection/dependabot/submodules/Nitro-Web-c334a81 2019-01-14 04:18:21 +00:00
dependabot[bot]
3d04e11b99
Merge pull request #108 from Human-Connection/dependabot/submodules/Nitro-Backend-617a62a 2019-01-14 04:18:03 +00:00
dependabot[bot]
1d3897c254
Bump Nitro-Web from c124602 to c334a81
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `c124602` to `c334a81`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](c124602c89...c334a81410)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-14 04:17:28 +00:00
dependabot[bot]
5ca5790bb6
Bump Nitro-Backend from b2bad4f to 617a62a
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `b2bad4f` to `617a62a`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](b2bad4fedb...617a62a40c)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-14 04:17:26 +00:00
Grzegorz Leoniec
249d6ecd9e
Merge branch 'master' into language-menu 2019-01-13 15:44:17 +01:00
Grzegorz Leoniec
3a90c84a21
Merge branch 'master' into locations 2019-01-13 15:43:37 +01:00
Grzegorz Leoniec
fb885ddcda
Merge branch 'master' into 106_authorization 2019-01-13 15:42:21 +01:00
Grzegorz Leoniec
617a62a40c
Merge pull request #104 from DakshMiglani/master
fix #41 jwt strategy
2019-01-13 15:41:15 +01:00
Grzegorz Leoniec
f0d0ced015
Merge branch 'master' into locations 2019-01-13 14:41:15 +01:00
Grzegorz Leoniec
8fe8500b24
Normalize offset for topbar locale switch 2019-01-13 14:39:46 +01:00
Grzegorz Leoniec
ff0d4e3a70
Remove outline for links inside topbar 2019-01-13 14:39:24 +01:00
Grzegorz Leoniec
a07b71dea4
Fixed dropdown trigger link active status while open 2019-01-13 14:31:48 +01:00
dependabot[bot]
9d284da73e
Merge pull request #85 from Human-Connection/dependabot/npm_and_yarn/apollo-cache-inmemory-1.3.12 2019-01-12 21:09:49 +00:00
dependabot[bot]
c334a81410
Merge pull request #114 from Human-Connection/dependabot/npm_and_yarn/vuex-i18n-1.11.0 2019-01-12 20:53:38 +00:00
dependabot[bot]
53044c4cf6
Bump apollo-cache-inmemory from 1.3.11 to 1.3.12
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.3.11 to 1.3.12.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-12 20:51:19 +00:00