ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,193 Commits 117 Branches 1,511 Tags
Commit Graph

7193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
7c6d5b5129 fix: Re-enable webfinger feature 
Ok, so here is the plan. Let's give both our cucumber features and your
cypress tests a prominent place to live. That would be the root level
folder of our application. Second, let's revive formerly dead code step
by step.

Ie. move code from the former location `backend/features/` to `features/`
when it is ready. All edge cases should be tested with unit tests in
`backend/`, see my `webfinger.spec.js` as an example.
 2019-12-02 17:31:56 +01:00
mattwr18
35c3219460
Merge pull request #2316 from Human-Connection/2170-Change_of_Terms_of_Service 
Terms of use extended with dot - no commercial use
 2019-12-02 13:10:58 +01:00
mattwr18
b1c6176cc4
Merge pull request #2389 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.17.0 
build(deps-dev): bump cypress-cucumber-preprocessor from 1.16.2 to 1.17.0
 2019-12-02 12:54:55 +01:00
mattwr18
e2d443c87f
Merge pull request #2380 from Human-Connection/lokalise-2019-11-29_11-04-05 
Lokalise: Translations update
 2019-12-02 12:08:55 +01: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
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
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
ogerly
10012fa62a No public registration in development so that backend test pass 2019-11-29 16:30:15 +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
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
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
roschaefer
76414dbec7 Fix lint 2019-11-28 18:07:00 +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
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
mattwr18
3de377a860
Merge pull request #2373 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc18 
build(deps): bump @nuxtjs/apollo from 4.0.0-rc17 to 4.0.0-rc18 in /webapp
 2019-11-28 11:47:10 +01:00
mattwr18
595236ac53
Merge pull request #2372 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.4 
build(deps): bump graphql-shield from 7.0.2 to 7.0.4 in /backend
 2019-11-28 11:46:49 +01:00
mattwr18
277c425e37
Merge pull request #2371 from Human-Connection/dependabot/npm_and_yarn/cypress-3.7.0 
build(deps-dev): bump cypress from 3.6.1 to 3.7.0
 2019-11-28 11:46:28 +01:00
dependabot-preview[bot]
a1a68a36ce
build(deps-dev): bump @babel/cli from 7.7.0 to 7.7.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.7.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 10:40:27 +00:00
mattwr18
fc31aae181
Merge pull request #2359 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.7.4 
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /backend
 2019-11-28 11:38:26 +01:00
mattwr18
5e56098600
Merge pull request #2357 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.12 
build(deps): bump apollo-server from 2.9.11 to 2.9.12 in /backend
 2019-11-28 11:34:25 +01:00
roschaefer
9e2baf25d2 Don't remove dots in emails 2019-11-28 11:22:09 +01:00
dependabot-preview[bot]
0a5a0668c8
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc17 to 4.0.0-rc18.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.17...v4.0.0-rc.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:19:49 +00:00
dependabot-preview[bot]
98623133fe
build(deps): bump graphql-shield from 7.0.2 to 7.0.4 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.2 to 7.0.4.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.2...v7.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:18:22 +00:00
dependabot-preview[bot]
6a52673524
build(deps-dev): bump cypress from 3.6.1 to 3.7.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.6.1 to 3.7.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.6.1...v3.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:17:57 +00:00
dependabot-preview[bot]
3c4a3a8a32
build(deps): bump apollo-server from 2.9.11 to 2.9.12 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.11 to 2.9.12.
- [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@2.9.11...apollo-server@2.9.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 17:17:58 +00:00
dependabot-preview[bot]
1f52c73324
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.2 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.2...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 17:16:21 +00:00
mattwr18
4861ab26dd
Merge pull request #2369 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.0.5 
build(deps-dev): bump eslint-plugin-jest from 23.0.4 to 23.0.5 in /webapp
 2019-11-27 18:15:51 +01:00
mattwr18
ff1ba9ea21
Merge pull request #2368 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.1.8 
build(deps): bump @hapi/joi from 16.1.7 to 16.1.8 in /backend
 2019-11-27 18:15:31 +01:00
mattwr18
943693f9ed
Merge pull request #2365 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.0.5 
build(deps-dev): bump eslint-plugin-jest from 23.0.4 to 23.0.5 in /backend
 2019-11-27 18:15:11 +01:00
mattwr18
46c16e9060
Merge pull request #2339 from Human-Connection/dependabot/npm_and_yarn/backend/babel/plugin-proposal-throw-expressions-7.7.4 
build(deps-dev): bump @babel/plugin-proposal-throw-expressions from 7.2.0 to 7.7.4 in /backend
 2019-11-27 18:14:15 +01:00
mattwr18
6865709210
Merge pull request #2334 from Human-Connection/refactor_is_author_permission 
refactor: Close session in isAuthor permission
 2019-11-27 18:13:48 +01:00
mattwr18
f42eea15a6
Merge pull request #2323 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.8.1 
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /webapp
 2019-11-27 18:11:08 +01:00
mattwr18
5d80eca711
Merge pull request #2169 from Human-Connection/1967-Component-Tests-ContentView 
1967 component tests content view
 2019-11-27 18:03:36 +01:00
Moriz Wahl
b2f2783f4f Merge branch 'master' into 1967-Component-Tests-ContentView 
Resolving conflicts
 2019-11-27 14:56:55 +01:00
mattwr18
62080a0afb
Merge pull request #2295 from Human-Connection/2294_fix_email_filter 
If an admin searches for a user by email, don't crash if no user can be found
 2019-11-27 14:46:16 +01:00
Moriz Wahl
d47ebb936e use .filter to find items 2019-11-27 14:28:57 +01:00
Moriz Wahl
809ef47a03 only one expect per it block 2019-11-27 14:28:57 +01:00
Moriz Wahl
3d3a121dc5 method tests added 2019-11-27 14:28:57 +01:00