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
4,194 Commits 5 Branches 2 Tags
Commit Graph

4194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rider
d42083a32e Move header to left, add border left 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 09:55:09 -03:00
Matt Rider
cc61dac818 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-12 10:50:14 -03:00
Matt Rider
c7094d82b8 Fix styling, follow @Tirokk suggestions 2019-07-12 10:37:27 -03:00
mattwr18
bd77c8e450
Merge pull request #1029 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.9 
Bump apollo-server-testing from 2.6.8 to 2.6.9 in /backend
 2019-07-12 07:30:46 -03:00
mattwr18
54a97575bb
Merge pull request #1031 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.2.1 
Bump cypress-file-upload from 3.2.0 to 3.2.1
 2019-07-12 07:30:20 -03:00
mattwr18
5959c97432
Merge pull request #1028 from Human-Connection/dependabot/npm_and_yarn/backend/wait-on-3.3.0 
Bump wait-on from 3.2.0 to 3.3.0 in /backend
 2019-07-12 07:29:56 -03:00
dependabot-preview[bot]
0c3d661d86
Bump cypress-file-upload from 3.2.0 to 3.2.1 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:30:05 +00:00
dependabot-preview[bot]
48086ab7f8
Bump apollo-server-testing from 2.6.8 to 2.6.9 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.8 to 2.6.9.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.8...apollo-server-testing@2.6.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:30:02 +00:00
dependabot-preview[bot]
f518da5336
Bump wait-on from 3.2.0 to 3.3.0 in /backend 
Bumps [wait-on](https://github.com/jeffbski/wait-on) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/jeffbski/wait-on/releases)
- [Commits](https://github.com/jeffbski/wait-on/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:29:04 +00:00
mattwr18
809d27b01a
Merge pull request #1023 from Human-Connection/dependabot/npm_and_yarn/webapp/lodash-4.17.14 
[Security] Bump lodash from 4.17.11 to 4.17.14 in /webapp
 2019-07-11 11:06:56 -03:00
dependabot-preview[bot]
c648d62288
[Security] Bump lodash from 4.17.11 to 4.17.14 in /webapp 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 10:32:28 +00:00
Robert Schäfer
fe235ab603
Merge pull request #1027 from Human-Connection/dependabot/npm_and_yarn/backend/lodash-4.17.14 
Bump lodash from 4.17.13 to 4.17.14 in /backend
 2019-07-11 12:30:24 +02:00
Robert Schäfer
e2eba389cc
Merge pull request #944 from Human-Connection/2019/kw27/data_import_emotions 
🍰 2019/kw27/data_import_emotions
 2019-07-11 12:27:48 +02:00
Matt Rider
2e97af074c Remove duplicate code 
- was silly for writing so much duplicate code to change the index of the array
- woke up with inspiration
 2019-07-11 07:10:57 -03:00
dependabot-preview[bot]
fb26c7aac8
Bump lodash from 4.17.13 to 4.17.14 in /backend 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 06:27:18 +00:00
mattwr18
4265cd057b
Merge pull request #1022 from Human-Connection/dependabot/npm_and_yarn/webapp/lodash.template-4.5.0 
[Security] Bump lodash.template from 4.4.0 to 4.5.0 in /webapp
 2019-07-11 00:04:10 -03:00
mattwr18
7e8fc45e70
Merge pull request #1021 from Human-Connection/dependabot/npm_and_yarn/backend/lodash.mergewith-4.6.2 
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /backend
 2019-07-11 00:03:47 -03:00
dependabot-preview[bot]
6fd166deca
[Security] Bump lodash.template from 4.4.0 to 4.5.0 in /webapp 
Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.4.0...4.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 01:42:34 +00:00
dependabot-preview[bot]
b2c3382a42
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /backend 
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 00:09:04 +00:00
Matt Rider
79930dcdc4 Refetch posts when a user clicks on the HC logo 2019-07-10 18:44:07 -03:00
Matt Rider
6536574a3b Refactor FilterPosts 
- extract FilterPostsMenuItems to its own component
- update tests accordingly
- add _.chunk from lodash to dry out code
 2019-07-10 17:10:01 -03:00
Ulf Gebhardt
0c181758cb
emotion modeled as enum 2019-07-10 12:50:28 +02:00
Matt Rider
0113751003 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-10 07:09:58 -03:00
Robert Schäfer
e6e9b1b7d7
Merge pull request #994 from Human-Connection/signup_as_admin 
Signup new users as admin
 2019-07-10 11:46:50 +02:00
Robert Schäfer
808f703a4f
Merge pull request #1009 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.5.4 
Bump @babel/preset-env from 7.5.2 to 7.5.4 in /backend
 2019-07-10 11:05:21 +02:00
Robert Schäfer
238d6b98de
Merge pull request #1013 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.5.4 
Bump @babel/preset-env from 7.4.5 to 7.5.4 in /webapp
 2019-07-10 11:04:50 +02:00
Robert Schäfer
b7b47e4dde
Merge pull request #1007 from Human-Connection/remove_right_padding 
Follow up of #958
 2019-07-10 11:04:23 +02:00
Robert Schäfer
0d3f48e258
Merge pull request #1014 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.8 
Bump apollo-server from 2.6.6 to 2.6.8 in /backend
 2019-07-10 09:34:58 +02:00
Robert Schäfer
6f4e1b6f30 Fix cypress 2019-07-10 09:01:57 +02:00
Robert Schäfer
6f011b3421
Merge pull request #1008 from Human-Connection/dependabot/npm_and_yarn/cypress-3.4.0 
Bump cypress from 3.3.2 to 3.4.0
 2019-07-10 08:51:07 +02:00
dependabot-preview[bot]
7a2eb2a026
Bump @babel/preset-env from 7.4.5 to 7.5.4 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:50:37 +00:00
dependabot-preview[bot]
ede3d7bc72
Bump @babel/preset-env from 7.5.2 to 7.5.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.2 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.2...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:50:33 +00:00
Robert Schäfer
9096af75b0
Merge pull request #1012 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.5.4 
Bump @babel/core from 7.5.0 to 7.5.4 in /backend
 2019-07-10 08:49:19 +02:00
Robert Schäfer
049f19043f
Merge pull request #1010 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.5.4 
Bump @babel/core from 7.5.0 to 7.5.4 in /webapp
 2019-07-10 08:48:15 +02:00
dependabot-preview[bot]
7f68fd6c9b
Bump apollo-server from 2.6.6 to 2.6.8 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.6 to 2.6.8.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.6...apollo-server@2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:44:08 +00:00
Robert Schäfer
a2021d857e
Merge pull request #1011 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.8 
Bump apollo-server-testing from 2.6.7 to 2.6.8 in /backend
 2019-07-10 08:41:53 +02:00
Robert Schäfer
6c7ce73c5d
Merge pull request #1015 from Human-Connection/dependabot/npm_and_yarn/backend/lodash-4.17.13 
Bump lodash from 4.17.11 to 4.17.13 in /backend
 2019-07-10 08:40:39 +02:00
Alexander Friedland
6703b54b0e
Merge pull request #999 from Human-Connection/381-footer 
footer created imprint and all language ok
 2019-07-10 06:40:36 +02:00
dependabot-preview[bot]
e0d8e4a008
Bump lodash from 4.17.11 to 4.17.13 in /backend 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:26:43 +00:00
dependabot-preview[bot]
a6de369277
Bump @babel/core from 7.5.0 to 7.5.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:25:20 +00:00
dependabot-preview[bot]
a0d9c6dbaa
Bump apollo-server-testing from 2.6.7 to 2.6.8 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.7 to 2.6.8.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.7...apollo-server-testing@2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:24:40 +00:00
dependabot-preview[bot]
db4122da09
Bump @babel/core from 7.5.0 to 7.5.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:24:01 +00:00
dependabot-preview[bot]
133012145c
Bump cypress from 3.3.2 to 3.4.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:23:04 +00:00
Robert Schäfer
d90bb90d0c Follow up of #958 
I think I deleted the styling by using bot `:width` and `style`
property. I'm not quite sure if this resolves our problem. Anyways
I don't see a reason for having a right padding so I just removed it.
 2019-07-10 02:11:12 +02:00
Robert Schäfer
54947b113d
Merge pull request #958 from Human-Connection/984-minimum-size-of-body 
🐛 [Bug]  full ads width use with small devices
 2019-07-10 02:00:29 +02:00
Robert Schäfer
65679d417d Move page components into single file 
+ Spice it up a little by translating the page component's title.
 2019-07-10 01:25:34 +02:00
Robert Schäfer
310cc52ddf Don't remove the previous styling 2019-07-10 01:23:36 +02:00
Robert Schäfer
ce397b6746 Fix English locale 2019-07-10 00:03:26 +02:00
Robert Schäfer
17743043ca Always prefer <nuxt-link> over <a> 
@ogerly, if we link into another page of our application, we should
always use `nuxt-link`. It is a feature of NuxtJs and it does
prefetching, among other things. So it improves the performance of
our site!
 2019-07-09 23:35:34 +02:00
Matt Rider
1399da8b70 Add router callback, clear searches on logo click 2019-07-09 18:35:27 -03:00