Moriz Wahl
|
b8228db9f3
|
Merge branch 'master' into map
|
2023-02-03 17:41:12 +01:00 |
|
Wolfgang Huß
|
6590a8dd9f
|
Move location hint under location select on group and settings form
|
2023-02-01 11:11:30 +01:00 |
|
Wolfgang Huß
|
5f8368e971
|
Add hint to labels of user and group position settings
|
2023-01-31 17:50:03 +01:00 |
|
Moriz Wahl
|
52eeb5effc
|
Merge branch 'master' into fix-group-texts
|
2023-01-31 16:54:33 +01:00 |
|
Wolfgang Huß
|
81f2840a95
|
Implement alert message on map page if 'MAPBOX_TOKEN' is empty in .env
|
2023-01-31 15:50:27 +01:00 |
|
Wolfgang Huß
|
8ae6eff0e4
|
Add map button to header menu
|
2023-01-31 13:06:34 +01:00 |
|
Wolfgang Huß
|
55f699a130
|
Add tool tip to group button in header menu
|
2023-01-31 13:04:55 +01:00 |
|
ogerly
|
d4596b3447
|
add locales deleteFilter
|
2023-01-31 10:23:28 +01:00 |
|
Moriz Wahl
|
4fbfccb6ff
|
fix(webapp): texts for groups
|
2023-01-30 14:23:56 +01:00 |
|
Wolfgang Huß
|
fff10a5991
|
Merge pull request #5138 from Ocelot-Social-Community/5137-refactor-social-media-and-mysomethinglist
refactor(webapp): 🍰 Refactor Social Media And `MySomethingList`
|
2023-01-30 13:21:28 +01:00 |
|
Wolfgang Huß
|
5e29e4052f
|
Change German map page headline to 'Landkarte'
|
2023-01-27 13:42:11 +01:00 |
|
Wolfgang Huß
|
96b542f3b1
|
Refine map marker popups
- Translate texts.
|
2023-01-26 08:27:07 +01:00 |
|
ogerly
|
4a8f466051
|
fix: locales
|
2023-01-25 09:28:48 +01:00 |
|
ogerly
|
983e7e12f4
|
filter for themen and friends in content page per button, close funktion
|
2023-01-25 09:27:30 +01:00 |
|
Wolfgang Huß
|
67fe5864c9
|
Add map page title, even in head
|
2023-01-10 10:46:54 +01:00 |
|
Wolfgang Huß
|
c3e01ac8e1
|
Fix locales
|
2023-01-05 15:47:41 +01:00 |
|
Wolfgang Huß
|
41ecc2df9e
|
Translate and make it reactive
- Simplify coding of styles.
|
2023-01-05 15:46:24 +01:00 |
|
Wolfgang Huß
|
b3f4d8114e
|
Move readme's content to 'CONTRIBUTING.md'
|
2022-11-29 14:57:35 +01:00 |
|
Moriz Wahl
|
78672cd2e5
|
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-11-24 17:18:55 +01:00 |
|
Moriz Wahl
|
46f13d022d
|
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-11-24 17:18:38 +01:00 |
|
Moriz Wahl
|
287e5c29ea
|
changes suggested by @tirokk
|
2022-11-23 17:53:43 +01:00 |
|
Wolfgang Huß
|
02598e5224
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5137-refactor-social-media-and-mysomethinglist
|
2022-11-23 14:34:23 +01:00 |
|
Wolfgang Huß
|
57bbcd9025
|
Add locales README.md for quotation marks
|
2022-11-23 14:32:02 +01:00 |
|
Wolfgang Huß
|
7d3631307b
|
Fix quotation marks for English locale 'settings.social-media.delete-modal.message'
|
2022-11-23 14:31:15 +01:00 |
|
Moriz Wahl
|
9ef44ed23c
|
new locales for add group member
|
2022-11-22 12:22:40 +01:00 |
|
Wolfgang Huß
|
4ebae574f2
|
Add 'pl' translation
|
2022-11-16 14:15:59 +01:00 |
|
Wolfgang Huß
|
3a968361db
|
Fix locales to be 'null' instead of '""'
|
2022-11-16 14:14:09 +01:00 |
|
Wolfgang Huß
|
b398eabf47
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read
# Conflicts:
# webapp/locales/it.json
|
2022-11-16 11:45:19 +01:00 |
|
Moriz Wahl
|
55003447e5
|
check if user is member before adding user to group
|
2022-11-07 16:58:21 +01:00 |
|
Moriz Wahl
|
b183485237
|
fix locales
|
2022-10-26 15:17:36 +02:00 |
|
Moriz Wahl
|
3bf26de650
|
rename route from my-groups to groups
|
2022-10-26 14:18:33 +02:00 |
|
Moriz Wahl
|
7f22b5fb62
|
add tab to group page to have all groups and my groups
|
2022-10-26 14:06:02 +02:00 |
|
Wolfgang Huß
|
f90d671245
|
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into search-groups
|
2022-10-22 18:07:35 +02:00 |
|
Moriz Wahl
|
2b8b50af48
|
add group hint to search hint
|
2022-10-21 17:59:11 +02:00 |
|
Moriz Wahl
|
cb1e9f95e0
|
add headers for group search
|
2022-10-21 17:51:43 +02:00 |
|
Wolfgang Huß
|
9773a7b4ba
|
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp
|
2022-10-21 11:34:31 +02:00 |
|
Alexander Friedland
|
e68952b17e
|
Merge pull request #5512 from Ocelot-Social-Community/5384-Group-Invitation
feat: 🍰 Group Invitation
|
2022-10-21 06:54:50 +02:00 |
|
|
|
56850f7790
|
include in between user and group link -> @user in &group
|
2022-10-20 12:54:07 +02:00 |
|
ogerly
|
79644cb60a
|
add locals for group member
|
2022-10-18 19:29:48 +02:00 |
|
ogerly
|
a8cf6acd93
|
add slug user to group member
|
2022-10-18 13:38:05 +02:00 |
|
Wolfgang Huß
|
1703638dd6
|
Implement group indication headline for view and edit post page
|
2022-10-07 23:26:47 +02:00 |
|
Wolfgang Huß
|
7b9b253211
|
Implement post creation in a group
|
2022-10-07 11:32:04 +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 |
|
Alexander Friedland
|
c6fa49ee0f
|
Merge branch '5059-epic-groups' into 5344-add-group-members-management
|
2022-09-28 09:22:12 +02:00 |
|
Wolfgang Huß
|
f62df1f4aa
|
Add 'my groups' to avatar menu
|
2022-09-27 16:10:17 +02:00 |
|
Wolfgang Huß
|
0d44d8ae04
|
Cleanup
- Reduce tooltip delay to 750ms.
|
2022-09-26 11:42:44 +02:00 |
|
Wolfgang Huß
|
13ec4ee776
|
Refine design and a bit functionality, first step
|
2022-09-24 18:06:15 +02:00 |
|
Wolfgang Huß
|
2aa85d7b05
|
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5344-add-group-members-management
# Conflicts:
# backend/src/db/graphql/groups.js
# backend/src/schema/resolvers/groups.js
# webapp/components/Group/GroupCard.vue
# webapp/components/Group/GroupForm.vue
# webapp/components/Group/GroupTeaser.vue
# webapp/graphql/groups.js
# webapp/locales/de.json
# webapp/locales/en.json
# webapp/pages/group/edit/_id.vue
|
2022-09-23 15:04:49 +02:00 |
|
ogerly
|
beebcdbee7
|
Merge branch 'master' into 5344-add-group-members-management
|
2022-09-23 10:47:08 +02:00 |
|
ogerly
|
3e1eb299b7
|
pull && resolve conflicts
|
2022-09-23 10:41:49 +02:00 |
|
