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

3582 Commits

Author SHA1 Message Date
Nimit Bhargava
3934bf6a47 testing: adding spec for social-media 2020-12-18 16:36:50 +05:30
Nimit Bhargava
c5cbb9fb8c enhancement: using link id as key, instead of username as usernames can be same for different social networks 2020-12-18 16:36:50 +05:30
Nimit Bhargava
c3d3d2d981 refactor: moving element style to style tag 2020-12-18 16:36:50 +05:30
Nimit Bhargava
75763a6486 refactor: extracting social media to vue component 2020-12-18 16:36:50 +05:30
Nimit Bhargava
3ce6313588 feat: keeping same favicon implementation as in settings page 2020-12-18 16:36:30 +05:30
Nimit Bhargava
c387b7ebc1 fix: using ds-avatar instead of using user-avatar 2020-12-18 16:36:30 +05:30
Moriz Wahl
c405e008e4 checks that a cookie exists after login. If not, throw an error saying that no cookie can be set 2020-12-18 11:31:16 +01:00
Moriz Wahl
741458ca84 removed node-sass package and added sass (dart) package 2020-12-15 08:56:25 +01:00
Mogge
4b0893c1df
Merge pull request #4037 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/jest-26.6.3 
Bump jest from 25.3.0 to 26.6.3 in /webapp
 2020-12-14 10:07:48 +01:00
dependabot-preview[bot]
13a7c019ff
[Security] Bump ini from 1.3.5 to 1.3.8 in /webapp 
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. **This update includes a security fix.**
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-14 05:54:33 +00:00
Nimit Bhargava
8f92d6dcd3 Merge remote-tracking branch 'origin/3505-display-social-media-favicons-on-profile' into 3505-display-social-media-favicons-on-profile 2020-12-07 16:26:27 +05:30
Nimit Bhargava
a20a30de43 refactor: moving element style to style tag 2020-12-07 16:25:46 +05:30
Nimit Bhargava
0a177e4a5f
Merge branch 'master' into 3505-display-social-media-favicons-on-profile 2020-12-06 19:44:46 +05:30
Nimit Bhargava
3be426c0d5 refactor: extracting social media to vue component 2020-12-06 19:30:19 +05:30
dependabot-preview[bot]
176f6d8296
Bump jest from 25.3.0 to 26.6.3 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 25.3.0 to 26.6.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v25.3.0...v26.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-03 10:33:55 +00:00
Nimit Bhargava
0585960313 feat: keeping same favicon implementation as in settings page 2020-12-03 12:41:38 +05:30
Nimit Bhargava
7e80189e2e fix: using ds-avatar instead of using user-avatar 2020-12-03 12:01:00 +05:30
Wolfgang Huß
633f4de93a Fix linting 2020-12-02 23:36:53 +01:00
Wolfgang Huß
c286b556f2 Downgrade Node version to v12.19.0-alpine3.10 
- Testing if this solves the failing build.
 2020-12-02 18:34:06 +01:00
Wolfgang Huß
dc75eafb7b Yarn init 2020-12-02 11:15:33 +01:00
Wolfgang Huß
d2d257bc1c Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into white-labeling 
# Conflicts:
#	backend/Dockerfile
#	webapp/Dockerfile
#	webapp/Dockerfile.maintenance
#	webapp/components/LoginForm/LoginForm.vue
#	webapp/package.json
 2020-12-02 11:11:26 +01:00
Mogge
addc8437f8
Merge pull request #3985 from Ocelot-Social-Community/bgt-show-hide-password-2434 
[Feature] Show/Hide Password Icon - Issue # 2434
 2020-12-01 22:31:15 +01:00
Brandon Tripp
4efc1d3bf6 Linted the code to correct one error. 2020-12-01 13:37:58 -07:00
Brandon Tripp
8afcd6e4ea The styling was adjusted to center eye icon and make entire span clickable. 2020-12-01 11:28:58 -07:00
Mogge
3f9dac138c
Merge pull request #4007 from Ocelot-Social-Community/dependabot/docker/webapp/node-15.3.0-alpine3.10 
Bump node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10 in /webapp
 2020-12-01 18:57:47 +01:00
Mogge
d6ffff785a
Merge pull request #4023 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/prettier-2.2.1 
Bump prettier from 2.0.4 to 2.2.1 in /webapp
 2020-12-01 18:05:04 +01:00
