Wolfgang Huß dea77e8c31 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-reformer-network-first-step ...

# Conflicts:
#	backend/src/config/logos.ts
#	webapp/constants/logos.js

2025-05-09 19:08:26 +02:00

..

badges.js

feat(backend): badges (#8391)

2025-04-17 23:08:54 +00:00

categories.js

Implement error for to short 'description' and test it

2022-08-09 16:34:50 +02:00

chat.js

refactor(webapp): refactor branding of post ribbons and chat etc. (#8395)

2025-04-17 17:48:59 +02:00

comment.js

Changed comments to be four times as long (was 300, now 1200 characters) before they are hidden behind show more. Added two tests, one to make sure comments of length > 300 but < 1200 are fully visible, and another to check that comments > 1200 characters are hidden.

2019-12-06 14:52:24 -05:00

dateTime.js

Revert "Change 'RELATIVE_DATETIME' to 'false'"

2024-02-05 18:52:06 +01:00

donation.js

Set first config and branding

2024-10-22 21:38:23 +02:00

editor.js

use constants for keycodes and mention types

2019-08-26 11:58:15 +01:00

emails.js

Set first config and branding

2024-10-22 21:38:23 +02:00

filter.js

🧘🏼 [Simulation] Brand reformer network first step – v2 (#8384)

2025-04-29 10:08:38 +02:00

groups.js

Set first config and branding

2024-10-22 21:38:23 +02:00

headerMenu.js

feat(webapp): implement configurable custom button in header (#8215)

2025-03-01 08:00:41 +01:00

headerMenuBranded.js

feat(webapp): implement configurable custom button in header (#8215)

2025-03-01 08:00:41 +01:00

keycodes.js

use constants for keycodes and mention types

2019-08-26 11:58:15 +01:00

links.js

Fix ocelot.social link for imprint and donation (#8461)

2025-04-30 13:28:07 +00:00

login.js

🧘🏼 [Simulation] Brand reformer network first step – v2, Login etc. Branding (#8448)

2025-04-29 10:21:14 +02:00

loginBranded.js

🧘🏼 [Simulation] Brand reformer network first step – v2, Login etc. Branding (#8448)

2025-04-29 10:21:14 +02:00

logos.js

fix(webapp): mobile optimization (#8516)

2025-05-09 17:04:06 +00:00

logosBranded.js

fix(webapp): mobile optimization (#8516)

2025-05-09 17:04:06 +00:00

manifest.js

Change solution to make theme color brandable

2024-10-23 15:32:01 +02:00

metadata.js

Adjust colors, extended, third step

2024-10-24 19:30:11 +02:00

modals.js

Rename REPORTED Claim to FILED Report

2019-11-26 15:35:48 +01:00

posts.js

change postion add content button, refactor mobile filter menu

2023-02-07 12:00:16 +01:00

registration.js

🧘🏼 [Simulation] Brand reformer network first step – v2, Login etc. Branding (#8448)

2025-04-29 10:21:14 +02:00

registrationBranded.js

🧘🏼 [Simulation] Brand reformer network first step – v2, Login etc. Branding (#8448)

2025-04-29 10:21:14 +02:00

terms-and-conditions-version.js

terms-and-condition: the point -no political use - added

2020-02-22 14:38:32 +01:00