ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

5716 Commits

Author SHA1 Message Date
mattwr18
eb4536d855 refactor: test the functionality separately 2020-03-25 11:02:28 +01:00
mattwr18
5b8fecc6ef refactor: Extract LanguagesFilter to its own spec 2020-03-25 11:02:28 +01:00
mattwr18
bb183b1211 refactor: Extract FollowingFilter to its own spec 2020-03-25 11:02:28 +01:00
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
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
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
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
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
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
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
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
Alina Beck
5cb28d161d display empty state for search results 2020-03-19 15:37:40 +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
mattwr18
27c731cc1a Style tabs, add grid for posts 
Co-authored-by: Alina Beck <alina.beck@mail.com>
Co-authored-by: kachulio1 <jngugi88@gmail.com>
 2020-03-19 13:10:05 +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
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
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
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
mattwr18
6d83299e75 Extract component, start story, styling (wip) 2020-03-18 19:46:40 +01:00
mattwr18
627b47837e Rename findResources to searchResults 2020-03-18 19:45:48 +01:00
roschaefer
79fbdd7734 refactor: Avoid store use query parameters+routing 2020-03-18 16:02:15 +01:00
roschaefer
56f37702b1 refactor: Prefer router.push over router.replace 
push maintains the history
 2020-03-18 15:09:59 +01:00