5888 Commits

Author SHA1 Message Date
Grzegorz Leoniec
e0e1aa907d
Updated chip and tag 2019-01-17 11:02:09 +01:00
Grzegorz Leoniec
4bd1028a38
Updated menu usage to new slotname 2019-01-17 10:45:53 +01:00
Grzegorz Leoniec
df9e4ddcf6
Updated from pr's 2019-01-17 10:38:56 +01:00
Grzegorz Leoniec
b589ab0929
Fix border-radius for card 2019-01-17 09:33:41 +01:00
dependabot[bot]
541e44e04c
Bump supertest from 3.3.0 to 3.4.1
Bumps [supertest](https://github.com/visionmedia/supertest) from 3.3.0 to 3.4.1.
- [Release notes](https://github.com/visionmedia/supertest/releases)
- [Changelog](https://github.com/visionmedia/supertest/blob/master/History.md)
- [Commits](https://github.com/visionmedia/supertest/compare/v3.3.0...v3.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-17 04:31:44 +00:00
Grzegorz Leoniec
0f08ee34a4
Merge branch 'master' into upgrade-styleguied 2019-01-16 19:20:02 +01:00
Grzegorz Leoniec
4db152575a
Fixed profile-top-navigation z-index 2019-01-16 19:11:18 +01:00
Grzegorz Leoniec
a676daef3e
Fixed logout link padding 2019-01-16 19:05:09 +01:00
Grzegorz Leoniec
9982102f55
merged master in 2019-01-16 19:02:28 +01:00
Grzegorz Leoniec
a1a0d21f23
Merge remote-tracking branch 'origin/master' into report-content 2019-01-16 19:01:25 +01:00
dependabot[bot]
f31776e801
Merge pull request #112 from Human-Connection/dependabot/submodules/Nitro-Backend-1ecdcb1 2019-01-16 04:16:36 +00:00
dependabot[bot]
71fefe7d80
Merge pull request #113 from Human-Connection/dependabot/submodules/Nitro-Web-70aca85 2019-01-16 04:16:24 +00:00
dependabot[bot]
28f7c0f5b0
Bump Nitro-Web from 6326e24 to 70aca85
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `6326e24` to `70aca85`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](6326e243f4...70aca8579a)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-16 04:15:46 +00:00
dependabot[bot]
157e9082c4
Bump Nitro-Backend from 79749e6 to 1ecdcb1
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `79749e6` to `1ecdcb1`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](79749e6570...1ecdcb19b5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-16 04:15:44 +00:00
Robert Schäfer
bfad621306 Disable automatic know-hosts for now
This will require user interaction when running the import script
2019-01-16 02:19:02 +01:00
Robert Schäfer
8d8dfb0640 Provision neo4j container with import script 2019-01-16 02:10:42 +01:00
Robert Schäfer
433cd7a52e Export all relevant collection to a shared folder 2019-01-16 02:10:42 +01:00
Robert Schäfer
1c04b8f3de Import mongodb on-the-fly 2019-01-16 02:10:42 +01:00
Robert Schäfer
0970014a59 Create db-migration-worker as a docker container
The idea is to import/dump the remote database via SSH, restore it to
the local mongodb, export .json collections to a shared volume and
import the json collections with cypher-shell.
2019-01-16 02:10:42 +01:00
Robert Schäfer
57a6b259eb Copy remote-dump.sh as a starting piont
Just added the two environment variables for neo4j.
2019-01-16 02:10:42 +01:00
Robert Schäfer
a07f48826b Merge remote-tracking branch 'origin/master' into 106_authorization 2019-01-15 19:59:52 +01:00
Robert Schäfer
1ecdcb19b5
Merge pull request #16 from Human-Connection/locations
Locations & About Me
2019-01-15 13:24:24 +01:00
Robert Schäfer
5e77e7eaa7
Merge branch 'master' into locations 2019-01-15 13:18:31 +01:00
Robert Schäfer
70aca8579a
Merge pull request #9 from Human-Connection/locations
Locations & About Me
2019-01-15 13:16:29 +01:00
Grzegorz Leoniec
6f02534d4f
Merge branch 'master' into locations 2019-01-15 11:42:39 +01:00
Grzegorz Leoniec
7e8cefc773
Improved moderation list 2019-01-15 11:40:44 +01:00
Grzegorz Leoniec
2a803a3287
Fixed tooltip styles on build 2019-01-15 11:40:29 +01:00
Grzegorz Leoniec
54b690bcc7
Fixed username test on settings page by waiting for the form to be saved 2019-01-15 11:09:01 +01:00
Grzegorz Leoniec
a3a229c36f
Fixed location test with region on english locale by using Saxony-Anhalt instead 2019-01-15 11:08:37 +01:00
Grzegorz Leoniec
d44fbcc594
Improved content menu 2019-01-15 10:54:57 +01:00
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