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

4274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
47324d4905 example II - lint ok, test local ok 2019-07-17 09:57:08 +02:00
Robert Schäfer
7de73f861e
Merge pull request #1044 from Human-Connection/refactor_email_address 
Refactoring: Split User and Email
 2019-07-16 21:28:42 +02:00
Robert Schäfer
1970baaa2d Apparently neode doesn't like multiple connections 
Why? 😟
 2019-07-16 21:05:44 +02:00
Robert Schäfer
95d26a701c Fix lint 2019-07-16 21:00:47 +02:00
Robert Schäfer
99bfd56ea7 Merge remote-tracking branch 'origin/master' into refactor_email_address 2019-07-16 20:20:21 +02:00
Robert Schäfer
4c9dbdb378 Refactor changePassword resolver with neode 2019-07-16 20:06:26 +02:00
Robert Schäfer
c3edaa9d31
Merge pull request #1049 from Human-Connection/minor_change_to_kubernetes_config_templates 
Move secrets into secrets kubernetes template
 2019-07-16 12:04:08 +02:00
Robert Schäfer
cc34a74b60
Merge pull request #1050 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.8.0 
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /webapp
 2019-07-16 12:02:20 +02:00
Robert Schäfer
3a4af2f5fa
Merge pull request #1052 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.8.0 
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /backend
 2019-07-16 12:02:03 +02:00
Wolfgang Huß
dded3344cc
Merge pull request #1040 from Human-Connection/remove_graphql_yoga 
Remove graphql-yoga
 2019-07-16 09:13:44 +02:00
Wolfgang Huß
71527afd3f
Merge pull request #1019 from Human-Connection/1000_find_users_by_email_address 
Implement paginating user view for admins
 2019-07-16 09:12:44 +02:00
Wolfgang Huß
b5bd77b539 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1000_find_users_by_email_address 
# Conflicts:
#	webapp/layouts/default.vue
 2019-07-16 08:44:42 +02:00
dependabot-preview[bot]
9c26bb8f90
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.2 to 22.8.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/v22.7.2...v22.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 04:24:11 +00:00
dependabot-preview[bot]
033ff572ee
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.2 to 22.8.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/v22.7.2...v22.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 04:23:35 +00:00
Robert Schäfer
b97f7e464f
Merge pull request #969 from Human-Connection/967-filter-post-by-category 
Filter posts by category
 2019-07-16 00:50:56 +02:00
Robert Schäfer
3f00140220
Merge pull request #1041 from Human-Connection/822_fix_load_more_button 
Fix #822 by updating the counts of the user
 2019-07-16 00:45:01 +02:00
Robert Schäfer
db84afa20b Move secrets into secrets kubernetes template 2019-07-15 23:15:20 +02:00
Matt Rider
2dca04523d Remove key request in badge queries 
- clean up from `PR` which uses id, not key
 2019-07-15 15:04:19 -03:00
Matt Rider
a91ddd22b7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 14:47:36 -03:00
Robert Schäfer
46cd21db1f Fix registration.spec 2019-07-15 19:35:07 +02:00
Robert Schäfer
b8ab7cacef Fix email filter test 2019-07-15 19:21:17 +02:00
Robert Schäfer
cec3eddcef Fix more test cases 2019-07-15 18:35:38 +02:00
Robert Schäfer
88aa8a3929 Encrypt email in JWT - fixes 2 test cases 2019-07-15 18:35:38 +02:00
Robert Schäfer
dacc3bb557 Implement fallback User.email resolver 2019-07-15 18:35:38 +02:00
Robert Schäfer
46589362fa Start to refactor User<->EmailAddress 2019-07-15 18:35:38 +02:00
Robert Schäfer
904142cf6e Create a separate node for email in data import 2019-07-15 18:35:38 +02:00
Robert Schäfer
2736738c36 Fix @Tirokk's suggestions 
Wow @Tirokk that was a good catch! I thought that the emitting side
knows the `index`, but no, it only emits `removePostFromList` and that's
it. In order to delete the right post, we have to pass in the `index`
ourselves. So, the caller of the function is the page component itself.

I didn't see the error myself, because in Javascript if you parse
`undefined` or `null` as Integer, you get 0 and it does not raise an
error.
 2019-07-15 18:26:23 +02:00
Robert Schäfer
d59c94c9f3 Keep gql syntax highglighting 
... with custom fake template string
 2019-07-15 18:09:54 +02:00
