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

11194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
27c3c02e07 refactor: Extract CategoriesFilter to it own spec 2020-03-25 11:02:28 +01:00
mattwr18
38d2edf0f2 refactor: Extract EmotionsFilter to its own spec 2020-03-25 11:02:28 +01:00
mattwr18
4f8a4c6753 Refactor LanguageFilter to remove ds-flex 2020-03-25 11:02:28 +01:00
mattwr18
e400a10c45 chore: rename/refactor filter, make responsive 
- Make the emotions filter similar in style to CategoriesFilter
 2020-03-25 11:02:28 +01:00
mattwr18
0f03d09723 refactor: Extract FollowingFilter as own component 
Co-authored-by: Alina Beck <alina.beck@mail.com>
 2020-03-25 11:02:28 +01:00
mattwr18
b19a2a8dea Refactor GeneralFilter to remove unnecessary code 
- remove ds-flex, ds-flex-item, ds-space, ds-heading
- not really happy with the design, and in mobile the divider border is
  hidden(!?)
 2020-03-25 11:02:28 +01:00
Alina Beck
1ffde6bf10 refactor: CategoriesFilter to not use ds-flex 
Co-authored-by: mattwr18 <mattwr18@gmail.com>

- introduce LabeledButton component
- rename FilterMenu to HashtagsFilter and FilterPosts to FilterMenu
 2020-03-25 11:02:00 +01:00
