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

9804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
818ce5795d Correct docker-compose volume paths for override 2021-01-04 15:49:45 +01:00
Wolfgang Huß
6ee23eda48 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4012-default-admin 2020-12-23 13:30:32 +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ß
bcbc933657
Merge pull request #4083 from Ocelot-Social-Community/node-version-hint 
feat: Node Version Recommendation In backend/README.md
 2020-12-21 10:59:53 +01:00
Wolfgang Huß
78982f18ca
Update backend/README.md 2020-12-21 10:44:40 +01:00
Moriz Wahl
75485fe237 linting 2020-12-21 10:07:43 +01:00
Moriz Wahl
3f02ade329 createdAt converted toString in Email 2020-12-21 09:52:45 +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
Ulf Gebhardt
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
Ulf Gebhardt
a0af75123b
Merge pull request #4086 from Ocelot-Social-Community/4080-no-cookies 
Throw Error When No Cookie Can Be Set
 2020-12-20 03:30:38 +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
cee3317918 default user can login 2020-12-18 09:40:04 +01:00
Moriz Wahl
4fd136c625 Default user is created but cannot login sofar 2020-12-17 19:56:41 +01:00
Wolfgang Huß
cd61a32a4c Rename 'schoolsinmotion/.' Docker image names 2020-12-17 18:53:27 +01:00
Wolfgang Huß
6ddec41be2 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4043-new-digital-ocean-kubernetes-cluster 2020-12-17 15:49:58 +01:00
Wolfgang Huß
c4022c6c97 Refine configmap 2020-12-17 15:49:23 +01:00
Moriz Wahl
c948f9460b improved 2020-12-17 11:28:56 +01:00
Moriz Wahl
269a50903e fixed typo 2020-12-17 11:27:00 +01:00
Moriz Wahl
6773a184c6 Added a hint how to use different node versions. Recommend usage of node 12.19.0 2020-12-17 11:24:54 +01:00
Wolfgang Huß
8570db3ebc Clarify ingress 2020-12-17 09:42:39 +01:00
Wolfgang Huß
75916f07a3 Fix as Ulf suggested 2020-12-17 09:35:48 +01:00
Wolfgang Huß
80968e3a8c Clean up ingress and issuer 2020-12-16 14:43:30 +01:00
Wolfgang Huß
28c3d185c3 Refine HTTPS README.md for cert-manager 2020-12-16 08:16:10 +01:00
Wolfgang Huß
4f8f2da586 Refine HTTPS README.md for load balancer 2020-12-16 07:38:52 +01:00
Wolfgang Huß
bf0b62ad2e Correct ingress.tamplate.yaml 2020-12-16 07:10:53 +01:00
Wolfgang Huß
7c97fa4459 Clarified configmap.template.yaml 2020-12-15 17:33:15 +01:00
Wolfgang Huß
197f99b178 Refactor maintenance mode 2020-12-15 16:17:30 +01:00
Wolfgang Huß
0645cbbaf0 Implement installation alternative of a payed DO load balancer 2020-12-15 16:17:07 +01:00
Wolfgang Huß
7e73fd6201 Implement installation alternative of a payed DO load balancer 2020-12-15 10:44:07 +01:00
Moriz Wahl
741458ca84 removed node-sass package and added sass (dart) package 2020-12-15 08:56:25 +01:00
Wolfgang Huß
21da8410d3 Reset ingress.template.yaml 
- Reset service name to web.
 2020-12-14 18:33:16 +01:00
Wolfgang Huß
95079daa0c Setup a new ClusterIssuer 2020-12-14 13:53:55 +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
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