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

9469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wolfgang Huß
c734463c27
Merge pull request #3774 from Human-Connection/3628-increase-header-ruler-margin 
feat: 🍰 Increase Margin Of Header And Ruler For Better Legibility
 2020-08-05 11:28:04 +02:00
Ritesh
c3265f53ab Changed top margin to a higher value as compared to margin bottom 2020-08-05 13:55:12 +05:30
Wolfgang Huß
17a296b82e Refactore and cleanup backend tests 
- Removed double declarations.
- Put assignments in 'beforeEach'.
 2020-08-05 08:53:45 +02:00
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
ogerly
b25bf7b0b3 fix: lint 2020-08-03 15:22:21 +02:00
ogerly
388331f5ae test specs clear 2020-08-03 15:13:55 +02:00
ogerly
d2a43cecd7 fix lint: tests and lint ok 2020-07-30 12:14:27 +02:00
ogerly
9d5c192869 tests user.spec.js tests once clean once broken always alternating 2020-07-30 11:45:51 +02:00
Wolfgang Huß
1ce43af746
Merge pull request #3662 from Human-Connection/Tirokk-disable-stale-bot 
chore: 💬 Rename stale.yml to stale-disabled.yml
 2020-07-13 11:47:11 +02:00
Lala Sabathil
a44ec015a6
Merge pull request #3650 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-core-2.15.0 
build(deps): [security] bump apollo-server-core from 2.12.0 to 2.15.0 in /backend
 2020-06-23 17:16:57 +02:00
Wolfgang Huß
b8ecb296b5
Rename stale.yml to stale-disabled.yml 
Disable the stale-bot for a while by renaming it’s file.
 2020-06-19 14:24:00 +02:00
dependabot-preview[bot]
9701727a05
build(deps): [security] bump apollo-server-core in /backend 
Bumps [apollo-server-core](https://github.com/apollographql/apollo-server) from 2.12.0 to 2.15.0. **This update includes a security fix.**
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-core@2.12.0...apollo-server-core@2.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-18 04:16:17 +00:00
Wolfgang Huß
10fe848d14
Merge pull request #3609 from Human-Connection/code-of-conduct-mail 
fix: Corrected Code-of-Conduct Mail Link
 2020-06-10 15:57:32 +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ß
c113fde014
Merge pull request #3583 from Human-Connection/3013-set-the-teaser-image-to-the-appropriate-size-ratio-from-the-beginning 
feat: 🍰 Hero image height on post page is now set without having to wait for…
 2020-06-06 11:52:34 +02:00
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
Wolfgang Huß
9716bbb07c
Merge pull request #3584 from Human-Connection/3566-wrong-unit-test-command-in-webapp-documentation 
fix: Fixed webapp unit test command.
 2020-06-03 16:02:08 +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ß
c9dc7d9b5e
Merge pull request #3525 from Human-Connection/updgrade-to-v0.6.1 
chore: Upgrade to v0.6.1
 2020-05-04 13:31:25 +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
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
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