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

3279 Commits

Author SHA1 Message Date
Mogge
907b3214aa
Merge pull request #3769 from Human-Connection/Elweyn/issue2112 
fix: 🍰 Comment Counters Are Now Equal
 2020-08-11 21:30:59 +02:00
Hannes Heine
823056b59e Added the user that writes the comment to the authentication. Test reply to comment edited. Test update comment added. Test delete comment pending. 2020-08-11 16:01:42 +02:00
Hannes Heine
34ba9d8c0b Lint over the frontend code. 2020-08-07 14:07:53 +02:00
Hannes Heine
def6a9d444 Changed the class to use this.post.comments instead of the computed postComments so that issue are fixed. 2020-08-07 13:17:14 +02:00
Hannes Heine
7f8be5deab fix: #3357 now the comment deletion and comment updates are seen directly after the event is triggered. 2020-08-06 16:18:27 +02:00
Hannes Heine
d513fec7fe Added test comment that is disabled and changes the test name so that we see that the test checks the comment count to ignore disabled and deleted comments. 2020-08-06 16:12:36 +02:00
Wolfgang Huß
f0b29d9808
Merge pull request #3780 from Human-Connection/feat-3657-redesign-data-privacy-warning-box 
feat: 🍰 Redesign Data Privacy Warning Box
 2020-08-06 11:28:18 +02:00
Thiru
270a150db4
Update webapp/locales/en.json 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2020-08-05 16:57:20 +02:00
Wolfgang Huß
7106fa8ada
Merge pull request #3506 from Human-Connection/3498-Checkboxes_missing_on_delete_user_account_page 
fix: 🍰 Checkboxes Not Missing Anymore On Delete User Account Page
 2020-08-05 15:06:51 +02:00
Thiru
5a2fdb08be Redesign data-privacy-warning 
Updated Buttons Styles.
Changed Order of the button.
Updated i18n.
 2020-08-05 14:10:15 +02:00
Ritesh
c3265f53ab Changed top margin to a higher value as compared to margin bottom 2020-08-05 13:55:12 +05:30
Ritesh
a8b3da30d6 fix: Increase margin of header and ruler for better legibility 
fix: Margin of H3 H4 HR was set to zero by reset.css. This was causing
problem in readability.
 2020-08-04 18:49:37 +05:30
Wolfgang Huß
9ff1fc5b62 Fix linting 2020-08-04 14:21:35 +02:00
ogerly
1c1a0030f7 fix: i have taken over and implemented the proposals from tirrok 2020-08-04 13:08:11 +02:00
ogerly
9b14a5327a tests: reviews works 2020-08-04 11:42:12 +02:00
Hannes Heine
084a5172e9 Linter on webapp 2020-08-03 18:53:20 +02:00
Hannes Heine
fe999776c0 Filter out the deleted comments of the comment counter 2020-08-03 15:09:33 +02:00
Hannes Heine
9be480add2 Added a deleted comment to the Test case 2020-08-03 15:08:57 +02:00
Wolfgang Huß
a4e4575f19 Fix lint 2020-06-10 15:11:40 +02:00
adarsh-av13
2d66348c1b corrected code-of-conduct mail link 2020-06-08 00:32:21 +05:30
Wolfgang Huß
e33a190ffe Fix syntax 
- My conflict resolved on GitHub missed a bracket.
 2020-06-06 10:04:51 +02:00
Wolfgang Huß
cf3f9fa210
Merge branch 'master' into 3013-set-the-teaser-image-to-the-appropriate-size-ratio-from-the-beginning 2020-06-06 09:50:49 +02:00
DriesCruyskens
a245fd2d50
Merge pull request #3589 from Human-Connection/2244-order-tags-in-cloud-alphabetically 
feat: 🍰 Alphabetically sorting tags using compute functions on index and more…
 2020-06-05 22:34:36 +02:00
Dries Cruyskens
38d7ab9661 Moved the sorting function to helper file to prevent duplicate code. 2020-06-04 00:18:51 +02:00
Dries Cruyskens
43a3b57dd9 Fixed linting issues and comments. 2020-05-30 03:20:50 +02:00
Dries Cruyskens
136e83afc2 Alphabetically sorting tags using compute functions on index and more-info page. Added test checking tags are present and shown alphabetically. 2020-05-30 03:10:11 +02:00
Dries Cruyskens
4ab7972a83 Inversed the aspect ratio to fix bug. 2020-05-29 18:26:23 +02:00
DriesCruyskens
4f18def21a
Fixed webapp unit test command. 2020-05-28 16:32:33 +02:00
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ß
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
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
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
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
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
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