13067 Commits

Author SHA1 Message Date
Wolfgang Huß
d8a2d56aa8 Refine some package.json 2021-01-07 15:33:26 +01:00
Wolfgang Huß
d3737b2acf Change registration svg 2021-01-07 15:33:26 +01:00
Wolfgang Huß
259a58cab9 Change svg's width and height from 100% to explicit px of viewBox
- Set a link on password-reset image.
2021-01-07 15:33:26 +01:00
Wolfgang Huß
b778d3eda5 Change some logos to ocelot.social white branded 2021-01-07 15:33:26 +01:00
Wolfgang Huß
5705ebac36 Better white logo
- Put the white watermark in the background.
2021-01-07 15:33:26 +01:00
Wolfgang Huß
7c2c8d3368 Implement new ocelot.social logos 2021-01-07 15:33:26 +01:00
Wolfgang Huß
35e9404e8c Correct docker-compose.yml 2021-01-07 15:33:26 +01:00
Wolfgang Huß
156d54e3e7
Merge pull request #4119 from Ocelot-Social-Community/fix-cookie-test
Mock Cookie In Auth.test.js
2021-01-07 15:21:21 +01:00
Moriz Wahl
c8d04a1604 mock cookie for testing 2021-01-07 14:26:10 +01:00
Moriz Wahl
a1967815bf further invite code 2021-01-07 13:30:11 +01:00
Wolfgang Huß
d1766601f1 Change icon to a transparent background 2021-01-07 10:18:20 +01:00
838d01a015
updates on some designs 2021-01-07 04:24:03 +01:00
Wolfgang Huß
190f0e9560 Correct maintenance image from white-labeled to rebranded 2021-01-06 17:36:32 +01:00
Wolfgang Huß
caf49dd715 Replace HC by ocelot.social logos 2021-01-06 17:30:55 +01:00
Moriz Wahl
27d3e81f91
Merge pull request #4112 from Ocelot-Social-Community/4107-database-migration-readme
chore: 🍰 Database Initialisation Readme After First Deployment
2021-01-05 17:36:10 +01:00
Wolfgang Huß
c0f843c3fe Correct Readme.md for deployment database initialization 2021-01-05 15:01:33 +01:00
Wolfgang Huß
c7ace3c567 Correct backend Readme.md 2021-01-05 14:57:27 +01:00
Wolfgang Huß
bde9ea5308 Create Readme.md entry for deployment database initialization 2021-01-05 14:49:20 +01:00
Wolfgang Huß
0af713f65f Correct backend Readme.md 2021-01-05 14:47:19 +01:00
Wolfgang Huß
cfafa7e0bb Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4107-database-migration-readme 2021-01-05 11:00:08 +01:00
Wolfgang Huß
5e396d1458
Merge pull request #4084 from Ocelot-Social-Community/4012-default-admin
feat: 🍰 Create Default Admin User
2021-01-04 17:50:28 +01:00
Wolfgang Huß
818ce5795d Correct docker-compose volume paths for override 2021-01-04 15:49:45 +01:00
cd98098ef0
Merge pull request #4102 from Ocelot-Social-Community/docu_design
docu_design
2020-12-26 12:59:19 +01:00
72b8c22634
design data up to now 2020-12-23 13:45:16 +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
Wolfgang Huß
4ad6629c9a Add cookie entry to 'metadata.js' 2020-12-22 17:09:25 +01:00
Wolfgang Huß
104c024885 Replace logo files 2020-12-22 17:09:19 +01:00
Wolfgang Huß
bef33d8816 Correct Human-Connection path to Ocelot-Social 2020-12-22 16:40:53 +01:00
Wolfgang Huß
556dd5ed92 Refactor docker-compose.yml 2020-12-22 16:37:10 +01:00
Wolfgang Huß
42007f17dd Set the new Docker Hub images 2020-12-22 15:52:35 +01:00
Wolfgang Huß
c37aa08450 Add submodule Ocelot-Social 2020-12-22 15:35:57 +01:00
Wolfgang Huß
3a5001b0a1 Add .gitignore 2020-12-22 15:32:02 +01:00
Wolfgang Huß
09f7bba9af Remove submodule Human-Connection 2020-12-22 15:29:50 +01:00
Wolfgang Huß
4099ca9816
Change submodule to ours 2020-12-22 15:14:52 +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
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
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