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

9189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
14a689d955 Remove comments 2019-12-02 12:02:15 +01:00
dependabot-preview[bot]
f2d4980ed8
build(deps-dev): bump @storybook/addon-notes in /webapp 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.2.6 to 5.2.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.8/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 10:51:05 +00:00
dependabot-preview[bot]
559737d8e4
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.5 to 23.1.1.
- [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.0.5...v23.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 10:50:25 +00:00
dependabot-preview[bot]
ef8e0e04c8
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.0.5 to 4.1.1.
- [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.1/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 10:49:53 +00:00
mattwr18
6edf169074
Merge pull request #2391 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.7 
build(deps-dev): bump @storybook/addon-a11y from 5.2.6 to 5.2.7 in /webapp
 2019-12-02 11:48:10 +01:00
mattwr18
08227d3f86
Merge pull request #2390 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.1.1 
build(deps-dev): bump eslint-plugin-jest from 23.0.5 to 23.1.1 in /backend
 2019-12-02 11:47:43 +01:00
mattwr18
b6accd8d15
Merge pull request #2388 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-6.7.2 
build(deps-dev): bump eslint from 6.7.1 to 6.7.2 in /backend
 2019-12-02 11:47:17 +01:00
mattwr18
b6cfe087be
Merge pull request #2379 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/server-test-utils-1.0.0-beta.30 
build(deps-dev): bump @vue/server-test-utils from 1.0.0-beta.29 to 1.0.0-beta.30 in /webapp
 2019-12-02 11:46:58 +01:00
mattwr18
056d5d0a0e
Merge pull request #2377 from Human-Connection/dependabot/docker/neo4j/neo4j-3.5.13-enterprise 
build(deps): bump neo4j from 3.5.12-enterprise to 3.5.13-enterprise in /neo4j
 2019-12-02 11:38:42 +01:00
dependabot-preview[bot]
b9464592e8
build(deps-dev): bump cypress-cucumber-preprocessor 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.16.2 to 1.17.0.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.16.2...v1.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 10:38:23 +00:00
mattwr18
b3bb8ac0e4
Merge pull request #2366 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.7.4 
build(deps-dev): bump @babel/cli from 7.7.0 to 7.7.4 in /backend
 2019-12-02 11:37:58 +01:00
mattwr18
7c8d5b19e5
Merge pull request #2360 from Human-Connection/dependabot/npm_and_yarn/cypress-plugin-retries-1.5.0 
build(deps-dev): bump cypress-plugin-retries from 1.4.0 to 1.5.0
 2019-12-02 11:36:35 +01:00
mattwr18
00d5f58b00 Move components to features, style table[WIP] 
- In conversations with @alina-beck, she suggested we move the
ReportsTable and FiledTable to features since it is tightly coupled to
Reports... we can work towards a table that is "dumb" and just takes the
data and displays it in another PR
- Add extra column for Current status
- Fix widths
 2019-12-02 11:26:11 +01:00
dependabot-preview[bot]
6520a64b61
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.6 to 5.2.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.7/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 04:20:20 +00:00
dependabot-preview[bot]
393d2dec02
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.5 to 23.1.1.
- [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.0.5...v23.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 04:19:00 +00:00
dependabot-preview[bot]
dd71c80f34
build(deps-dev): bump eslint from 6.7.1 to 6.7.2 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.7.1 to 6.7.2.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.7.1...v6.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 04:18:25 +00:00
roschaefer
048fb51116 feat: swap user name<=>handle for discriminability 2019-11-30 11:03:46 +01:00
roschaefer
3409a34374 Always show the menu to switch filters 2019-11-30 02:22:53 +01:00
roschaefer
74a65a9114 Be more specific "Current status" inst. of "Type" 2019-11-30 02:21:29 +01:00
roschaefer
9fd895fc42 Use <button> instead of <a> 
If you don't want to link somewhere, use a button instead of an anchor,
fellas. 😉
 2019-11-30 01:31:57 +01:00
Robert Schäfer
c1bc6897bb
Merge pull request #2382 from Human-Connection/improve_development_environment 
No public registration in development so that backend test pass
 2019-11-30 00:58:54 +01:00
mattwr18
985d53e52b Fix broken tests 2019-11-29 20:49:46 +01:00
mattwr18
c088c6eac4 Refactor test to avoid unneccessary http request 
- Set up/tear down should not needlessly run http requests. These tests
are not designed to test that the report/review process works as
expected. that is the job of their respective unit tests/e2e tests.
 2019-11-29 20:48:11 +01:00
mattwr18
7441dbf28c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-29 20:43:09 +01:00
mattwr18
bbd80fbc23 Add test cases for review workflow 2019-11-29 19:45:52 +01:00
mattwr18
f5545e3976 Fix middleware/spec 2019-11-29 19:45:34 +01:00
mattwr18
5d63dda6ee Refactor validateReport/Review 
- Don't throw error if a report already exists since we use MERGE and
that does not create a new resource if it exists. That is tested at the
neo4j(database) level.
- We also have a test to make in reports.spec.js that no duplicate is
created to ensure we didn't make some error on our part.
- Fix some faulty logic in validateReview
 2019-11-29 18:47:41 +01:00
mattwr18
c0d9fe5257 Test validationMiddleware validateReport/Review 2019-11-29 18:43:24 +01:00
ogerly
39062a1cd0 Fix specs 2019-11-29 16:41:14 +01:00
ogerly
10012fa62a No public registration in development so that backend test pass 2019-11-29 16:30:15 +01:00
ogerly
7cdca49b48 Fix lint 2019-11-29 16:04:25 +01:00
mattwr18
107f10edc9 Update table styling 2019-11-29 15:29:11 +01:00
mattwr18
b7f0bc7164
Merge pull request #2375 from Human-Connection/keep_dots_in_emails 
Don't remove sub-addresses in emails
 2019-11-29 14:14:25 +01:00
mattwr18
a8a9abb4e4 Refactor/Add new components 2019-11-29 14:02:53 +01:00
mattwr18
2e54a43417
Merge pull request #2333 from Human-Connection/remove_obsolete_invitation_code 
refactor: Remove obsolete code about invitation codes
 2019-11-29 13:45:46 +01:00
mattwr18
3c0a24825c Move components to _new structure/refactor 
- extract more components
 2019-11-29 13:27:39 +01:00
ogerly
06fd8a2ce9 unblur function by contribution 2019-11-29 12:14:54 +01:00
lokalise-bot
8a812aaaee Lokalise: update of webapp/locales/pt.json 2019-11-29 11:04:08 +01:00
dependabot-preview[bot]
0d327a9027
build(deps-dev): bump @vue/server-test-utils in /webapp 
Bumps [@vue/server-test-utils](https://github.com/vuejs/vue-test-utils/tree/HEAD/packages/server-test-utils) from 1.0.0-beta.29 to 1.0.0-beta.30.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/packages/server-test-utils/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/commits/v1.0.0-beta.30/packages/server-test-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-29 04:24:08 +00:00
dependabot-preview[bot]
2885661e60
build(deps): bump neo4j in /neo4j 
Bumps neo4j from 3.5.12-enterprise to 3.5.13-enterprise.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-29 04:22:40 +00:00
ogerly
7f3f81822e blur the image ok. 2019-11-28 20:40:35 +01:00
roschaefer
76414dbec7 Fix lint 2019-11-28 18:07:00 +01:00
mattwr18
9401d4e1e1 [WIP] Extract code into own components 2019-11-28 17:38:44 +01:00
mattwr18
9990fe2cb2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-28 16:14:23 +01:00
mattwr18
3d8435dde1 Get frontend working with data from backend 2019-11-28 16:13:48 +01:00
mattwr18
89daa3356c Return reviews with reports, rename variables 
- Instead of just returning the moderator who reviewed, we return the
review as well
 2019-11-28 16:10:33 +01:00
roschaefer
973d3f899a Remove dots of gmail addresses 
I had a chat with our moderator Daniel. He asks us to remove dots from
gmail accounts. He finds it more consistent and he has no problem to
write a mail to a gmail address without dots. He is OK to save the
email address different from how a user memorizes it.
 2019-11-28 14:02:11 +01:00
roschaefer
7146e0a9b2 Fix lint 2019-11-28 13:48:09 +01:00
mattwr18
21be2c08ba Update to return resource instead of to 
- more verbose makes it easier to understand
 2019-11-28 13:44:00 +01:00
dependabot-preview[bot]
679792f93e
build(deps-dev): bump cypress-plugin-retries from 1.4.0 to 1.5.0 
Bumps [cypress-plugin-retries](https://github.com/Bkucera/cypress-plugin-retries) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/Bkucera/cypress-plugin-retries/releases)
- [Commits](https://github.com/Bkucera/cypress-plugin-retries/compare/v1.4.0...v1.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 10:48:22 +00:00