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

6245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
663cfeb0b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-14 13:37:58 +02:00
Wolfgang Huß
3bb4d67350
Merge pull request #1863 from Human-Connection/1645_case_insensitive_email 
fix: search for email case-insensitively
 2019-10-14 11:01:26 +02:00
Wolfgang Huß
39b58a936e
Merge pull request #1885 from Human-Connection/1874-fix 
Fix translation error in login page
 2019-10-13 08:45:22 +02:00
Janeth
a8a4d837eb Fix translation error in login page 2019-10-13 09:22:26 +05:30
Alexander Friedland
a04c4d9476
Merge pull request #1862 from Human-Connection/yarn_resolutions 
fix: security vulnerability with yarn resolutions
 2019-10-12 07:58:55 +02:00
mattwr18
8c1d46854d
Merge pull request #1877 from Human-Connection/fix-dockerfile-embeds 
Fix embeds settings page
 2019-10-11 16:17:10 +02:00
mattwr18
b0e7ef34ed Update findProviders.json path 2019-10-11 15:22:59 +02:00
mattwr18
dab05d9e67 Fix embeds settings page 
- Dockerfile was not copying providers.json
- Fix file path to providers.json
- Update template to show message based on allowEmbedIframes

Co-authored-by: Robert Schäfer <git@roschaefer.de>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-10-11 14:01:39 +02:00
mattwr18
64bcff36c0
Merge pull request #1860 from Human-Connection/update-version-to-0.1.4 
update version to 0.1.4
 2019-10-11 10:54:01 +02:00
mattwr18
1cf3295e0b update version to 0.1.4 2019-10-11 10:19:46 +02:00
mattwr18
596b8de615
Merge pull request #1805 from Human-Connection/1754-fix-buggy-profile-page-posts-duplicates 
Update profile posts apollo query
 2019-10-11 10:05:21 +02:00
Wolfgang Huß
2a034ee74f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 
# Conflicts:
#	webapp/locales/de.json
 2019-10-11 08:16:00 +02:00
roschaefer
c1a696577b fix: search for email case-insensitively 2019-10-11 02:40:48 +02:00
mattwr18
af7b52e212
Merge pull request #1859 from Human-Connection/roschaefer-patch-1 
Add Hall of Fame to README
 2019-10-11 01:28:05 +02:00
mattwr18
7430fdffa9
Merge pull request #1814 from Human-Connection/1785-register_as_new_user 
Implement public registration
 2019-10-11 01:25:44 +02:00
roschaefer
0e6e8f4e01 fix: security vulnerability with yarn resolutions 2019-10-11 00:58:26 +02:00
roschaefer
afe189435a Allow public registration by default on docker env 
My thought here is that a mailserver is started in
`docker-compose.override.yml` so you can see the emails being sent.
 2019-10-11 00:54:19 +02:00
roschaefer
01252b3584 refactor: follow @mattwr18 code review 
https://github.com/Human-Connection/Human-Connection/pull/1814#pullrequestreview-299434476
 2019-10-11 00:54:19 +02:00
roschaefer
adec248b18 fix: compare env var with value to avoid type err 2019-10-11 00:54:19 +02:00
roschaefer
c8c0414564 fix: send nonce along with signup mail 2019-10-11 00:54:19 +02:00
roschaefer
8305921f00 Fine tune layout and spacing 2019-10-11 00:54:19 +02:00
mattwr18
bc4acf939f Fix lint 2019-10-11 00:54:19 +02:00
roschaefer
a2c9ed520d fix: frontend tests 2019-10-11 00:54:19 +02:00
roschaefer
9ac1e333d6 feat: implement public registration checks 2019-10-11 00:54:19 +02:00
roschaefer
b1e01cb65a refactor: better errors, introduce email constants 2019-10-11 00:54:19 +02:00
roschaefer
4c7cc0a9cf refactor: DRY template in pages, fix signup flow 2019-10-11 00:54:19 +02:00
roschaefer
1dc4bc1411 feat: add slot to EnterNonce for back to home link 2019-10-11 00:54:19 +02:00
roschaefer
bb5d581906 refactor: restructure translations and components 2019-10-11 00:54:19 +02:00
roschaefer
7a276db42f fix: remove obsolete css, add link to login page 2019-10-11 00:54:19 +02:00
roschaefer
71e94d88c6 feat: add page component for public registration 2019-10-11 00:54:19 +02:00
Robert Schäfer
f1fc712fa3
Merge pull request #1861 from Human-Connection/refactor_embed_settings_page 
Refactor embed settings page
 2019-10-10 23:12:18 +02:00
