ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,113 Commits 113 Branches 1,511 Tags
Commit Graph

11113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
f5c4cd7701 Replace in docker compose 'ocelotsocialnetwork/*:latest' by 'ocelotsocialnetwork/*:local-production' 2022-07-15 09:29:59 +02:00
Wolfgang Huß
8d10066fba Replace in docker compose 'ocelotsocialnetwork/*:development' by 'ocelotsocialnetwork/*:local-development' 2022-07-15 09:28:53 +02:00
Wolfgang Huß
2c4ee18c9e Make 'docker-compose-apple-m1.override.yml' usable for overriding development as well 
- Do this by removing 'mailserver' platform in 'docker-compose-apple-m1.override.yml'.
 2022-07-15 09:19:10 +02:00
Wolfgang Huß
0fef1bbd60 Change Docker compose 'maintenance' port from '5000' to '3001' 
- Because port '5000' has a standard use on macOS, it is said.
 2022-07-13 10:49:21 +02:00
Wolfgang Huß
04cd391a39 Remove image entries in 'docker-compose.yml' and 'docker-compose.override.yml' 2022-07-13 10:02:18 +02:00
Wolfgang Huß
de8da7fb30 Add platform for Apple M1 via docker compose override 2022-07-13 10:00:55 +02:00
Wolfgang Huß
fb4a69d24a
Merge pull request #5058 from Ocelot-Social-Community/5057-release-v1.0.8 
chore: 🍰 Release v1.0.8
b1.0.8-182 1.0.8 		2022-07-01 10:48:47 +02:00
Wolfgang Huß
cd07c9b2f6 Release v1.0.8 2022-07-01 09:51:48 +02:00
Wolfgang Huß
1926238953
Merge pull request #5038 from Ocelot-Social-Community/5037-logging-mails-in-dev-mode 
chore: 🍰 Log E-Mail If Not Sending It
b1.0.7-181 		2022-06-28 10:42:49 +02:00
Wolfgang Huß
b08bd14d80 Refine logging text for unsend e-mails 2022-06-28 09:44:50 +02:00
Wolfgang Huß
5dd969c372 Fix forgotten parameter 'key' in 'cleanHtml' 2022-06-28 09:39:54 +02:00
Wolfgang Huß
f92cec3749 Log e-mail if not sending it 2022-06-24 10:04:35 +02:00
Wolfgang Huß
1ecf5f2965
Merge pull request #4787 from Ocelot-Social-Community/4785-test-refactor-email-templates 
test: 🍰 Test And Refactor E-Mail Templates
b1.0.7-180 		2022-06-23 19:05:43 +02:00
Wolfgang Huß
bdbd2c361a Change dummy invite code from 'AAAAAA' to 'ABCDEF' to see the length 2022-06-23 18:12:37 +02:00
Wolfgang Huß
5abbf22b43 Implement 'inviteCode' and 'nonce' lengths via 'registration.js' in backend and webapp 2022-06-23 17:44:59 +02:00
Wolfgang Huß
5cd1b95907 Fix templates 'variables' argument 2022-06-23 15:51:36 +02:00
Wolfgang Huß
15e69a47ae Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-06-23 09:35:30 +02:00
Alexander Friedland
607f98761c
Merge pull request #4980 from Ocelot-Social-Community/4896-Pasting-Of-Some-Embedded-Links-Does-Not-Work 
fix: 🍰 Replace Hashtag In d.tube Url
b1.0.7-179 		2022-06-22 15:54:26 +02:00
ogerly
86375e7879 Merge branch 'master' into 4896-Pasting-Of-Some-Embedded-Links-Does-Not-Work 2022-06-22 14:29:15 +02:00
Wolfgang Huß
3adfab34c5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-06-22 14:26:29 +02:00
Wolfgang Huß
405de6c078
Merge pull request #5034 from Ocelot-Social-Community/5033-fix-bckend-location-test 
Fix location backend test
b1.0.7-178 		2022-06-22 14:24:58 +02:00
Wolfgang Huß
aea15229b9 Fix location backend test 2022-06-22 13:32:55 +02:00
Wolfgang Huß
23dbf2d310 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-06-22 11:31:54 +02:00
ogerly
c92d437723 change hashtag test from = to # 2022-06-22 11:05:40 +02:00
ogerly
652fdcca5c yarn lint 2022-06-22 11:03:32 +02:00
ogerly
61679549d2 add comment for general hashtag in link is not the problem 2022-06-22 11:01:28 +02:00
ogerly
771f11ee90 replace hashtag in d.tube url 2022-05-15 09:44:15 +02:00
Wolfgang Huß
d9f33ded17
Merge pull request #4882 from Ocelot-Social-Community/4342-fix-language-select 
fix: 🍰 Add Expiration Date To Cookies Etc.
b1.0.7-177 		2022-05-06 12:16:14 +02:00
Wolfgang Huß
1969192e89
Merge pull request #4773 from Ocelot-Social-Community/4771-refactor-social-media-list-with-slots 
feat: 🍰 Refactor Social Media List With Slots
b1.0.7-176 		2022-05-06 11:56:53 +02:00
ogerly
f63165aa70 deleted unused css 2022-05-06 10:55:05 +02:00
Wolfgang Huß
652665d1fb Change naming and negation for better readability 2022-05-06 10:50:38 +02:00
Wolfgang Huß
46f27ccb9b Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4342-fix-language-select 2022-05-06 10:00:08 +02:00
Wolfgang Huß
23b7efa0e5 Change some little things in the frontend tests 2022-05-06 09:09:00 +02:00
Wolfgang Huß
7936b76043 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4771-refactor-social-media-list-with-slots 2022-05-06 07:58:41 +02:00
Wolfgang Huß
78eb0fa97d Refine test for e-mail templateBuilder 2022-05-06 07:47:43 +02:00
Wolfgang Huß
a66212f66c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-05-06 07:32:42 +02:00
Wolfgang Huß
ea71e9b145
Merge pull request #4975 from Ocelot-Social-Community/4962-fix-deleted-faker-package 
bug: 🍰 Replace Deleted Faker Package – Change To Import Again
b1.0.7-175 		2022-05-05 10:30:33 +02:00
Wolfgang Huß
e4b695a486 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4771-refactor-social-media-list-with-slots 2022-05-04 09:36:06 +02:00
Wolfgang Huß
8648c271a7 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-05-04 09:31:04 +02:00
Wolfgang Huß
50bdfb80e2 Change from require to import which now works again 2022-05-04 09:15:47 +02:00
Wolfgang Huß
f348ace473
Merge pull request #4973 from Ocelot-Social-Community/4962-fix-deleted-faker-package 
bug: 🍰 Replace Deleted Faker Package
b1.0.7-174 		2022-05-03 21:47:52 +02:00
Wolfgang Huß
980a6bf504 Fix faker package installation in webapp 2022-05-03 20:02:44 +02:00
Wolfgang Huß
4b42975cd9 Fixate faker version in backend 
- Do this, because of upgrade to v6 that may happen and need a Node version >= v14 we don't support yet as I have seen.
 2022-05-03 14:30:11 +02:00
Wolfgang Huß
634249b407 Fix the rest of the faker imports 
- Some seems to work even the old way?!
 2022-05-03 14:22:10 +02:00
Wolfgang Huß
0867d2bfca Fix backend test of locations 2022-05-03 13:43:10 +02:00
Wolfgang Huß
7bb1b0bbad Fix faker import and change version, because of unsplash does not exist 2022-05-03 12:08:01 +02:00
Wolfgang Huß
bbb88cb1d9 Remove console.log 2022-05-02 16:53:07 +02:00
Wolfgang Huß
c0a61600e4 Revert change of faker import 2022-05-02 16:51:51 +02:00
Wolfgang Huß
47b88ffb46 Fix faker import 2022-05-02 16:28:45 +02:00
Wolfgang Huß
37d36be095 Replace deleted faker 
- Add Node Version Manager files as hint of the best Node version and to be used with '$ nvm use'.
 2022-05-02 16:02:28 +02:00