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,294 Commits 5 Branches 2 Tags
Commit Graph

4136 Commits

Author SHA1 Message Date
Wolfgang Huß
be9dbdbb76 Refine component 'my-social-media' in webapp 2022-10-04 11:04:50 +02:00
Wolfgang Huß
a5c65faf15 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5137-refactor-social-media-and-mysomethinglist 
# Conflicts:
#	webapp/pages/settings/my-social-media.vue
 2022-10-04 10:08:29 +02:00
Wolfgang Huß
a618366619 Release v1.1.1 - refactor rebranding 2022-09-22 20:02:34 +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
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
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
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
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
f5d8014f6c fix: Category Filter Menu Client Only 2022-09-07 11:06:43 +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
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
87aa47d683 add optional topica menu when categories are active 2022-08-31 14:32:46 +02:00
Moriz Wahl
d6f8b0dc77 change category to topic in german and english locales 2022-08-31 14:28:25 +02:00
Wolfgang Huß
99f053205a
Merge pull request #5198 from Ocelot-Social-Community/categories-filter-menu 
feat: Categories Filter Menu
 2022-08-31 08:44:56 +02:00
Wolfgang Huß
81b763c732
Merge pull request #5217 from Ocelot-Social-Community/5216-fix-test-description-from-enter-nonce-to-change-password 
fix: 🍰 Fix Test Description From `enter-nonce.vue` To `change-password`
 2022-08-29 09:16:17 +02:00
Wolfgang Huß
e2c6902433 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.2.2 2022-08-27 19:31:57 +02:00
dependabot[bot]
3607ed4b68
Bump cookie-universal-nuxt from 2.1.5 to 2.2.2 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.5 to 2.2.2.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.5...v2.2.2)

---
updated-dependencies:
- dependency-name: cookie-universal-nuxt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-27 14:53:33 +00:00
Wolfgang Huß
1252e79be2 Fix test description from 'enter-nonce' to 'change-password' 2022-08-27 16:42:11 +02:00
Wolfgang Huß
e82d35c824 Fix linting 2022-08-25 23:17:50 +02:00
dependabot[bot]
0a02e1e402
Bump prettier from 2.2.1 to 2.7.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.7.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.2.1...2.7.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-25 18:15:25 +00:00
Wolfgang Huß
d8d080dae5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into categories-filter-menu 2022-08-25 17:39:38 +02:00
Moriz Wahl
407f4f8d2d fix test (mock .CATEGORIES_ACTIVE) 2022-08-25 13:29:08 +02:00
Wolfgang Huß
d112538e63
Merge pull request #5174 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.3.1 
Bump vue-sweetalert-icons from 4.3.0 to 4.3.1 in /webapp
 2022-08-25 13:29:02 +02:00
Wolfgang Huß
ab3ab3b07d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.3.1 2022-08-25 11:57:35 +02:00