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
6,247 Commits 117 Branches 1,511 Tags
Commit Graph

1836 Commits

Author SHA1 Message Date
Wolfgang Huß
c7849cedd8 Rename report reason category names to have '_' instead '-' 2019-10-14 16:12:21 +02:00
Wolfgang Huß
2cf2f2b011 Import report reason categories from a shared array 2019-10-14 15:20:51 +02:00
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
Janeth
a8a4d837eb Fix translation error in login page 2019-10-13 09:22:26 +05:30
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
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
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
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
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
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
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
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
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
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
ogerly
dbbece43b5 List of providers is always visible, button color changed, info text adapted 2019-10-09 16:52:48 +02:00
Wolfgang Huß
377dc2af53 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-09 16:23:53 +02:00
Wolfgang Huß
4f3f192e12 Remove out commented code 2019-10-09 15:53:35 +02:00
Wolfgang Huß
0062725470 Fix the frontend tests and design issues with and in the report modal 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
Co-Authored-By: alina-beck <4ndroid4va@gmail.com>
 2019-10-09 15:49:11 +02:00
dependabot-preview[bot]
603cae56eb
build(deps-dev): bump @babel/core from 7.6.2 to 7.6.3 in /webapp 
Bumps [@babel/core](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 13:44:21 +00:00
mattwr18
45337a9406
Merge pull request #1838 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.3 
build(deps-dev): bump @storybook/addon-actions from 5.2.1 to 5.2.3 in /webapp
 2019-10-09 15:42:04 +02:00
Alexander Friedland
dad60bd7c0
Merge pull request #1850 from Human-Connection/1812-Extend_Title_to_100_characters 
Title character increased from 64 to 100
 2019-10-09 11:38:42 +02:00
dependabot-preview[bot]
89eb6e72c4
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) 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/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 08:31:38 +00:00
mattwr18
cbb5f54a38
Merge pull request #1835 from Human-Connection/dependabot/docker/webapp/node-12.11.1-alpine 
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /webapp
 2019-10-09 10:29:21 +02:00
mattwr18
917734188f
Merge pull request #1834 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.3 
build(deps-dev): bump @storybook/vue from 5.2.1 to 5.2.3 in /webapp
 2019-10-09 10:29:06 +02:00
mattwr18
5e120e2f66
Merge pull request #1822 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.28.3 
build(deps): bump tiptap-extensions from 1.28.0 to 1.28.3 in /webapp
 2019-10-09 10:27:47 +02:00
ogerly
588ca43464 Title character increased from 64 to 100 2019-10-09 09:09:44 +02:00
mattwr18
211bae6362 Fix lint 2019-10-08 22:42:41 +02:00
mattwr18
bced6983ea Fix lint, update tests 
- to remove vue warnings
- favor one expectation per it block
 2019-10-08 20:47:13 +02:00
ogerly
3c04e1a328 code blockuser in settings add 2019-10-08 19:00:14 +02:00
ogerly
1309aa5842 Merge branch 'Allow_embedded_code_in_posts_permanent_memory' of https://github.com/Human-Connection/Human-Connection into Allow_embedded_code_in_posts_permanent_memory 2019-10-08 18:57:28 +02:00
ogerly
e2da57287b change providers.json 2019-10-08 18:56:45 +02:00
ogerly
0424992358 change specs 2019-10-08 16:35:49 +02:00