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

9153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
5e1a538094 Fix locales 2020-05-28 10:52:11 +02: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
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
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
Moriz Wahl
7d29400ef9 tag fulltext index added to store 2020-03-19 15:44:30 +01:00
Moriz Wahl
4e3705f607 specs for Search for Hashtags 2020-03-19 15:10:52 +01:00
Moriz Wahl
7024ea0b30 specs for Search for Hashtags 2020-03-19 15:09:43 +01:00
Moriz Wahl
e7d0e1b61e removed console statement 2020-03-19 14:30:32 +01:00
Moriz Wahl
1c43d5fe6f Search for Hashtags works due watching route in pages/index.vue 2020-03-19 14:19:13 +01:00
Moriz Wahl
07fbe92fa8 fixed locales after mistakes in rebase 2020-03-19 13:26:08 +01:00
Moriz Wahl
014be6e7f8 partially working, index page does not update when route is changed 2020-03-19 12:59:15 +01:00
Moriz Wahl
16ad565ec8 partially working, index page does not update when route is changed 2020-03-19 12:55:59 +01:00
Moriz Wahl
e236838523 migration added for index for fulltext tag search 2020-03-19 12:55:59 +01:00
mattwr18
054a96776b
Merge pull request #3283 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.17 
build(deps-dev): bump @storybook/addon-a11y from 5.3.14 to 5.3.17 in /webapp
 2020-03-19 08:37:11 +01:00
dependabot-preview[bot]
bc67ade3b6
build(deps): bump graphql-shield from 7.2.0 to 7.2.1 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.2.0...v7.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-19 04:19:12 +00:00
Robert Schäfer
b325681442
Merge pull request #3294 from Human-Connection/dependabot/npm_and_yarn/cross-env-7.0.2 
build(deps-dev): bump cross-env from 6.0.3 to 7.0.2
 2020-03-19 02:05:22 +01:00
dependabot-preview[bot]
bb399079c9
build(deps-dev): bump cross-env from 6.0.3 to 7.0.2 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.2.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-18 23:31:19 +00:00
dependabot-preview[bot]
83039ec112
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.3.14 to 5.3.17.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.17/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-18 23:29:07 +00:00
Robert Schäfer
6ca0df8c51
Merge pull request #3285 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.17 
build(deps-dev): bump @storybook/vue from 5.3.14 to 5.3.17 in /webapp
 2020-03-19 00:26:28 +01:00
Robert Schäfer
dba7c4eff0
Merge pull request #3288 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.2.0 
build(deps): bump graphql-shield from 7.0.14 to 7.2.0 in /backend
 2020-03-19 00:26:13 +01:00
Robert Schäfer
81d69e1bd2
Merge pull request #3291 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.12.0 
build(deps): bump nuxt from 2.11.0 to 2.12.0 in /webapp
 2020-03-19 00:26:04 +01:00
Robert Schäfer
c7f74505ea
Merge pull request #3289 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.1.3 
build(deps): bump cookie-universal-nuxt from 2.1.2 to 2.1.3 in /webapp
 2020-03-19 00:25:55 +01:00
dependabot-preview[bot]
1003d5ad8a
build(deps): bump nuxt from 2.11.0 to 2.12.0 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.11.0 to 2.12.0.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.11.0...v2.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-18 20:48:50 +00:00
dependabot-preview[bot]
a69c26bb25
build(deps): bump cookie-universal-nuxt from 2.1.2 to 2.1.3 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.2...v2.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-18 20:47:59 +00:00
dependabot-preview[bot]
8c0a63a580
build(deps-dev): bump @storybook/vue from 5.3.14 to 5.3.17 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.14 to 5.3.17.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.17/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-18 20:47:32 +00:00
dependabot-preview[bot]
1d5cad77eb
build(deps): bump graphql-shield from 7.0.14 to 7.2.0 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.14 to 7.2.0.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.14...v7.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-18 20:47:14 +00:00
mattwr18
cd3e02abcf
Merge pull request #3199 from Human-Connection/spec-for-searches 
feat: Specs For Searches
 2020-03-18 21:40:09 +01:00
mattwr18
800e33e1be chore: fix lint 2020-03-18 20:38:18 +01:00
Moriz Wahl
9c08db22dc Changes requested by @mattwr18 2020-03-18 20:38:18 +01:00
Moriz Wahl
48564565a5 matchBeginningOfWords more compact 2020-03-18 20:38:18 +01:00
Moriz Wahl
0a15d785a3 test that a post written by muted user is not included in the search results 2020-03-18 20:38:18 +01:00