sushidave
|
c9d07e514a
|
Replaced logos
|
2022-11-07 15:49:53 +01:00 |
|
sushidave
|
e01027832c
|
renamed files faq.html and support.html
|
2022-11-07 15:49:18 +01:00 |
|
sushidave
|
2c7684fae1
|
Delete support.html
|
2022-10-24 19:42:05 +02:00 |
|
sushidave
|
afaff0f8b1
|
Update organization.html
|
2022-10-24 19:35:52 +02:00 |
|
sushidave
|
a797b88c71
|
Update imprint.html
|
2022-10-24 19:35:20 +02:00 |
|
sushidave
|
3c96160882
|
Update help.html
|
2022-10-24 19:34:45 +02:00 |
|
sushidave
|
52cf8ebdf0
|
Update code-of-conduct.html
|
2022-10-24 19:33:22 +02:00 |
|
sushidave
|
a4dcead818
|
Update terms-and-conditions.html
|
2022-10-24 19:20:42 +02:00 |
|
sushidave
|
b1c1da449e
|
Update data-privacy.html
|
2022-10-24 19:11:08 +02:00 |
|
sushidave
|
e006cae6b6
|
Updte imprint.html
|
2022-10-24 18:38:21 +02:00 |
|
sushidave
|
45bd918fee
|
Update donate.html
|
2022-10-24 18:29:38 +02:00 |
|
sushidave
|
1386055683
|
Update and rename faq.html to help.html
|
2022-10-24 18:21:29 +02:00 |
|
sushidave
|
ce7f640744
|
Update text of code-of-conduct.html
|
2022-10-24 18:16:45 +02:00 |
|
sushidave
|
cb02ace263
|
Update of organization.html
|
2022-10-24 18:13:27 +02:00 |
|
Wolfgang Huß
|
98743effc3
|
Change organization page
|
2022-06-30 14:38:40 +02:00 |
|
Wolfgang Huß
|
ec28b20d0d
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into helfa.social-code-of-conduct-etc-tryout
# Conflicts:
# webapp/constants/links.js
# webapp/locales/html/de/code-of-conduct.html
# webapp/locales/html/de/data-privacy.html
# webapp/locales/html/de/faq.html
# webapp/locales/html/de/imprint.html
# webapp/locales/html/de/support.html
# webapp/locales/html/de/terms-and-conditions.html
# webapp/locales/html/en/code-of-conduct.html
# webapp/locales/html/en/data-privacy.html
# webapp/locales/html/en/donate.html
# webapp/locales/html/en/faq.html
# webapp/locales/html/en/imprint.html
# webapp/locales/html/en/organization.html
# webapp/locales/html/en/support.html
# webapp/locales/html/en/terms-and-conditions.html
|
2022-06-28 11:48:19 +02:00 |
|
Wolfgang Huß
|
0ed8158ee6
|
Correct some pages especially English ones
|
2022-06-28 11:37: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 |
|