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

3131 Commits

Author SHA1 Message Date
mattwr18
b2db5e6057 Skip tests for DonationsInfo 
- the functionality it's testing has been suspended. If we add back that
functionality, we should refactor the tests/stop skipping.
- Or maybe we can remove them in a separate PR??
 2020-01-10 10:35:12 +01:00
Moriz Wahl
8c7079cf81 changes requested by reviews 2020-01-10 09:23:56 +01:00
mattwr18
5d5574b1b5 Blocked users cannot comment on my posts 2020-01-09 16:07:25 +01:00
mattwr18
dae1062ad0 Use node LTS in production 2020-01-09 13:33:05 +01:00
mattwr18
36dadfb4c1
Merge pull request #2711 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.9.0 
build(deps): bump date-fns from 2.8.1 to 2.9.0 in /webapp
 2020-01-09 13:22:56 +01:00
Alina Beck
70d632e392 use scss tokens for counter icon and loading spinner 2020-01-09 14:47:14 +05:30
dependabot-preview[bot]
61e6868c18
build(deps): bump date-fns from 2.8.1 to 2.9.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.8.1 to 2.9.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.8.1...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 09:09:42 +00:00
Alina Beck
b71638d29f use scss variables in base button component 2020-01-09 14:31:25 +05:30
Alina Beck
04e5ecc87d fix tests and lint errors 2020-01-09 13:48:30 +05:30
Alina Beck
93b6323c34 make cancel buttons red 2020-01-09 13:37:15 +05:30
Alina Beck
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
Alina Beck
1b9249c685 manage button states and color schemes with mixin 2020-01-09 13:13:33 +05:30
dependabot-preview[bot]
1a15dd4db5
build(deps): bump node from 13.5.0-alpine to 13.6.0-alpine in /webapp 
Bumps node from 13.5.0-alpine to 13.6.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 04:19:10 +00:00
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute 
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
 2020-01-08 18:04:26 +01:00
mattwr18
cd7f0e2783 Fix/extend cypress tests 2020-01-08 17:08:06 +01:00
Alina Beck
be30b55f65 fix styling of terms-and-conditions button 2020-01-08 14:31:37 +05:30
Alina Beck
53a504010c allow overflow for notifications counter 2020-01-08 14:28:21 +05:30
Alina Beck
5d2af860db wrap create-post link around button on user profile 2020-01-08 13:53:02 +05:30
Alina Beck
cc38fa2b0a make content-menu clickable on post-card 2020-01-08 13:49:07 +05:30
Alexander Friedland
25ac9b6cef
Merge pull request #2678 from Human-Connection/2659-text-change-for-signup 
Changes Text For SignUp
 2020-01-07 21:47:20 +01:00
Alexander Friedland
9c3f0f3d29
Merge pull request #2655 from Human-Connection/erhardtstiefel-patch-10-1 
Update de.json
 2020-01-07 21:45:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist 
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
 2020-01-07 18:57:35 +01:00
Moriz Wahl
3f37b007d7 improved specs 2020-01-07 15:35:04 +01:00
Moriz Wahl
57ab9128ea removed Hashtag search 2020-01-07 09:16:34 +01:00
ogerly
223d1ca3c0 remove console 2020-01-07 06:02:19 +01:00
ogerly
9aa680ce50 Fix lint 2020-01-07 05:40:09 +01:00
ogerly
28839ee2b4 click on 'answered' to put the username of the respective comment into the editor as a mention. 2020-01-06 18:02:46 +01:00
Moriz Wahl
d4b3afb07f fixes #2659 2020-01-06 17:23:50 +01:00
Moriz Wahl
d2088a3a92 Missing SearchTag.vue added 2020-01-06 16:59:55 +01:00
Moriz Wahl
71c9d92aea query string for searches changed and basics for Hashtag search added 2020-01-06 16:46:43 +01:00
Moriz Wahl
bc3aa519d0 Specs for Searches 2020-01-06 16:10:28 +01:00
mattwr18
965b9a8c41
Merge pull request #2671 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.3.0 
build(deps-dev): bump eslint-plugin-jest from 23.2.0 to 23.3.0 in /webapp
 2020-01-06 12:33:16 +01:00
dependabot-preview[bot]
3e925b5931
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.2.0 to 23.3.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.2.0...v23.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 10:23:32 +00:00
ogerly
af760c17ea Merge branch '1188-Delete_teaser_image' of https://github.com/Human-Connection/Human-Connection into 1188-Delete_teaser_image 2020-01-06 11:07:46 +01:00
ogerly
f8c0a34194 Proposed changes accepted and incorporated 2020-01-06 11:06:59 +01:00
Alexander Friedland
cd8b244741
Update webapp/components/ContributionForm/ContributionForm.vue 
showDeleteButton change

Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2020-01-06 10:57:48 +01:00
dependabot-preview[bot]
b8b8d950fb
build(deps-dev): bump css-loader from 3.4.0 to 3.4.1 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.0 to 3.4.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.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 04:21:35 +00:00
Robert Schäfer
e4d5c21ea4
Merge pull request #2632 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.9.0 
build(deps-dev): bump eslint-config-prettier from 6.7.0 to 6.9.0 in /webapp
 2020-01-05 15:58:52 +01:00
dependabot-preview[bot]
cb4eca63d4
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.7.0 to 6.9.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/commits/v6.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-03 18:21:42 +00:00
dependabot-preview[bot]
304e843a42
build(deps): bump @nuxtjs/axios from 5.8.0 to 5.9.2 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.8.0 to 5.9.2.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.8.0...v5.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-03 04:21:13 +00:00
Erhardt Stiefel
711675d674
Update de.json 
Is it ok, if I do the same change for the other languages?
 2020-01-01 14:29:48 +01:00
Robert Schäfer
e1b89d34f5
Merge branch 'master' into dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.2.0 2019-12-31 15:50:49 +01:00
Robert Schäfer
98dfa0f711
Merge pull request #2643 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.1.2 
build(deps-dev): bump @vue/cli-shared-utils from 4.1.1 to 4.1.2 in /webapp
 2019-12-31 15:50:06 +01:00
Robert Schäfer
0ef8d4d72c
Merge pull request #2644 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.1.2 
build(deps-dev): bump eslint-plugin-vue from 6.1.1 to 6.1.2 in /webapp
 2019-12-31 15:49:53 +01:00
dependabot-preview[bot]
5c07b9dbb2
build(deps-dev): bump eslint-plugin-node in /webapp 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 10.0.0 to 11.0.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v10.0.0...v11.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 04:23:14 +00:00
dependabot-preview[bot]
98cbed6b1d
build(deps-dev): bump eslint-plugin-vue from 6.1.1 to 6.1.2 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.1.1 to 6.1.2.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.1.1...v6.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 04:22:39 +00:00
dependabot-preview[bot]
777d70ec7c
build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.1.2/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 04:21:43 +00:00
dependabot-preview[bot]
93cbd96cff
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.1.1 to 23.2.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.1.1...v23.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 04:21:10 +00:00
Robert Schäfer
a5511cf00d
Merge pull request #2579 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.7.7 
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7 in /webapp
 2019-12-30 19:18:50 +01:00
Robert Schäfer
dfedf6e97b
Merge pull request #2617 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-6.8.0 
build(deps-dev): bump eslint from 6.7.2 to 6.8.0 in /webapp
 2019-12-30 19:16:01 +01:00