Wolfgang Huß
7c2c8d3368
Implement new ocelot.social logos
2021-01-07 15:33:26 +01:00
Moriz Wahl
c8d04a1604
mock cookie for testing
2021-01-07 14:26:10 +01:00
Mogge
c2a475f670
Merge pull request #4091 from Ocelot-Social-Community/4090-cookie-name-in-config
...
Name of Cookie Is Set in metadata.js
2020-12-22 17:27:04 +01:00
Mogge
cc9c70dbe7
Merge pull request #4047 from Ocelot-Social-Community/3505-display-social-media-favicons-on-profile
...
feat: 🔥 Displaying Social Media Favicons On Profile Page
2020-12-22 13:06:39 +01:00
Nimit Bhargava
0fec0afd27
testing: adding spec for social-media
2020-12-22 17:24:45 +05:30
Moriz Wahl
db9715297e
Test examples added
2020-12-22 16:46:32 +05:30
Wolfgang Huß
7c38773c14
Merge pull request #4050 from Ocelot-Social-Community/4043-new-digital-ocean-kubernetes-cluster
...
chore: 🍰 New Digital Ocean Kubernetes Cluster
2020-12-22 11:43:16 +01:00
Moriz Wahl
43852a5f26
name of cookie is set by metadata.js
2020-12-21 13:41:42 +01:00
Wolfgang Huß
f25f4109d2
Fix webapp Dockerfile
...
- As I build the webapp Docker image locally pushed it to Docker Hub and used it on DO Kubernetes wir.social a file in the constants folder where missing. So I find out that the whole folder was not copied.
2020-12-21 09:36:06 +01:00
4b1213ef97
Merge pull request #4079 from Ocelot-Social-Community/switch-to-dart-sass
...
chore: 🍰 Replace node-sass with sass
2020-12-20 03:32:03 +01:00
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
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
