IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,614 Commits 5 Branches 2 Tags
Commit Graph

3614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz Leoniec
a313f941c5
Fixed eslint issue 2019-01-07 20:25:05 +01:00
Grzegorz Leoniec
3afc0e5a32
More translations applied 2019-01-07 18:52:26 +01:00
Daksh
d0e18bf131
Merge branch 'master' into master 2019-01-07 23:12:15 +05:30
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
Grzegorz Leoniec
cffce564ea
Fixed short_code 2019-01-07 17:58:27 +01:00
Grzegorz Leoniec
9fab4a8fe7
Fixed injection issues 2019-01-07 17:34:18 +01:00
Grzegorz Leoniec
77e77229b9
Fixed login and schema 2019-01-07 17:30:54 +01:00
dependabot[bot]
a1b8d53e6e
Merge pull request #87 from Human-Connection/dependabot/npm_and_yarn/apollo-client-2.4.8 2019-01-07 16:20:09 +00:00
dependabot[bot]
b6511b9a03
Bump apollo-client from 2.4.7 to 2.4.8 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.4.7 to 2.4.8.
- [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-07 16:06:35 +00:00
Robert Schäfer
a6c6dcbedf
Merge pull request #100 from aonomike/master 
Update README.md
 2019-01-07 17:00:53 +01:00
Robert Schäfer
1d7988e36f
Merge branch 'master' into master 2019-01-07 17:00:33 +01:00
Robert Schäfer
ab541300ac Remove probably unused semver dependency 2019-01-07 16:55:57 +01:00
Daksh
016119e768
fix variableName from id to userId 2019-01-07 13:00:19 +05:30
Daksh Miglani
5fd5795f39
fix jwt strategy 2019-01-07 12:48:47 +05:30
Wolfgang Huß
7db25faf1d
Add instructions for forking (or cloning) repo 2019-01-07 08:08: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
Mike Aono
486e01ddce
Update README.md 2019-01-05 18:57:24 +03: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
30d4318d17
Throw an error if requried env vars are missing 2019-01-04 15:15:07 +01:00
Grzegorz Leoniec
e9bc848a33
Improved locale handling and moved MAPBOX_TOKEN to env 2019-01-04 15:14:51 +01: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
Grzegorz Leoniec
1f818116e4
Merge branch 'master' into locations 2019-01-04 09:30:20 +01:00