IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-02-06 09:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
787 Commits 5 Branches 6 Tags
Commit Graph

787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matt Rider
c575565f8c Copy plugins from builder 2019-01-03 21:06:28 -02:00
Matt Rider
e88b674a29 Configure docker-compose, travis multistage build 2019-01-03 20:22:46 -02:00
Matt Rider
5778ef3bc0 Multistage build docker 2019-01-03 19:25:20 -02:00
Grzegorz Leoniec
32d2b6f92e
Merge branch 'master' into report-content 2019-01-03 15:32:06 +01:00
dependabot[bot]
6c5812c863
Bump vuex-i18n from 1.10.9 to 1.11.0 
Bumps [vuex-i18n](https://github.com/dkfbasel/vuex-i18n) from 1.10.9 to 1.11.0.
- [Release notes](https://github.com/dkfbasel/vuex-i18n/releases)
- [Commits](https://github.com/dkfbasel/vuex-i18n/compare/v1.10.9...v1.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 07:36:46 +00:00
dependabot[bot]
d7f9769e68
Merge pull request #113 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-vue-5.1.0 2019-01-03 07:31:42 +00:00
dependabot[bot]
b5f1688fb8
Bump eslint-plugin-vue from 5.0.0 to 5.1.0 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v5.0.0...v5.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 06:55:48 +00:00
dependabot[bot]
3f6ca51c11
Merge pull request #112 from Human-Connection/dependabot/npm_and_yarn/cookie-universal-nuxt-2.0.12 2019-01-03 06:49:19 +00:00
dependabot[bot]
9b7695d937
Bump cookie-universal-nuxt from 2.0.11 to 2.0.12 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.11 to 2.0.12.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.11...v2.0.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 04:46:22 +00:00
Grzegorz Leoniec
9de15879f3
Merge branch 'master' into i18n-pluralization 2019-01-02 13:50:20 +01:00
dependabot[bot]
a3171d3449
Merge pull request #105 from Human-Connection/dependabot/npm_and_yarn/vuex-i18n-1.10.9 2018-12-31 19:15:12 +00:00
dependabot[bot]
188e8e3a5f
Bump vuex-i18n from 1.10.5 to 1.10.9 
Bumps [vuex-i18n](https://github.com/dkfbasel/vuex-i18n) from 1.10.5 to 1.10.9.
- [Release notes](https://github.com/dkfbasel/vuex-i18n/releases)
- [Commits](https://github.com/dkfbasel/vuex-i18n/compare/v1.10.5...v1.10.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-31 18:12:13 +00:00
dependabot[bot]
f5cca4f74c
Merge pull request #106 from Human-Connection/dependabot/npm_and_yarn/eslint-5.11.1 2018-12-31 18:08:36 +00:00
dependabot[bot]
bc96c7112f
Bump eslint from 5.11.0 to 5.11.1 
Bumps [eslint](https://github.com/eslint/eslint) from 5.11.0 to 5.11.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.11.0...v5.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-31 17:45:27 +00:00
dependabot[bot]
4e91a9798a
Merge pull request #108 from Human-Connection/dependabot/npm_and_yarn/@vue/server-test-utils-1.0.0-beta.28 2018-12-31 17:43:20 +00:00
dependabot[bot]
82026a116f
Bump @vue/server-test-utils from 1.0.0-beta.27 to 1.0.0-beta.28 
Bumps [@vue/server-test-utils](https://github.com/vuejs/vue-test-utils) from 1.0.0-beta.27 to 1.0.0-beta.28.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/compare/v1.0.0-beta.27...v1.0.0-beta.28)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-31 17:21:28 +00:00
Grzegorz Leoniec
991b27a9f7
Merge pull request #109 from Human-Connection/dependabot/npm_and_yarn/@vue/test-utils-1.0.0-beta.28 
Bump @vue/test-utils from 1.0.0-beta.27 to 1.0.0-beta.28
 2018-12-31 18:15:42 +01:00
dependabot[bot]
e2e9528894
Bump @vue/test-utils from 1.0.0-beta.27 to 1.0.0-beta.28 
Bumps [@vue/test-utils](https://github.com/vuejs/vue-test-utils) from 1.0.0-beta.27 to 1.0.0-beta.28.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/compare/v1.0.0-beta.27...v1.0.0-beta.28)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-31 14:15:58 +00:00
Grzegorz Leoniec
5908be404f
Merge pull request #110 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-prettier-3.0.1 
Bump eslint-plugin-prettier from 3.0.0 to 3.0.1
 2018-12-31 15:13:55 +01:00
dependabot[bot]
11dfa00f3e
Bump eslint-plugin-prettier from 3.0.0 to 3.0.1 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-31 04:38:29 +00:00
Grzegorz Leoniec
8584253e3f
Less left margin on report button 2018-12-29 20:11:13 +01:00
Grzegorz Leoniec
6e1889c5e8
Improved report menu 2018-12-29 20:03:08 +01:00
Grzegorz Leoniec
bd8deb942a
Fix styling issues 2018-12-29 19:43:07 +01:00
Grzegorz Leoniec
8bb4c7dbdf
Added unique class name to body tag based on page name 2018-12-29 19:42:56 +01:00
Grzegorz Leoniec
a9db76e24b
fixed post card links 2018-12-29 18:36:17 +01:00
Grzegorz Leoniec
cad596357a
Little style improvements 2018-12-29 16:29:41 +01:00
Grzegorz Leoniec
bbe1d4e7c3
merged master in 2018-12-29 16:09:06 +01:00
Grzegorz Leoniec
5f8d94e13e
WIP - Added first report dropdown to PostCard component. 2018-12-29 15:51:26 +01:00
Grzegorz Leoniec
7bd345ceec
WIP - First attemplte of Pluralization 2018-12-28 20:10:01 +01:00
Grzegorz Leoniec
313538bd0c
Merge pull request #103 from Human-Connection/dependabot/npm_and_yarn/eslint-5.11.0 
Bump eslint from 5.10.0 to 5.11.0
 2018-12-24 16:47:16 +01:00
Grzegorz Leoniec
241a14f09c
Merge pull request #100 from Human-Connection/refactor_login_method_and_setup_unit_tests 
Refactor login method and setup unit tests
 2018-12-24 16:46:09 +01:00
Grzegorz Leoniec
8b40bae372
Merge branch 'master' into refactor_login_method_and_setup_unit_tests 2018-12-24 16:17:54 +01:00
Grzegorz Leoniec
cb256bdf49
Merge pull request #104 from Human-Connection/imgbot 
[ImgBot] Optimize images
 2018-12-24 16:04:43 +01:00
ImgBotApp
433d698419
[ImgBot] Optimize images 
/static/img/sign-up/humanconnection.png -- 220.04kb -> 129.61kb (41.1%)
 2018-12-24 14:33:15 +00:00
Robert Schäfer
eaddac15cc
Merge branch 'master' into dependabot/npm_and_yarn/eslint-5.11.0 2018-12-24 15:30:45 +01:00
Robert Schäfer
70739faef4
Merge pull request #99 from Human-Connection/i18n-pure 
Integrate i18n
 2018-12-24 15:30:29 +01:00
dependabot[bot]
9d79612cdf
Bump eslint from 5.10.0 to 5.11.0 
Bumps [eslint](https://github.com/eslint/eslint) from 5.10.0 to 5.11.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.10.0...v5.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-24 04:49:51 +00:00
Grzegorz Leoniec
6c2b606341
Updated translations 2018-12-21 15:42:25 +01:00
Grzegorz Leoniec
1e1864277d
Improved intarnationalization test 2018-12-21 15:31:07 +01:00
Grzegorz Leoniec
4fe90668a6
Improved internationalization tests 2018-12-21 15:27:11 +01:00