Robert Schäfer
f6bc72341f
Merge pull request #1042 from Human-Connection/fix_regression_data_import 
Fix regression of data import
 2019-07-15 17:39:15 +02:00
Robert Schäfer
417500eb3e
Merge pull request #1043 from Human-Connection/silence_codecov 
Silence codecov
 2019-07-15 17:38:42 +02:00
Robert Schäfer
f22d8072f4
Merge pull request #1046 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.3.1 
Bump cypress-file-upload from 3.2.1 to 3.3.1
 2019-07-15 17:37:55 +02:00
Robert Schäfer
9199458cbb
Merge pull request #1047 from Human-Connection/dependabot/npm_and_yarn/webapp/linkify-it-2.2.0 
Bump linkify-it from 2.1.0 to 2.2.0 in /webapp
 2019-07-15 17:36:50 +02:00
Robert Schäfer
b25b5c462d
Merge pull request #1045 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.3.0 
Bump nodemailer from 6.2.1 to 6.3.0 in /backend
 2019-07-15 17:36:01 +02:00
Robert Schäfer
aa6c0efbf7
Merge pull request #1048 from Human-Connection/fix_nuxt_build_folder_file_permissions 
Sledgehammer the file permission problem on docker
 2019-07-15 17:34:02 +02:00
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00
Matt Rider
bb4532827a Refactor search input, navbar 
- fix search input width on desktop
- removed adding removing classes on focus/blur search input
- fix notifications dropdown on mobile

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:20:28 -03:00
Matt Rider
b0f999ac05 Fix styling of navbar 
- Follow @Tirokk suggestions

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:06:56 -03:00
Matt Rider
d42083a32e Move header to left, add border left 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 09:55:09 -03:00
senderfm
8de9da0148 duplicate entry removed 2019-07-15 13:54:58 +02:00
Wolfgang Huß
ea896f8b3a
Merge pull request #1039 from Human-Connection/bugfix_email_template 
Bugfix: Signup email was missing email query param
 2019-07-15 13:35:57 +02:00
Robert Schäfer
fa024ac47a Sledgehammer the file permission problem on docker 
NuxtJS wants to write into .nuxt. If the docker container writes into
.nuxt it will have the file permissions of the docker container user
even on the host system. So on the host system you cannot remove the
folder .nuxt anymore. This gets in the way of running NuxtJS on the host
system.
 2019-07-15 13:14:40 +02:00
Matt Rider
8f17045cdb Update tests to make more reliable 
- hope you are ok with this @roschaefer, it was failing locally and I guess it passed the build because half the time the array is returned in the order expected while half the time not.
 2019-07-15 07:33:22 -03:00
dependabot-preview[bot]
5360038ac0
Bump linkify-it from 2.1.0 to 2.2.0 in /webapp 
Bumps [linkify-it](https://github.com/markdown-it/linkify-it) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/markdown-it/linkify-it/releases)
- [Changelog](https://github.com/markdown-it/linkify-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/linkify-it/compare/2.1.0...2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 04:26:52 +00:00
dependabot-preview[bot]
38ee22d452
Bump cypress-file-upload from 3.2.1 to 3.3.1 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.2.1 to 3.3.1.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.2.1...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 04:26:41 +00:00
dependabot-preview[bot]
6eea5924dc
Bump nodemailer from 6.2.1 to 6.3.0 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.2.1 to 6.3.0.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.2.1...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 04:26:08 +00:00
Robert Schäfer
8a16768180 Disable codecov's PR comments 
Our fellow @Hardy-Peaceglobal already turned off Github's notifications
completely because of codecov's PR comments. I think it's more important
not to annoy open-source contributors than to have these comments.
 2019-07-14 01:45:38 +02:00
Robert Schäfer
5bde0ab036 No global codecov install, less verbose CI output 2019-07-14 01:45:38 +02:00
Robert Schäfer
43a2c502c9 Fix regression of data import 2019-07-14 01:43:44 +02:00
Robert Schäfer
1ec26ccdb5
Merge pull request #968 from Human-Connection/878-Update-of-polish-locales 
polish language on current status
 2019-07-14 00:00:14 +02:00
Robert Schäfer
0d06b78ad4
Merge pull request #1038 from Human-Connection/1037-refactor-comments-resolver-extract-out-validations 
Refactor CreateComment resolver
 2019-07-13 23:59:15 +02:00