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

10382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
94937c1496 feature: pagenation extended. page number display added, scroll to top at next and back, post display wider 2020-04-15 17:49:11 +02:00
ogerly
0865f63583 feature: incorrect calculation of the total all search results fixed 2020-04-15 16:30:13 +02:00
Moriz Wahl
c059b44297 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-04-15 14:32:58 +02:00
Moriz Wahl
e090ac6998 specs for searches by type 2020-04-15 14:32:13 +02:00
ogerly
026cd97a57 feature: sum fail fix 2020-04-15 11:27:29 +02:00
ogerly
9fe882b39b feature: sum search results added, Enter closes the preview search field, language file EN, DE adjusted 2020-04-15 11:18:15 +02:00
Moriz Wahl
e03d209c45 In the search field, if the first charater is '!', '@' or '#' it only shows results for posts, users or hastags with a limit of 15 in the dropdown 2020-04-15 09:58:23 +02:00
Moriz Wahl
2544edcb29 no more error messages on page load 2020-04-14 21:50:53 +02:00
Moriz Wahl
7562af227e pages are counted correctly 2020-04-14 21:41:45 +02:00
Moriz Wahl
40c35599f6 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-04-14 18:53:49 +02:00
Moriz Wahl
b2a5d51106 refactoring 2020-04-14 18:53:40 +02:00
ogerly
8f56ad4a3b feature: hashtag inserted and taken over in search 2020-04-14 18:16:44 +02:00
Moriz Wahl
c060ad0c4a refactoring 2020-04-14 16:45:29 +02:00
Moriz Wahl
499f9859e8 skip and offset removes from cypher as it has no effect. Added function to apply limits 2020-04-13 23:38:40 +02:00
Robert Schäfer
a9111973c8
Merge pull request #3475 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.5.2 
build(deps-dev): bump css-loader from 3.5.1 to 3.5.2 in /webapp
 2020-04-13 16:52:32 +02:00
Moriz Wahl
ee1569d5d9 refactoring of search by types 2020-04-13 16:34:47 +02:00
mattwr18
08f2f1e4b4
Merge pull request #3472 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-context-1.0.20 
build(deps): bump apollo-link-context from 1.0.19 to 1.0.20 in /backend
 2020-04-13 09:13:58 +02:00
