IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,279 Commits 5 Branches 2 Tags
Commit Graph

11279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
 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
 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
 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
 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
 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
 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
Moriz Wahl
ab662db0e4 empty array as input only clears all saved categories 2022-09-06 18:46:47 +02:00
Moriz Wahl
b262b16cf2 Merge branch 'save-category-settings' 2022-09-06 17:42:12 +02:00
Moriz Wahl
8a688ca78b improve tests 2022-09-06 15:14:31 +02:00
Moriz Wahl
60fabe587b
Merge pull request #5248 from Ocelot-Social-Community/create-topics-menu 
feat: Topics Menu
 2022-09-06 13:28:15 +02:00
Moriz Wahl
4e5d4cb873 basic tests for save category settings 2022-09-05 20:51:48 +02:00
Moriz Wahl
fc6d544ea7 add resolver for save active categories 2022-09-05 20:07:14 +02:00
Moriz Wahl
572377acfd add active categories to user 2022-09-05 20:06:10 +02:00
Moriz Wahl
b8ac4cc3ca add saveCategoruSettings mutation to schema 2022-09-05 17:41:21 +02:00
Wolfgang Huß
b80a9fdff8
Merge pull request #5253 from Ocelot-Social-Community/5252-doc-graphql-playground 
docs: 🍰 Document GraqhQL Playground
 2022-09-01 15:06:19 +02:00