dependabot-preview[bot]
6b5fda4517
build(deps-dev): bump @babel/preset-env from 7.8.7 to 7.9.0 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.7 to 7.9.0.
- [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.8.7...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-25 09:06:06 +00:00
dependabot-preview[bot]
b58f9e524e
build(deps-dev): bump @babel/register from 7.8.6 to 7.9.0 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.8.6 to 7.9.0.
- [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.8.6...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-25 09:05:47 +00:00
mattwr18
33237d8803
Merge pull request #3331 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.15.0 
build(deps): bump @sentry/node from 5.14.2 to 5.15.0 in /backend
 2020-03-25 10:04:54 +01:00
mattwr18
6312a39211
Merge pull request #3327 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-2.0.2 
build(deps-dev): bump prettier from 1.19.1 to 2.0.2 in /webapp
 2020-03-25 10:04:36 +01:00
mattwr18
5b7f51dda3
Merge pull request #3315 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-loader-8.1.0 
build(deps-dev): bump babel-loader from 8.0.6 to 8.1.0 in /webapp
 2020-03-25 10:03:36 +01:00
mattwr18
198f1baf6c
Merge pull request #3310 from Human-Connection/dependabot/npm_and_yarn/babel/register-7.9.0 
build(deps-dev): bump @babel/register from 7.8.6 to 7.9.0
 2020-03-25 10:03:11 +01:00
mattwr18
05afa30cdb
Merge pull request #3304 from Human-Connection/dependabot/npm_and_yarn/babel/core-7.9.0 
build(deps-dev): bump @babel/core from 7.8.7 to 7.9.0
 2020-03-25 10:02:46 +01:00
dependabot-preview[bot]
688ca35bfe
build(deps): bump @sentry/node from 5.14.2 to 5.15.0 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.14.2 to 5.15.0.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.14.2...5.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-25 04:17:51 +00:00
roschaefer
574ed578bc Prefer router.replace if you delete sth. 
@ogerly, this is a perfect example where `this.$router.replace` makes a
lot more sense that `this.$router.push`. When you go back in your browser
history, you won't get 404 not found error.
 2020-03-24 22:48:11 +01:00
roschaefer
bfbbe365ed Improve style of deleteUser modal 2020-03-24 22:43:13 +01:00
roschaefer
6a0b5a22e0 Merge remote-tracking branch 'origin/master' into 17-Admin-Remove-user-profile 2020-03-24 21:48:22 +01:00
dependabot-preview[bot]
f6b044dbf2
build(deps-dev): bump babel-loader from 8.0.6 to 8.1.0 in /webapp 
Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.6 to 8.1.0.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.6...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-24 20:22:34 +00:00
dependabot-preview[bot]
f3831e5f37
build(deps-dev): bump @babel/core from 7.8.7 to 7.9.0 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.7 to 7.9.0.
- [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.8.7...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-24 20:21:33 +00:00
dependabot-preview[bot]
9d8cc96e80
build(deps-dev): bump @babel/register from 7.8.6 to 7.9.0 
Bumps [@babel/register](https://github.com/babel/babel) from 7.8.6 to 7.9.0.
- [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.8.6...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-24 20:21:12 +00:00
roschaefer
515aade3d0 Update eslint-config-* 2020-03-24 21:16:58 +01:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
dependabot-preview[bot]
af05492c04 build(deps-dev): bump prettier from 1.19.1 to 2.0.2 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.19.1 to 2.0.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.19.1...2.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-24 21:07:52 +01:00
Robert Schäfer
0f471235e4
Merge pull request #3323 from Human-Connection/3322-fix-image-url-returns-undefined 
fix(migration): return null for Image.url
 2020-03-24 13:41:23 +01:00
mattwr18
a668329327
Merge pull request #3296 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.2.1 
build(deps): bump graphql-shield from 7.2.0 to 7.2.1 in /backend
 2020-03-24 09:39:09 +01:00
mattwr18
91f58cf5bf
Merge pull request #3324 from Human-Connection/fix-broken-build-make-locations-spec-more-resilient 
fix(build): make locations spec more resilient
 2020-03-24 09:38:21 +01:00
mattwr18
6e0459ca2d fix(build): make locations spec more resilient 2020-03-23 20:45:17 +01:00
mattwr18
2c997b2d0a fix(build): make locations spec more resilient 2020-03-23 20:43:31 +01:00
mattwr18
698c85b262 fix(backend): Obfuscate avatar/image fix test 
- Then Image.url can be non-nullable because we return null if the
  resource is deleted.
 2020-03-23 19:16:10 +01:00
mattwr18
e0e026a8b8 fix(migration): return null for Image.url 2020-03-23 18:46:28 +01:00
Alina Beck
150442db01 use translations in SearchResults component 2020-03-23 17:14:41 +01:00
Alina Beck
a796efb54e use Empty component when no search results are found 2020-03-23 16:56:27 +01:00
Alina Beck
23a8010872 fix styling for post results 2020-03-23 14:29:49 +01:00
Alina Beck
72d979de55 improve user search results styling 2020-03-23 14:21:41 +01:00
Alina Beck
e03260d28d disable tabs when 0 results found 2020-03-23 13:57:56 +01:00
mattwr18
7371c34fec
Merge pull request #3303 from Human-Connection/merge_images_to_avoid_unique_constraint_violation 
fix(migration): Avoid unique constraint violation
 2020-03-23 09:31:04 +01:00
roschaefer
ed7b739d98 fix(migration): Avoid unique constraint violation 2020-03-20 20:25:37 +01:00
mattwr18
0f334bc163
Merge pull request #3302 from Human-Connection/update-to-version-0.5.0 
chore: upgrade to v0.5.0
 2020-03-20 14:59:15 +01:00
mattwr18
b08b2da0a1 chore: upgrade to v0.5.0 2020-03-20 12:35:20 +01:00
mattwr18
135908a07b
Merge pull request #3301 from Human-Connection/dependabot/npm_and_yarn/webapp/validator-13.0.0 
build(deps): bump validator from 12.2.0 to 13.0.0 in /webapp
 2020-03-20 12:31:48 +01:00
mattwr18
576b511d03
Merge pull request #3297 from Human-Connection/2143-search-for-hashtags 
feat: Search for Hashtags
 2020-03-20 12:25:47 +01:00
dependabot-preview[bot]
25d2aa81c4
build(deps): bump validator from 12.2.0 to 13.0.0 in /webapp 
Bumps [validator](https://github.com/chriso/validator.js) from 12.2.0 to 13.0.0.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/12.2.0...13.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-20 09:44:50 +00:00
mattwr18
8f99851492
Merge pull request #3300 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.11.7 
build(deps): bump metascraper-soundcloud from 5.11.6 to 5.11.7 in /backend
 2020-03-20 10:42:10 +01:00
mattwr18
255bc5e128
Merge pull request #3299 from Human-Connection/dependabot/npm_and_yarn/backend/validator-13.0.0 
build(deps): bump validator from 12.2.0 to 13.0.0 in /backend
 2020-03-20 10:41:55 +01:00
dependabot-preview[bot]
4e32ab7e6c
build(deps): bump metascraper-soundcloud in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.11.6 to 5.11.7.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-20 04:17:58 +00:00
dependabot-preview[bot]
42c8754e88
build(deps): bump validator from 12.2.0 to 13.0.0 in /backend 
Bumps [validator](https://github.com/chriso/validator.js) from 12.2.0 to 13.0.0.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/12.2.0...13.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-20 04:17:19 +00:00
Moriz Wahl
fa7f1bb111 use watchQuery to watch query in URL instead of watch 2020-03-19 20:16:25 +01:00
mattwr18
6d531c2cf8 chore: Update activeTab to show first results 
Co-authored-by: Alina Beck <alina.beck@mail.com>
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
Co-authored-by: kachulio1 <jngugi88@gmail.com>
 2020-03-19 16:47:41 +01:00
mattwr18
906f1bc0ca Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-03-19 16:02:54 +01:00