ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,288 Commits 117 Branches 1,511 Tags
Commit Graph

11288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
95cb82da34 Make configurable header menu translatable 2022-10-15 16:11:28 +02:00
Wolfgang Huß
9ccafbd48b
Merge pull request #5392 from Ocelot-Social-Community/5391-release-v1.1.1-refactor-rebranding 
Chore: 🍰 Release v1.1.1 – Refactor Rebranding
b1.1.1-228 1.1.1 		2022-09-22 20:44:37 +02:00
Wolfgang Huß
a618366619 Release v1.1.1 - refactor rebranding 2022-09-22 20:02:34 +02:00
Alexander Friedland
2ee8431ead
Merge pull request #5390 from Ocelot-Social-Community/5153-refactor-rebranding 
chore: 🍰 Refactor Rebranding
b1.1.0-227 		2022-09-22 19:41:30 +02:00
ogerly
858739eaa0 fix review 2022-09-22 18:42:58 +02:00
ogerly
1af5ce9e30 add [200~.ds-footer a {scss token 2022-09-22 18:20:13 +02:00
ogerly
4045260fc3 remove console log, fix lint 2022-09-22 17:55:17 +02:00
ogerly
5f5c0faa1f cleanup refactor rebranding 2022-09-22 17:52:03 +02:00
ogerly
0293fec7e7 step1 refactor rebranding 2022-09-22 16:51:48 +02:00
ogerly
58e48cfe77 rebrand in config for scss and styleguide 2022-09-21 12:09:35 +02:00
ogerly
28c4740a98 add code if condition 2022-09-20 19:54:53 +02:00
ogerly
1fdee4058d fix yarn 2022-09-20 16:51:33 +02:00
ogerly
5974ff7c24 change footer links 2022-09-20 16:50:34 +02:00
ogerly
a1292ef9ff fix lint 2022-09-20 16:03:50 +02:00
ogerly
52070b8c57 change color and scss in branding 2022-09-20 16:03:06 +02:00
ogerly
bfcfb8462e resolve conflict 2022-09-20 10:29:37 +02:00
ogerly
8b62b624ac refactor header menu, add svg logos 2022-09-20 10:19:02 +02:00
Moriz Wahl
14b5435929
Merge pull request #5350 from Ocelot-Social-Community/category-tooltipps 
feat: 🍰 Tooltips For Topics
b1.1.0-226 		2022-09-16 11:17:31 +02:00
Moriz Wahl
64153ea9e3 change delay of category tooltip to 1500 2022-09-15 10:04:26 +02:00
Moriz Wahl
ba9a6fd750
Update webapp/locales/de.json 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-15 09:25:46 +02:00
Moriz Wahl
5727eeb49f feature: Tooltips for Topics 2022-09-13 09:17:04 +02:00
Moriz Wahl
922ca2d7ef
Merge pull request #5284 from Ocelot-Social-Community/save-categories-in-frontend 
feat: 🍰 Save Categories In Frontend
b1.1.0-225 		2022-09-12 15:08:09 +02:00
Moriz Wahl
53a58fb284
Merge pull request #5319 from Ocelot-Social-Community/add-new-yunite-icons 
feat: 🍰 Add New Yunite Icons
b1.1.0-224 		2022-09-12 15:07:45 +02:00
Wolfgang Huß
1bc607ec28
Merge pull request #5334 from Ocelot-Social-Community/5333-update-neode 
chore: 🍰 Update Neode From v^0.4.7 To v^0.4.8 In Backend
b1.1.0-223 		2022-09-12 09:27:45 +02:00
Wolfgang Huß
5b1643208b Upgrade neode from v^0.4.7 to v^0.4.8 in backend and main folder 2022-09-10 12:36:49 +02:00
Moriz Wahl
8e561711d0 fix typo 2022-09-08 16:37:41 +02:00
Moriz Wahl
3508b37224 load new icons for categories 2022-09-08 16:28:45 +02:00
Moriz Wahl
bb0d6329e7 add new yunite icons 2022-09-08 16:25:18 +02:00
Moriz Wahl
60627ffcf2 ensure that selected categories are resteted before toggling them to set saved categories 2022-09-08 15:34:29 +02:00
Moriz Wahl
2c4f45ad70
Update webapp/locales/en.json 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-08 15:17:12 +02:00
Moriz Wahl
cc5fcb6704
Update webapp/locales/de.json 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-08 15:17:05 +02:00
Moriz Wahl
754251258d test setting of saved categories 2022-09-07 21:50:37 +02:00
Moriz Wahl
b323d0f580 set category filter as stored in db after login 2022-09-07 20:19:10 +02:00
Moriz Wahl
a65e306b85 all categories saved returns empty array 2022-09-07 16:04:09 +02:00
Moriz Wahl
32e7c8971c Merge branch 'master' into save-categories-in-frontend 2022-09-07 15:14:03 +02:00
Moriz Wahl
5596cd11e9 test saving active categories 2022-09-07 15:13:14 +02:00
Moriz Wahl
860949dc6a test current user query for active categories 2022-09-07 15:00:04 +02:00
Moriz Wahl
bcaeee44fa adopt active categories as array of ids 2022-09-07 14:12:53 +02:00
Moriz Wahl
18e15be24d active categories is array of string (ids of categories), current user query resolves with active categories 2022-09-07 14:09:24 +02:00
Moriz Wahl
d05919fddb add active categories to current user query 2022-09-07 14:08:03 +02:00
Moriz Wahl
341e386207 linting 2022-09-07 13:37:48 +02:00
Moriz Wahl
01dd0dc038
Merge pull request #5301 from Ocelot-Social-Community/fix-category-filter-menu 
fix: Category Filter Menu Client Only
b1.1.0-222 		2022-09-07 12:57:45 +02:00
Moriz Wahl
f5d8014f6c fix: Category Filter Menu Client Only 2022-09-07 11:06:43 +02:00
Moriz Wahl
14d9399b20 Merge branch 'master' into save-categories-in-frontend 2022-09-07 09:16:45 +02:00
Moriz Wahl
1c2a2a05fe
Merge pull request #5261 from Ocelot-Social-Community/save-category-settings 
feat: Save Category Settings
b1.1.0-221 		2022-09-07 09:14:58 +02:00
Moriz Wahl
3213bd3ee4 test save categories 2022-09-06 19:17:06 +02:00
Moriz Wahl
dcdef615c1 add locales for saving categories 2022-09-06 18:51:55 +02:00
Moriz Wahl
d45ad17b43 add save button to category filters 2022-09-06 18:51:20 +02:00
Moriz Wahl
d4c338e04e add save categories mutation 2022-09-06 18:50:33 +02:00
Moriz Wahl
523d290ff8 add save icon 2022-09-06 18:50:05 +02:00