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

6184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
v0.1.4 		2019-10-10 14:58:49 +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
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
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
mattwr18
e553d397a1
Merge pull request #1837 from Human-Connection/dependabot/docker/backend/node-12.11.1-alpine 
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /backend
 2019-10-09 17:14:14 +02:00
mattwr18
fbb1b74f8e
Merge pull request #1839 from Human-Connection/dependabot/submodules/styleguide-d46fc15 
build(deps): bump styleguide from `808b3c5` to `d46fc15`
 2019-10-09 17:13:47 +02:00
ogerly
dbbece43b5 List of providers is always visible, button color changed, info text adapted 2019-10-09 16:52:48 +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
f6264b3ad8
Merge pull request #1847 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.3 
build(deps-dev): bump @babel/cli from 7.6.2 to 7.6.3 in /backend
 2019-10-09 15:42:24 +02: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
mattwr18
dcaa5d5ebf
Merge pull request #1846 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.6.3 
build(deps-dev): bump @babel/preset-env from 7.6.2 to 7.6.3 in /backend
 2019-10-09 15:41:35 +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]
37bf09dc6e
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /backend 
Bumps node from 12.11.0-alpine to 12.11.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 08:33:36 +00:00
dependabot-preview[bot]
4cd054834c
build(deps-dev): bump @babel/cli from 7.6.2 to 7.6.3 in /backend 
Bumps [@babel/cli](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 08:31:51 +00: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
dependabot-preview[bot]
297df951d3
build(deps-dev): bump @babel/preset-env from 7.6.2 to 7.6.3 in /backend 
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 08:31:11 +00:00
mattwr18
4eb312b1ab
Merge pull request #1843 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.6.3 
build(deps-dev): bump @babel/node from 7.6.2 to 7.6.3 in /backend
 2019-10-09 10:29:59 +02: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
e37092e83f
Merge pull request #1833 from Human-Connection/dependabot/npm_and_yarn/backend/cucumber-6.0.2 
build(deps-dev): bump cucumber from 6.0.1 to 6.0.2 in /backend
 2019-10-09 10:28:10 +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
dependabot-preview[bot]
ef1b401d07
build(deps-dev): bump @babel/node from 7.6.2 to 7.6.3 in /backend 
Bumps [@babel/node](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 04:52:42 +00:00
mattwr18
211bae6362 Fix lint 2019-10-08 22:42:41 +02:00
mattwr18
3958f44fb6 Merge branch 'Allow_embedded_code_in_posts_permanent_memory' of github.com:Human-Connection/Human-Connection into Allow_embedded_code_in_posts_permanent_memory 2019-10-08 20:49:51 +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
b8037b6e1f fix lint 2019-10-08 20:29:41 +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
mattwr18
925ff28880 Merge branch 'Allow_embedded_code_in_posts_permanent_memory' of github.com:Human-Connection/Human-Connection into Allow_embedded_code_in_posts_permanent_memory 2019-10-08 13:21:41 +02:00
ogerly
7cc139e879 add test embeds and links 2019-10-08 13:20:07 +02:00
mattwr18
271cacb8fe Merge branch 'master' of github.com:Human-Connection/Human-Connection into Allow_embedded_code_in_posts_permanent_memory 2019-10-08 13:01:07 +02:00
dependabot-preview[bot]
0d08f95ca8
build(deps): bump styleguide from 808b3c5 to d46fc15 
Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `808b3c5` to `d46fc15`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](808b3c5a95...d46fc1570c)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-08 05:31:11 +00:00
dependabot-preview[bot]
390e073acd
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /webapp 
Bumps node from 12.11.0-alpine to 12.11.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-08 05:03:33 +00:00
dependabot-preview[bot]
85b233cd87
build(deps-dev): bump @storybook/vue from 5.2.1 to 5.2.3 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) 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/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-08 05:02:24 +00:00
dependabot-preview[bot]
37dff79494
build(deps-dev): bump cucumber from 6.0.1 to 6.0.2 in /backend 
Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/cucumber/cucumber-js/releases)
- [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-js/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-08 05:01:55 +00:00
mattwr18
da1df27799 Extract logic to EmbedComponent to separate concerns 
- Co-authored-by: senderfm <dev@sender.fm>
 2019-10-07 19:15:39 +02:00
Alina Beck
49dfc8ac9d
Merge pull request #1829 from Human-Connection/fix-typo-in-email 
Fix typo in email template
 2019-10-07 15:35:00 +02:00
ogerly
18cfa0b8c8 tests 2 ok 2019-10-07 13:01:21 +02:00