roschaefer
ba27d2189d Remove obsolete code 2019-10-10 19:38:52 +02:00
roschaefer
465a46c8d4 refactor: reduce code on settings/embeds 2019-10-10 19:29:35 +02:00
roschaefer
c3b2b4fcac Structure translations based on file locations 2019-10-10 18:27:56 +02:00
Robert Schäfer
771337a654
Add Hall of Fame to README 
Because we are so cool! 😉 

See: https://github.com/sourcerer-io/hall-of-fame
 2019-10-10 16:39:23 +02:00
mattwr18
6955323f51
Merge pull request #1852 from Human-Connection/Allow_embedded_code_in_posts_permanent_memory-II 
Save user setting to show embed code II
 2019-10-10 14:58:49 +02:00
Wolfgang Huß
b556a601ce Followed Matts suggestion with the push 2019-10-10 09:06:28 +02:00
mattwr18
c1262205ef
Merge pull request #1855 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.16.2 
build(deps-dev): bump cypress-cucumber-preprocessor from 1.16.1 to 1.16.2
 2019-10-10 08:29:12 +02:00
mattwr18
530e44547b
Merge pull request #1854 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.3.1 
build(deps): bump nodemailer from 6.3.0 to 6.3.1 in /backend
 2019-10-10 08:27:59 +02:00
mattwr18
e683945927
Merge pull request #1849 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.6.3 
build(deps-dev): bump @babel/preset-env from 7.6.2 to 7.6.3 in /webapp
 2019-10-10 08:26:55 +02:00
Wolfgang Huß
7990879fc8 Correct translation 2019-10-10 08:21:36 +02:00
Wolfgang Huß
da3d6561b0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-10 08:15:59 +02:00
Wolfgang Huß
b41f340ad6 Fix Cypher test by correcting syntax of GraphQL report mutation 2019-10-10 08:15:17 +02:00
dependabot-preview[bot]
8f64071931
build(deps-dev): bump cypress-cucumber-preprocessor 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.16.1 to 1.16.2.
- [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.1...v1.16.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-10 05:16:10 +00:00
dependabot-preview[bot]
2e13b6911c
build(deps): bump nodemailer from 6.3.0 to 6.3.1 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.3.0 to 6.3.1.
- [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.3.0...v6.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-10 05:08:06 +00:00
dependabot-preview[bot]
846b5683f1
build(deps-dev): bump @babel/preset-env from 7.6.2 to 7.6.3 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [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.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 20:04:33 +00:00
mattwr18
c93871dcbd
Merge pull request #1836 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.3 
build(deps-dev): bump @storybook/addon-a11y from 5.2.1 to 5.2.3 in /webapp
 2019-10-09 22:02:05 +02:00
Wolfgang Huß
0b549a9dea Try to fix Cypress test for reports Latin1 error 
Error in Cypress: `InvalidCharacterError: Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range.`
 2019-10-09 18:05:54 +02:00
dependabot-preview[bot]
9b31927ba1
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.1 to 5.2.3.
- [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.3/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 15:17:28 +00:00
mattwr18
119c2d9122
Merge pull request #1848 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.6.3 
build(deps-dev): bump @babel/core from 7.6.2 to 7.6.3 in /webapp
 2019-10-09 17:14:56 +02:00