486 Commits

Author SHA1 Message Date
dependabot[bot]
23a07786a4
Bump graphql-tag from 2.10.0 to 2.10.1
Bumps [graphql-tag](https://github.com/apollostack/graphql-tag) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/apollostack/graphql-tag/releases)
- [Changelog](https://github.com/apollographql/graphql-tag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollostack/graphql-tag/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-18 04:22:18 +00: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
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
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
6326e243f4
Merge pull request #130 from Human-Connection/language-menu
Language menu
2019-01-14 15:25:05 +01:00
Grzegorz Leoniec
249d6ecd9e
Merge branch 'master' into language-menu 2019-01-13 15:44:17 +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]
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
Grzegorz Leoniec
a5c41f0e55
Merge branch 'master' into dependabot/npm_and_yarn/vuex-i18n-1.11.0 2019-01-12 21:41:19 +01:00
Grzegorz Leoniec
3f67630de5
Improve look of topbar links and locale switch 2019-01-12 18:22:43 +01:00
Grzegorz Leoniec
b59ff6a7f0
Improved Avatar menu 2019-01-12 18:16:31 +01:00
Grzegorz Leoniec
c50c794e12
Improved LocaleSwitch and Avatar Item in Topbar 2019-01-12 17:39:33 +01:00
Grzegorz Leoniec
f7f6eeab39
Improved Topbar link positioning and language item 2019-01-12 17:07:23 +01:00
Grzegorz Leoniec
9f03ac3cd9
Sort Languages alphabetically 2019-01-12 17:07:00 +01:00
Grzegorz Leoniec
d6f5232d45
User Português for Portuguese 2019-01-12 17:06:43 +01:00
Grzegorz Leoniec
08c947bacd
Try to fix build by providing default env vars 2019-01-12 14:52:50 +01:00
Robert Schäfer
096b3b7e9d Use multiline strings in the step definition
@appinteractive I'm having trouble to run cypress on my machine right
now. But I think this is the correct syntax.
2019-01-11 18:46:35 +01:00
Robert Schäfer
bde7282f09 Try to substitute BACKEND_BRANCH env var properly 2019-01-11 18:19:18 +01:00
Robert Schäfer
a74a82ef23 Add missing JWT token to docker-compose.yml
How come that we didn't face this error earlier??
2019-01-11 17:42:05 +01:00
Robert Schäfer
c12250874f Set protocol of github dependencies to https
I'm sitting in a café and its WiFi is blocking certain ports. I believe
this setting does not hurt and it fixes a connection issue in my current
situation.
2019-01-11 17:33:05 +01:00
Robert Schäfer
b7c0b5d2fa Add missing MAPBOX_TOKEN 2019-01-11 14:36:37 +01:00
Robert Schäfer
82eb66a170 Merge remote-tracking branch 'origin/master' into locations 2019-01-11 13:56:40 +01:00
Robert Schäfer
9825b4107c
Merge pull request #115 from Human-Connection/93-minimize-docker-image-size-with-multi-stage-build
Multistage build docker
2019-01-11 12:31:40 +01:00
Robert Schäfer
8ee883954c
Merge branch 'master' into 93-minimize-docker-image-size-with-multi-stage-build 2019-01-11 01:31:10 +01:00
Robert Schäfer
521a868ca8 Revert "Try to help @mattwr18"
This reverts commit 6b4601e9d14d63362877e293b7219d23cf1b4ecd.

@mattwr18 for reasons I don't understand, our build server hangs
https://travis-ci.com/Human-Connection/Nitro-Web/builds/96979338

Honestly, I start to think this is a bug in `docker-compose`
2019-01-11 01:14:48 +01:00
Robert Schäfer
6b4601e9d1 Try to help @mattwr18
I give up now after numerous attempts to reduce the docker image size.
The only thing left is that I've put the NODE_ENV=.. configuration in
the docker-compose.X.yml files, I think that's slightly cleaner
2019-01-11 00:54:43 +01:00
Grzegorz Leoniec
02ed3db6fc
Improved integration tests 2019-01-10 15:55:05 +01:00
Grzegorz Leoniec
c45be5f39b
Fixed i18n on SSR 2019-01-10 15:32:54 +01:00
Grzegorz Leoniec
9cfbb8429b
Removed unused steps 2019-01-10 13:54:01 +01:00
Grzegorz Leoniec
a6b8a81574
Renamed scenario "I change my name" to "change username" 2019-01-10 13:51:45 +01:00
Grzegorz Leoniec
5c7ecfc6a6
Improved integration tests 2019-01-10 13:50:20 +01:00
Grzegorz Leoniec
3382c5ef6f
Removed unused comment slashes 2019-01-10 12:11:26 +01:00
Grzegorz Leoniec
89fb7e8e07
Merged master in 2019-01-10 12:08:13 +01:00
Grzegorz Leoniec
c124602c89
Merge pull request #129 from Human-Connection/improve-dropdown
Improve dropdown
2019-01-10 12:03:00 +01:00
Grzegorz Leoniec
4676f5af5c
Fixed is-exact usage ofr user menu and optimized Dropdown internals 2019-01-10 12:01:27 +01:00
Grzegorz Leoniec
e9ac233d6c
Use Dropdown in Author Component 2019-01-10 10:29:21 +01:00
Grzegorz Leoniec
78978e9bdb
Added disabled, isOpen, openMenu, closeMenu to Dropdown 2019-01-10 10:29:02 +01:00
Grzegorz Leoniec
a7010d32cf
Improve Dropdown 2019-01-10 09:47:35 +01:00
Matt Rider
bae7b7b74d Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 93-minimize-docker-image-size-with-multi-stage-build 2019-01-09 20:18:36 -02:00
Matt Rider
6948c147e2 Remove un-needed copies 2019-01-09 20:05:04 -02:00
Matt Rider
b17107438c Revert to passing build 2019-01-09 19:52:38 -02:00
Matt Rider
19a298d7f6 Add back static and plugins copy from build and test 2019-01-09 19:36:37 -02:00
Matt Rider
0acca8c73f Add copy everything in build and test 2019-01-09 19:15:48 -02:00
Matt Rider
cca09415c3 Fix copy path 2019-01-09 19:14:38 -02:00
Matt Rider
1a234e70f8 Copy over styleguide/dist 2019-01-09 18:54:42 -02:00