IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
345 Commits 5 Branches 2 Tags
Commit Graph

70 Commits

Author SHA1 Message Date
ogerly
fd10880214 resolve conflicts 2022-12-01 12:59:24 +01:00
ogerly
507f42a55a rebranding for yunite 2022-12-01 12:54:30 +01:00
Wolfgang Huß
9389c3463f Adjust groups header menu 2022-10-28 21:26:04 +02:00
Wolfgang Huß
21fcc094a6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 18-release-v2.1.X-XXX-fixes-groups-page 
# Conflicts:
#	branding/constants/headerMenu.js
#	branding/constants/links.js
#	branding/constants/logos.js
#	package.json
 2022-10-28 20:00:15 +02:00
Alexander Friedland
a1b2accc36
Merge pull request #21 from Yunite-Net/20-Color-of-Hastags-in-Search-Results 
fix: 🍰 Change Hasttag Menu Search Color To `#17b53f`
 2022-10-28 19:31:12 +02:00
Wolfgang Huß
de797e94f1 Add all new configuration files and properties 2022-10-28 17:25:11 +02:00
ogerly
7578e03c6d change hasttag search test color to #17b53f 2022-10-28 11:34:34 +02:00
Wolfgang Huß
75b447493f Change owner data etc. 2022-10-26 13:48:03 +02:00
Wolfgang Huß
05e4984df6 Merge branch '76-release-v2.0.0-groups-extend-rebranding-and-deployment' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable 
# Conflicts:
#	README.md
#	TODO-next-update.md
#	branding/constants/groups.js
#	branding/constants/headerMenu.js
#	branding/constants/logos.js
 2022-10-22 21:06:45 +02:00
Wolfgang Huß
ea51f73b64 Adjust the footer 2022-10-22 20:46:38 +02:00
Wolfgang Huß
c13b285992 Add header menu item 'Topic' 2022-10-22 20:31:32 +02:00
Wolfgang Huß
7ec3ee09df Adjust merge of groups branch by fixing header menu lacales idents 2022-10-22 20:26:31 +02:00
Wolfgang Huß
c2c66786a7 Merge branch '5059-epic-groups' of github.com:Yunite-Net/Yunite-Net-Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable 
# Conflicts:
#	.github/workflows/publish.yml
#	branding/constants/headerMenu.js
 2022-10-22 20:21:25 +02:00
Wolfgang Huß
9492162712 Set footer 2022-10-22 20:14:51 +02:00
Wolfgang Huß
b0ff413d83 Adjust and add constants files 2022-10-22 20:05:29 +02:00
Wolfgang Huß
0794115b3f Release v1.1.2-XXX - configurable header menu is translatable 2022-10-15 15:57:36 +02:00
Wolfgang Huß
f4d440b86c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding 2022-10-15 15:03:12 +02:00
Wolfgang Huß
0cf00fdc07 Fix copy error by adding two empty JSON files to the locales 2022-10-13 15:13:34 +02:00
Wolfgang Huß
2bfde2afc1 Merge branch '5059-epic-groups' of github.com:Yunite-Net/Yunite-Net-Ocelot-Social-Deploy-Rebranding into 13-groups-release-v1.1.1-231 
# Conflicts:
#	package.json
 2022-09-30 09:57:21 +02:00
Wolfgang Huß
4f5ff1ff36 Release v1.1.1-231 show new group features 2022-09-30 09:52:09 +02:00
Wolfgang Huß
3b034679bc Add groups header menu 2022-09-26 17:16:38 +02:00
Alexander Friedland
a9b1ab8e2c
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:31 +02:00
Alexander Friedland
b44ab6ff93
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:26 +02:00
Alexander Friedland
f764a5e840
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:21 +02:00
Alexander Friedland
5c134140f7
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:15 +02:00
Alexander Friedland
af6a7ee063
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:10 +02:00
Alexander Friedland
3ea522ff2a
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:10:03 +02:00
Alexander Friedland
d14fd3f47a
Update branding/constants/links.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:09:56 +02:00
ogerly
58079c5b8e merge ocelot master resolve conflicts 2022-09-23 08:50:00 +02:00
ogerly
0f27858284 resolve conflicts 2022-09-23 08:45:41 +02:00
Wolfgang Huß
e0b2b098cf Fix folder name from branding/assets/styles/import to branding/assets/styles/imports 2022-09-23 07:20:14 +02:00
ogerly
870fe89a80 refactor rebranding 2022-09-22 19:49:24 +02:00
Wolfgang Huß
b494dc1456 Refactor to use internal FAQ page 2021-11-30 11:09:42 +01:00
Wolfgang Huß
34e148b923 Refactor CSS for internal pages 2021-10-20 10:35:04 +02:00
Wolfgang Huß
e8eaef50e5 Change note in FAQ templates 2021-10-20 10:33:54 +02:00
Wolfgang Huß
9959585a5f Refactor CSS on internal pages to replace linebreak 2021-10-20 09:04:22 +02:00
Wolfgang Huß
3d058251d7 Fix imprint link 2021-10-18 16:44:37 +02:00
Wolfgang Huß
ff24b34df5 Refactor CSS on internal pages after Davids suggestions 2021-10-18 07:59:22 +02:00
sushidave
e6f648cc01
Simplify CSS data-privacy.html 2021-10-15 13:46:40 +02:00
Wolfgang Huß
550f197626 Refactor CSS on internal pages 2021-10-14 13:23:55 +02:00
Wolfgang Huß
dea9806176 Delete comments in data-privacy.html 2021-10-14 11:05:11 +02:00
Wolfgang Huß
f28119a536 Finish data-privacy.html 2021-10-13 16:25:36 +02:00
Wolfgang Huß
9bb3ff8b1a Restructure template folders 2021-10-13 16:24:50 +02:00
Wolfgang Huß
81ac662b33 Refine info pages 2021-10-12 12:26:15 +02:00
Wolfgang Huß
4b892ff43f Overtake some corrections 2021-10-12 12:26:00 +02:00
Wolfgang Huß
973e6a0249 Refine info pages 2021-10-12 08:47:36 +02:00
Wolfgang Huß
3ad58ab989 Refine template for terms-and-….html 2021-10-11 17:45:54 +02:00
Wolfgang Huß
51900faced Refine template for data-privacy.html 2021-10-11 14:07:49 +02:00
Wolfgang Huß
83cdc611f3 Add template for data-privacy.html 2021-10-11 13:43:02 +02:00
Wolfgang Huß
62c436b3dc Add templates for faq.htm 2021-10-07 16:14:49 +02:00