ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-20 20:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,976 Commits 104 Branches 1,559 Tags
Commit Graph

4010 Commits

Author SHA1 Message Date
Dries Cruyskens
abdc80727d Hero image height on post page is now set withouth having to wait for the image to load. Vue gives the image aspect ratio to css as a css variable, css then sets the correct height in fuction of the width. 2020-05-28 15:15:14 +02:00
Wolfgang Huß
c517c0fd45 Fix lint 2020-05-28 12:04:26 +02:00
Wolfgang Huß
dcc5b74038 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-05-28 10:52:24 +02:00
Wolfgang Huß
5e1a538094 Fix locales 2020-05-28 10:52:11 +02:00
Moriz Wahl
a30ae12d65 specs added for SearchResults component. 
General use of v-if instead of v-show. Why render a not displayed component?
Helper added to fake posts.
 2020-05-12 18:30:26 +02:00
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
Wolfgang Huß
a99ee763e6 Upgrade to v0.6.1 2020-05-04 12:40:34 +02:00
ogerly
7b48339e18 fix: admin can delete himself 2020-04-30 15:59:22 +02:00
ogerly
446fd18e3b location: de one and more numbers 2020-04-30 15:54:17 +02:00
ogerly
fcc46d7f61 fix: DeleteData.spec.js 2020-04-30 12:56:03 +02:00
ogerly
3de96a2eaa fix: lint 2020-04-30 12:36:12 +02:00
ogerly
c471f9797f fix: is not sorted by keys 2020-04-30 12:32:53 +02:00
ogerly
b2326c710e git pull conflicts fixed 2020-04-29 10:10:14 +02:00
ogerly
7e5a7f5d42 bug: deleteUser on old status, currentUserCounts are retrieved additionally, admin cannot delete himself via his user settings 2020-04-29 10:04:54 +02:00
ogerly
c80f7d0518 feature: seach pageination WIP 2020-04-28 11:20:51 +02:00
ogerly
4210727ddf bug: fix - contributionCount, commentCount remove from code 2020-04-27 13:55:29 +02:00
ogerly
8a2d238f96 fix: #3498 Checkboxes missing on delete user account page 2020-04-26 13:11:32 +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
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
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
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
ogerly
8f56ad4a3b feature: hashtag inserted and taken over in search 2020-04-14 18:16:44 +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
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
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
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
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
Moriz Wahl
1adc2b6962 MMerge branch 'master' into 2144-Add_Search_Results_Page 2020-04-08 17:42:35 +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
dependabot-preview[bot]
34a856a98f
build(deps-dev): bump css-loader from 3.5.0 to 3.5.1 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.0 to 3.5.1.
- [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.0...v3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-08 04:23:52 +00:00