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

9482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
8f44fd6410 use v-if instead of v-show 2020-05-11 21:17:20 +02:00
Moriz Wahl
0892d6aaa3 Pagination is working, pageSize set to 12 2020-05-11 17:53:48 +02:00
ogerly
2ffdbe80f8 WIP: pagenation 2020-05-07 16:24:51 +02:00
ogerly
446fd18e3b location: de one and more numbers 2020-04-30 15:54:17 +02:00
ogerly
c80f7d0518 feature: seach pageination WIP 2020-04-28 11:20:51 +02:00
ogerly
404b926a1f lint: clean 2020-04-22 19:03:45 +02:00
ogerly
cccb6cec83 test: user + pagination ok, rest WIP 2020-04-22 15:06:55 +02:00
ogerly
6e934ed6b2 merge: master ok 2020-04-22 10:05:09 +02:00
ogerly
4a60911c9a fix: lint and test for SearchableInput ok 2020-04-22 09:58:53 +02:00
Wolfgang Huß
9aacb22a58
Merge pull request #3293 from Human-Connection/1741-follow-lists 
feat: FollowerList [1741]
 2020-04-20 13:01:29 +02:00
Raphael Beer
e70faa0a2d
Review: user-teasers as unordered list 2020-04-19 17:58:22 +02:00
ogerly
1d79900e5e fix: lint 2020-04-17 08:51:07 +02:00
Raphael Beer
97a30ad8f8
Review: more cut off user-teaser vsisible 2020-04-16 20:15:10 +02:00
Raphael Beer
32e5801d20
Merge pull request #3356 from Human-Connection/2727-fix-disappearing-embed-text 
fix: Text of editor embeds disappearing on click [2727]

Quick fix to at least stop the text from disappearing. Embeds need a general overhaul, which is being tracked in #3395
 2020-04-16 12:48:56 +02:00
Raphael Beer
ee33731178
Review: test improvements 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2020-04-15 23:32:54 +02:00
ogerly
2d6665b278 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-04-15 17:49:48 +02:00
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