dependabot-preview[bot]
fb95c7902d
build(deps-dev): bump css-loader from 3.5.1 to 3.5.2 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.5.1...v3.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-13 04:18:50 +00:00
dependabot-preview[bot]
9af0fe01ce
build(deps): bump apollo-link-context from 1.0.19 to 1.0.20 in /backend 
Bumps [apollo-link-context](https://github.com/apollographql/apollo-link) from 1.0.19 to 1.0.20.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-context@1.0.19...apollo-link-context@1.0.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-13 04:14:52 +00:00
Robert Schäfer
cd0fdb8c09
Merge pull request #3467 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.12.0 
build(deps): bump date-fns from 2.11.1 to 2.12.0 in /webapp
 2020-04-11 17:09:15 +02:00
Robert Schäfer
dbf558faf7
Merge pull request #3459 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-25.3.0 
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /webapp
 2020-04-11 17:09:09 +02:00
Robert Schäfer
1f88dc2f57
Merge pull request #3464 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.12.0 
build(deps-dev): bump date-fns from 2.11.1 to 2.12.0
 2020-04-11 17:09:04 +02:00
Robert Schäfer
b047a3d74f
Merge pull request #3465 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-http-1.5.17 
build(deps): bump apollo-link-http from 1.5.16 to 1.5.17 in /backend
 2020-04-11 17:08:56 +02:00
dependabot-preview[bot]
b9aaafa01c
build(deps): bump date-fns from 2.11.1 to 2.12.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.11.1 to 2.12.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.11.1...v2.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-10 04:25:39 +00:00
dependabot-preview[bot]
10e2ed1800
build(deps): bump apollo-link-http from 1.5.16 to 1.5.17 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.16 to 1.5.17.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.16...apollo-link-http@1.5.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-10 04:18:51 +00:00
dependabot-preview[bot]
15271a9f89
build(deps-dev): bump date-fns from 2.11.1 to 2.12.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.11.1 to 2.12.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.11.1...v2.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-10 04:15:37 +00:00
Raphael Beer
30f66c3e14
Review: storybook 2020-04-10 00:21:31 +02:00
Raphael Beer
e018e2ead9
Review: add hasMore() computed value + 
Replacing varying conditions for same
  logic with computed value `hasMore`.
 2020-04-09 23:52:18 +02:00
Raphael Beer
b3f1137006
Review: fix styles 2020-04-09 23:39:47 +02:00
Raphael Beer
2c7ca87acc
Review: lint 2020-04-09 23:16:37 +02:00
Raphael Beer
7ff9d617d6
Review: remove showing both types in stories 2020-04-09 23:16:37 +02:00
Raphael Beer
38233da6d0
review: apply suggestions 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2020-04-09 23:01:54 +02:00
dependabot-preview[bot]
101dfd7278
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 25.2.7 to 25.3.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v25.2.7...v25.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 10:55:44 +00:00
Robert Schäfer
501178c9ea
Merge pull request #3456 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-25.3.0 
build(deps-dev): bump babel-jest from 25.2.6 to 25.3.0 in /webapp
 2020-04-09 12:52:47 +02:00
dependabot-preview[bot]
b131e41133
build(deps-dev): bump babel-jest from 25.2.6 to 25.3.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.2.6 to 25.3.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.3.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 06:57:24 +00:00
mattwr18
1c27e0b1f9
Merge pull request #3454 from Human-Connection/dependabot/npm_and_yarn/backend/prettier-2.0.4 
build(deps-dev): bump prettier from 2.0.2 to 2.0.4 in /backend
 2020-04-09 08:54:44 +02:00
mattwr18
05018a89ff
Merge pull request #3453 from Human-Connection/dependabot/npm_and_yarn/backend/jest-25.3.0 
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /backend
 2020-04-09 08:54:28 +02:00
mattwr18
5125a2b34b
Merge pull request #3452 from Human-Connection/dependabot/npm_and_yarn/expect-25.3.0 
build(deps-dev): bump expect from 25.2.7 to 25.3.0
 2020-04-09 08:53:46 +02:00
dependabot-preview[bot]
e042a44cf5
build(deps-dev): bump prettier from 2.0.2 to 2.0.4 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 2.0.2 to 2.0.4.
- [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/2.0.2...2.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 04:17:23 +00:00
dependabot-preview[bot]
336599589b
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 25.2.7 to 25.3.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v25.2.7...v25.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 04:16:32 +00:00
dependabot-preview[bot]
db78076292
build(deps-dev): bump expect from 25.2.7 to 25.3.0 
Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect) from 25.2.7 to 25.3.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.3.0/packages/expect)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 04:15:29 +00:00
Moriz Wahl
269c2d78dd searchHashtags added 2020-04-08 17:59:49 +02:00
Moriz Wahl
1adc2b6962 MMerge branch 'master' into 2144-Add_Search_Results_Page 2020-04-08 17:42:35 +02:00
Moriz Wahl
80776d012d added userCounts and postCounts to specific searchResults 2020-04-08 17:39:09 +02:00
mattwr18
941dd97592
Merge pull request #3446 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.3.1 
build(deps-dev): bump @vue/cli-shared-utils from 4.3.0 to 4.3.1 in /webapp
 2020-04-08 15:11:58 +02:00
mattwr18
d044a58572
Merge pull request #3448 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.5.1 
build(deps-dev): bump css-loader from 3.5.0 to 3.5.1 in /webapp
 2020-04-08 15:11:39 +02:00
mattwr18
bc16d70319
Merge pull request #3443 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.12.0 
build(deps): bump apollo-server-express from 2.11.0 to 2.12.0 in /backend
 2020-04-08 08:42:19 +02:00
mattwr18
ff2aa7229e
Merge pull request #3441 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.9.5 
build(deps-dev): bump @babel/preset-env from 7.9.0 to 7.9.5 in /backend
 2020-04-08 08:41:56 +02:00
mattwr18
1dc79b11ad
Merge pull request #3439 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.11.8 
build(deps): bump metascraper-image from 5.11.6 to 5.11.8 in /backend
 2020-04-08 08:41:39 +02:00
mattwr18
659101fe99
Merge pull request #3438 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-2.2.1 
build(deps-dev): bump cypress-cucumber-preprocessor from 2.1.0 to 2.2.1
 2020-04-08 08:41:25 +02:00