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

9725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimit Bhargava
ef03319e19 Merge remote-tracking branch 'origin/3505-display-social-media-favicons-on-profile' into 3505-display-social-media-favicons-on-profile 
# Conflicts:
#	webapp/components/SocialMedia/SocialMedia.vue
#	webapp/pages/profile/_id/_slug.vue
 2020-12-18 17:37:01 +05:30
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
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
Mogge
98fff1e38d
Merge pull request #4065 from Ocelot-Social-Community/dependabot/npm_and_yarn/ini-1.3.8 
[Security] Bump ini from 1.3.5 to 1.3.8
 2020-12-14 09:35:56 +01:00
Mogge
5e23d63b39
Merge pull request #4055 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/uuid-8.3.2 
Bump uuid from 7.0.3 to 8.3.2 in /backend
 2020-12-14 09:32:17 +01:00
Mogge
10a0443667
Merge pull request #4058 from Ocelot-Social-Community/dependabot/npm_and_yarn/babel/register-7.12.10 
Bump @babel/register from 7.9.0 to 7.12.10
 2020-12-14 09:23:05 +01:00
dependabot-preview[bot]
cdf06a8677
[Security] Bump ini from 1.3.5 to 1.3.8 
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 08:20:22 +00:00
Mogge
6bdf9fc02a
Merge pull request #4066 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/ini-1.3.8 
[Security] Bump ini from 1.3.5 to 1.3.8 in /backend
 2020-12-14 09:18:23 +01:00
dependabot-preview[bot]
0c36ef8a6e
[Security] Bump ini from 1.3.5 to 1.3.8 in /backend 
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 08:09:03 +00:00
Mogge
95d4641842
Merge pull request #4067 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/ini-1.3.8 
[Security] Bump ini from 1.3.5 to 1.3.8 in /webapp
 2020-12-14 09:07:15 +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
dependabot-preview[bot]
621e1232a4
Bump @babel/register from 7.9.0 to 7.12.10 
Bumps [@babel/register](https://github.com/babel/babel/tree/HEAD/packages/babel-register) from 7.9.0 to 7.12.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.10/packages/babel-register)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-10 04:54:32 +00:00
dependabot-preview[bot]
3904de2a30
Bump uuid from 7.0.3 to 8.3.2 in /backend 
Bumps [uuid](https://github.com/uuidjs/uuid) from 7.0.3 to 8.3.2.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v7.0.3...v8.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-09 05:51:23 +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
Wolfgang Huß
982a324e20
Merge pull request #3934 from Ocelot-Social-Community/white-labeling 
feat: 🍰 Rebranding And White-Labeling
 2020-12-03 11:30:25 +01: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
55ab977366
Merge pull request #4008 from Ocelot-Social-Community/dependabot/docker/backend/node-15.3.0-alpine3.10 
Bump node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10 in /backend
 2020-12-01 18:27:00 +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
Mogge
2e14c9e2df
Merge pull request #4024 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-audio-5.14.26 
Bump metascraper-audio from 5.11.8 to 5.14.26 in /backend
 2020-12-01 18:02:29 +01:00
Mogge
d51e75873f
Merge pull request #4025 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-url-5.14.26 
Bump metascraper-url from 5.11.8 to 5.14.26 in /backend
 2020-12-01 17:52:13 +01:00
Mogge
ce6aba446d
Merge pull request #3986 from Ocelot-Social-Community/dependabot/npm_and_yarn/babel/preset-env-7.12.7 
Bump @babel/preset-env from 7.9.0 to 7.12.7
 2020-12-01 17:39:37 +01:00
Mogge
e6ad3262cd
Merge pull request #4026 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-logo-5.14.26 
Bump metascraper-logo from 5.11.6 to 5.14.26 in /backend
 2020-12-01 17:37:09 +01:00
Mogge
ce3a79268b
Merge pull request #3997 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/node-fetch-2.6.1 
[Security] Bump node-fetch from 2.6.0 to 2.6.1 in /webapp
 2020-12-01 17:26:14 +01:00
Moriz Wahl
af54ec3704 further changes requested by Tirokk 2020-12-01 10:46:41 +01:00
dependabot-preview[bot]
93a9c0117b
Bump metascraper-logo from 5.11.6 to 5.14.26 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.11.6 to 5.14.26.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.6...v5.14.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-30 05:53:09 +00:00
dependabot-preview[bot]
81076429a3
Bump metascraper-url from 5.11.8 to 5.14.26 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.11.8 to 5.14.26.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.8...v5.14.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-30 05:40:46 +00:00
dependabot-preview[bot]
1ec5293319
Bump metascraper-audio from 5.11.8 to 5.14.26 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.11.8 to 5.14.26.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.8...v5.14.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-30 05:35:12 +00: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]
ff1e228fcc
Bump node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10 in /backend 
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:59:48 +00: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