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
mattwr18
e4d04c22c0
Merge pull request #2309 from Human-Connection/fix-incorrect-link-to-test-environment 
Fix incorrect link to development environment
 2019-11-22 16:33:01 +01:00
mattwr18
0a96f3ed6f
Merge pull request #2330 from Human-Connection/2329-normalize_emails_in_login_form 
2329 normalize emails in login form
 2019-11-22 16:30:56 +01:00
roschaefer
ae360f2201 fix #2329: Normalize email on login in the backend 2019-11-22 15:24:27 +01:00
mattwr18
c78a4189b9 Update component test 2019-11-22 15:08:54 +01:00
roschaefer
145b6727b1 Fix 2329 in the frontend 2019-11-22 15:08:25 +01:00
roschaefer
e9dcfd04fd Expose #2329 2019-11-22 15:04:06 +01:00
mattwr18
9dce86358b
Merge pull request #2327 from Human-Connection/lokalise-2019-11-22_12-55-23 
Lokalise: Translations update
 2019-11-22 14:50:34 +01:00
mattwr18
aeac1edb32 Add LegacyEmbeds component to fix bug 2019-11-22 12:58:57 +01:00
lokalise-bot
3e52ee090c Lokalise: update of webapp/locales/ru.json 2019-11-22 12:55:34 +01:00
lokalise-bot
bcd9f0ec93 Lokalise: update of webapp/locales/pt.json 2019-11-22 12:55:32 +01:00
lokalise-bot
32942e1346 Lokalise: update of webapp/locales/it.json 2019-11-22 12:55:30 +01:00
lokalise-bot
7ab1686caa Lokalise: update of webapp/locales/fr.json 2019-11-22 12:55:29 +01:00
lokalise-bot
b5f0e83cb7 Lokalise: update of webapp/locales/es.json 2019-11-22 12:55:27 +01:00
lokalise-bot
d2b3396e9b Lokalise: update of webapp/locales/de.json 2019-11-22 12:55:25 +01:00
mattwr18
5007520749
Merge pull request #2310 from Human-Connection/make-cypress-work-for-i18n-again 
Changed translation must change test :(
 2019-11-22 12:52:29 +01:00
mattwr18
08d78a2005
Merge pull request #2318 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.12 
build(deps-dev): bump apollo-server-testing from 2.9.9 to 2.9.12 in /backend
v0.1.11 		2019-11-22 10:14:13 +01:00
mattwr18
b2119c1a07
Merge pull request #2314 from Human-Connection/dependabot/npm_and_yarn/webapp/fuse.js-3.4.6 
build(deps-dev): bump fuse.js from 3.4.5 to 3.4.6 in /webapp
 2019-11-22 10:13:44 +01:00
mattwr18
9a6da009ff
Merge pull request #2302 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.7.0 
build(deps-dev): bump eslint-config-prettier from 6.6.0 to 6.7.0 in /webapp
 2019-11-22 10:13:21 +01:00
mattwr18
95b500be05
Merge pull request #2301 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.8.9 
build(deps): bump metascraper-lang from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:13:05 +01:00
mattwr18
0aea441e2b
Merge pull request #2298 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.8.9 
build(deps): bump metascraper-soundcloud from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:12:44 +01:00
mattwr18
489e6cc476
Merge pull request #2297 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.8.9 
build(deps): bump metascraper-youtube from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:12:32 +01:00
mattwr18
c453fd1207
Merge pull request #2296 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.8.0 
build(deps-dev): bump date-fns from 2.7.0 to 2.8.0
 2019-11-22 10:12:16 +01:00
dependabot-preview[bot]
b3cbe8ac9b
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.9 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-testing@2.9.9...apollo-server-testing@2.9.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-22 04:20:12 +00:00
roschaefer
c010d4b0ae refactor: remove obsolete code 
Since we decided to open Human Connection for public registration, we
don't need to create artificial shortage of signups. The original
intention here was too:

1. Grow the network slowly and under control
2. Create an incentive for users to invite their friends

Point 2 is now obsolete, everyone can signup herself. Point 1 is based
on the (seemingly) wrong assumption that there will be a "run" on the
network if we open it for public registration. Our growth was fairly
stable so far.
 2019-11-21 19:19:58 +01:00
roschaefer
2e3908c009 refactor: close session in isAuthor permission 2019-11-21 19:13:46 +01:00
Moriz Wahl
7be79ddcf8 Same translation as in cypress test 2019-11-21 11:45:25 +01:00
mattwr18
b859102275
Merge pull request #2311 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.11 
build(deps): bump apollo-server from 2.9.9 to 2.9.11 in /backend
 2019-11-21 11:37:59 +01:00
ogerly
b360f71112 Terms of use extended with dot - no commercial use 2019-11-21 10:16:10 +01:00
dependabot-preview[bot]
ab511138a6
build(deps-dev): bump fuse.js from 3.4.5 to 3.4.6 in /webapp 
Bumps [fuse.js](https://github.com/krisk/Fuse) from 3.4.5 to 3.4.6.
- [Release notes](https://github.com/krisk/Fuse/releases)
- [Changelog](https://github.com/krisk/Fuse/blob/master/CHANGELOG.md)
- [Commits](https://github.com/krisk/Fuse/compare/v3.4.5...v3.4.6)

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

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-21 04:19:41 +00:00
Moriz Wahl
a39a040e91 Changed translation must change test :( 2019-11-20 19:48:04 +01:00
steffi
e8e78a62b0 Fixed the link to development environment and text 2019-11-20 19:27:07 +01:00
steffi
98758e527a Fixed the link to development environment 2019-11-20 19:24:45 +01:00
Alina Beck
a158a88044 fix lint errors after merge 2019-11-20 19:36:47 +03:00
Alina Beck
a210dd599d Merge branch 'master' into migrate-styleguide-icons 2019-11-20 19:35:03 +03:00
Alina Beck
1f3159db47 add BaseIcon stories 2019-11-20 19:19:30 +03:00
Alina Beck
03eb32131c configure storybook to load BaseComponents and svgs 2019-11-20 18:19:36 +03:00
Alina Beck
0727c3314d move styles from view folder to assets 2019-11-20 16:13:07 +03:00
Alina Beck
70bfd9d70c fix console warnings and failing tests 2019-11-20 15:43:53 +03:00
Alina Beck
9bd4dbbd81 mock svg files in component tests 2019-11-20 15:27:30 +03:00
Alina Beck
4347bdd1ed replace require.context babel plugin 2019-11-20 15:12:51 +03:00
Alina Beck
77f4810ddc set up global localVue 
by setting up localVue with all required plugins (such as styleguide and vuex)
in a separate testSetup file we can avoid doing this individually in all component tests
the testSetup is executed before each test suite, so each test file gets a fresh
instance of localVue
 2019-11-20 12:31:40 +03:00
dependabot-preview[bot]
6f3bd47654
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.6.0 to 6.7.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)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:23:25 +00:00
dependabot-preview[bot]
1d34e8c1cc
build(deps): bump metascraper-lang from 5.8.7 to 5.8.9 in /backend 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.8.7 to 5.8.9.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.7...v5.8.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:23:06 +00:00
dependabot-preview[bot]
102c99409a
build(deps): bump metascraper-soundcloud from 5.8.7 to 5.8.9 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.8.7 to 5.8.9.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:22:02 +00:00
dependabot-preview[bot]
271ace7173
build(deps): bump metascraper-youtube from 5.8.7 to 5.8.9 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.8.7 to 5.8.9.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:21:18 +00:00
dependabot-preview[bot]
70d23aa58f
build(deps-dev): bump date-fns from 2.7.0 to 2.8.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.7.0 to 2.8.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.7.0...v2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:20:49 +00:00
Robert Schäfer
694fb52381
Merge pull request #2293 from Human-Connection/2230-fix-typo 
Fix Typo Of Issue 2230
 2019-11-20 00:19:48 +01:00
roschaefer
b0d20ede71 Fix #2294 
Ideally we would not have this inconsistent edge case that we filter
through the user type. Much better would be a graphql query like:

```graphql
{
  User(filter: { primary_email: { email: "something@example.org" } }) {
    id
    name
    slug
  }
}
```
 2019-11-19 21:24:58 +01:00
Moriz Wahl
37b71b5e9a Fix Typo Of Issue 2230 2019-11-19 18:35:13 +01:00