Moriz Wahl
af54ec3704 further changes requested by Tirokk 2020-12-01 10:46:41 +01:00
dependabot-preview[bot]
f4619c7064
Bump prettier from 2.0.4 to 2.2.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 2.0.4 to 2.2.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.0.4...2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-30 05:32:36 +00:00
Brandon Tripp
d7641c3a35 Changed spec descriptions to be more clear. 2020-11-25 21:18:26 -07:00
dependabot-preview[bot]
b6fe5483cc
Bump node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10 in /webapp 
Bumps node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-25 04:57:43 +00:00
Brandon Tripp
8d1931f94c Linting for new tests and LoginForm changes. 2020-11-24 15:38:49 -07:00
Brandon Tripp
f71fb6b07b Modified reveal password wrapper to contain test data, added tests for icon default and change of icon upon click. Preliminary test for returning focus to input field. 2020-11-24 15:35:35 -07:00
Moriz Wahl
e47671c52a further changed requested by Tirokk 2020-11-24 19:10:46 +01:00
Mogge
75658a2f32
Merge branch 'master' into white-labeling 2020-11-23 13:35:40 +01:00
Moriz Wahl
6454e686e9 changes requested implemented 2020-11-23 13:34:07 +01:00
dependabot-preview[bot]
d2a715edf0
[Security] Bump node-fetch from 2.6.0 to 2.6.1 in /webapp 
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-23 05:38:41 +00:00
Brandon Tripp
0b03bf2fcc Initial attempt at spec for show/hide password 2020-11-20 15:15:09 -07:00
Brandon Tripp
74b56cbca7 linting of LoginForm.vue 2020-11-20 14:10:43 -07:00
Brandon Tripp
f56664b334 Refactor of click event to use a methhod and the @click rather than mouse down. Small adjustment to button spacing. 2020-11-20 13:39:43 -07:00
Mogge
e9d84db3bc
Merge pull request #3976 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/apollo-server-express-2.19.0 
[Security] Bump apollo-server-express from 2.9.7 to 2.19.0 in /webapp
 2020-11-20 21:22:26 +01:00
dependabot-preview[bot]
c217065612
[Security] Bump apollo-server-express from 2.9.7 to 2.19.0 in /webapp 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-express) from 2.9.7 to 2.19.0. **This update includes a security fix.**
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server-express@2.19.0/packages/apollo-server-express)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 20:11:51 +00:00
Mogge
533700b0aa
Merge pull request #3974 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/markdown-to-jsx-6.11.4 
[Security] Bump markdown-to-jsx from 6.10.3 to 6.11.4 in /webapp
 2020-11-20 21:11:13 +01:00
Mogge
624fe1dd09
Merge pull request #3966 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/elliptic-6.5.3 
[Security] Bump elliptic from 6.4.1 to 6.5.3 in /webapp
 2020-11-20 21:09:59 +01:00
Mogge
fd6b770e75
Merge pull request #3965 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/dot-prop-4.2.1 
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /webapp
 2020-11-20 20:29:33 +01:00
Mogge
cb014e0766
Merge pull request #3973 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.1.4 
Bump eslint-plugin-prettier from 3.1.2 to 3.1.4 in /webapp
 2020-11-20 20:20:31 +01:00
Mogge
caa7636dd6
Merge pull request #3963 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/storybook-design-token-0.8.1 
Bump storybook-design-token from 0.7.2 to 0.8.1 in /webapp
 2020-11-20 19:41:57 +01:00
Mogge
48a5d770a6
Merge pull request #3964 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/http-proxy-1.18.1 
[Security] Bump http-proxy from 1.17.0 to 1.18.1 in /webapp
 2020-11-20 19:41:03 +01:00
dependabot-preview[bot]
65d04eba96
Bump eslint-plugin-prettier from 3.1.2 to 3.1.4 in /webapp 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.2 to 3.1.4.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.2...v3.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 18:39:45 +00:00
Mogge
bc7100071d
Merge pull request #3970 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/babel/core-7.12.3 
Bump @babel/core from 7.9.0 to 7.12.3 in /webapp
 2020-11-20 19:38:24 +01:00
dependabot-preview[bot]
5e45f3aaa4
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /webapp 
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 18:34:36 +00:00