IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
627 Commits 5 Branches 2 Tags
Commit Graph

627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz Leoniec
a518412ea0
Improved location testing 2019-01-08 15:19:04 +01:00
Grzegorz Leoniec
90ea91c333
Fixed small issue with dropdown 2019-01-08 14:41:51 +01:00
Grzegorz Leoniec
0c336279b4
Improved dropdown behaviour 2019-01-08 14:37:07 +01:00
Grzegorz Leoniec
bf73b7ca84
Added missing axios configuration 2019-01-08 14:36:36 +01:00
Grzegorz Leoniec
7a383c88f1
Use locale for location name 2019-01-08 14:36:21 +01:00
Grzegorz Leoniec
2eb77149ed
Encode mapbox url 2019-01-08 14:35:26 +01:00
Grzegorz Leoniec
367043972e
Added locale to axios requests 2019-01-08 14:35:07 +01:00
Matt Rider
c96e29bfcb Clean up Dockerfile 2019-01-08 11:22:51 -02:00
Robert Schäfer
aee50fee3e
Merge branch 'master' into dependabot/npm_and_yarn/vuex-i18n-1.11.0 2019-01-08 13:59:30 +01:00
Matt Rider
a4ae2aa35b Add environment variable to commands 2019-01-08 10:31:49 -02:00
Matt Rider
ebc143f455 Add node env correctly in travis.yml and echo 2019-01-08 09:50:48 -02:00
Matt Rider
648e53456c Set node env to test in package.json 2019-01-08 09:37:30 -02:00
Matt Rider
bbe3899807 Merge branch '93-minimize-docker-image-size-with-multi-stage-build' of github.com:Human-Connection/Nitro-Web into 93-minimize-docker-image-size-with-multi-stage-build 2019-01-08 09:30:11 -02:00
Matt Rider
9172cd2532 Change node env to test in travis.yml 2019-01-08 09:23:56 -02:00
Matt Rider
541a8441a8 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 93-minimize-docker-image-size-with-multi-stage-build 2019-01-08 08:31:56 -02:00
Grzegorz Leoniec
3afc0e5a32
More translations applied 2019-01-07 18:52:26 +01:00
Grzegorz Leoniec
b20146eb77
Merge branch 'master' into i18n-pluralization 2019-01-07 18:37:48 +01:00
Grzegorz Leoniec
717658fd62
Merge pull request #123 from Human-Connection/lokalise-2019-01-07_18-33-34 
Lokalise: Translations update
 2019-01-07 18:35:53 +01:00
lokalise-bot
0b153d1fff Lokalise: update of locales/pt.json 2019-01-07 18:33:44 +01:00
lokalise-bot
af10c422db Lokalise: update of locales/pl.json 2019-01-07 18:33:43 +01:00
lokalise-bot
f642a0cf61 Lokalise: update of locales/nl.json 2019-01-07 18:33:42 +01:00
lokalise-bot
35a2f13f41 Lokalise: update of locales/it.json 2019-01-07 18:33:41 +01:00
lokalise-bot
acc060a8fa Lokalise: update of locales/fr.json 2019-01-07 18:33:39 +01:00
lokalise-bot
3ed4c39067 Lokalise: update of locales/es.json 2019-01-07 18:33:38 +01:00
lokalise-bot
43c554e429 Lokalise: update of locales/en.json 2019-01-07 18:33:37 +01:00
lokalise-bot
59c2125e41 Lokalise: update of locales/de.json 2019-01-07 18:33:36 +01:00
Grzegorz Leoniec
e13e14ce64
Added Cypress Tests for about me and location 2019-01-07 18:17:58 +01:00
Grzegorz Leoniec
ce3a812eb2
Fixed a test 2019-01-07 18:17:38 +01:00
Grzegorz Leoniec
4f50274b0d
Added more localizations 2019-01-07 18:17:21 +01:00
Robert Schäfer
ab541300ac Remove probably unused semver dependency 2019-01-07 16:55:57 +01:00
Matt Rider
890d22421c Change node env to test for build-and-test 2019-01-05 15:46:56 -02:00
Matt Rider
124f8be370 Copy everything over in the base image 2019-01-05 14:25:31 -02:00
Grzegorz Leoniec
c156bcedc9
Added author location to quick user preview 2019-01-05 13:43:20 +01:00
Grzegorz Leoniec
662589e995
Removed console.log 2019-01-05 13:42:38 +01:00
Matt Rider
9f8a292c7e Fix lint issues 2019-01-04 20:59:33 -02:00
Matt Rider
beac045d5f Copy components and store, remove in production 
Needed to run tests
 2019-01-04 20:42:01 -02:00
Matt Rider
11a7f0a41a Copy eslint config, test files 2019-01-04 20:29:45 -02:00
Matt Rider
40aedb12ee Initialize eslint 2019-01-04 20:12:42 -02:00
Matt Rider
3e3065c4a4 Refactor multistage build names, copy locales in base 2019-01-04 19:46:07 -02:00
Robert Schäfer
9541b81b08 Add folder /server to docker stage production 2019-01-04 20:08:13 +01:00
Robert Schäfer
00d1ca0129 Put CMD in base section in Dockerfile 
This should fix our build server. Probably the container immediately
exited on Travis which is using the `builder` stage for testing.
 2019-01-04 19:52:52 +01:00
Robert Schäfer
9b3161ae15 Fix copy+paste error backend=>webapp 
@mattwr18 ouch, that was a hard to spot error. It struck my eye when I
was switching back and forth between `docker-compose.override.yml` and
`docker-compose.travis.yml`.
 2019-01-04 19:18:53 +01:00
Matt Rider
b8fb1bd1c0 Revert docker-compose up command in travis.yml 2019-01-04 15:15:06 -02:00
Matt Rider
014392a7a5 Add missing up in docker-compose up 2019-01-04 15:06:59 -02:00
Grzegorz Leoniec
f1392e47c5
disabled autocomplete on select 2019-01-04 15:03:52 +01:00
Grzegorz Leoniec
47c858d9d2
Improved locale handling 2019-01-04 15:03:35 +01:00
Grzegorz Leoniec
d1f0131e0e
Moved JWT_TOKEN and MAPBOX_TOKEN to .env 2019-01-04 14:59:23 +01:00
Grzegorz Leoniec
8b5c59d39a
try to fix memory leak 2019-01-04 14:50:55 +01:00
Grzegorz Leoniec
6e22dde22c
Merge branch 'master' into locations 2019-01-04 09:31:50 +01:00
Matt Rider
744362a4d7 Link docker-compose to docker-compose.travis 2019-01-03 22:37:48 -02:00