Commit graph

1064 commits

Author SHA1 Message Date
bd247797bb Merge remote-tracking branch 'soapbox/develop' into mastodon-groups
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-21 13:02:19 +01:00
0879222aa2 Improve permissions check
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-19 14:10:13 +01:00
fa18698cd3 Groups: Status action bar actions
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-18 21:19:44 +01:00
f6f056e0fe Support Mastodon permissions system(?)
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-18 18:18:26 +01:00
6b92d5f3a5 Manage group pages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-18 18:03:41 +01:00
18b297ad63 Improve media panel styles
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-18 13:34:03 +01:00
96d39a9d1a Groups: Hide ComposeForm if not a member, add Media panel
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-18 13:17:45 +01:00
Alex Gleason
8a14dfefe7
Merge remote-tracking branch 'origin/develop' into theme-editor 2022-12-17 17:57:43 -06:00
Alex Gleason
63ee2ba2ba
Bundle: componentWillReceiveProps --> UNSAFE_componentWillReceiveProps 2022-12-17 11:01:43 -06:00
b6b9fdb035 Groups: fix DetailsStep
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-17 15:59:11 +01:00
f829440104 Add groups link to sidebar
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-17 14:37:08 +01:00
0e730cf762 Groups: add key to group links
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-17 14:33:40 +01:00
Alex Gleason
48bd830349
Merge remote-tracking branch 'origin/develop' into theme-editor 2022-12-16 18:39:20 -06:00
fd6e3f4032 Groups: Make strings localizable
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-17 00:33:07 +01:00
0d617d4de8 Groups: simple member list
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-17 00:07:35 +01:00
ecaf3af364 Groups: utilize isDefaultAvatar, isDefaultHeader
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-16 21:35:09 +01:00
d4024e927d Merge remote-tracking branch 'soapbox/develop' into mastodon-groups 2022-12-16 21:33:23 +01:00
36350f1cc4 More group actions, allow to edit groups, visuals
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-16 21:33:17 +01:00
d524a7c700 Groups: UI improvements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-15 23:51:30 +01:00
marcin mikołajczak
e8d6c7d4b6 Merge branch 'profile-header' into 'develop'
Default header should not be clickable

See merge request soapbox-pub/soapbox!1994
2022-12-15 11:52:16 +00:00
Alex Gleason
7ae1b197d5
Feature-gate event routes 2022-12-14 17:38:57 -06:00
683504c997 Allow creating events, events list
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-14 22:59:59 +01:00
7c4aca51dc some basic groups ui
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-13 23:03:01 +01:00
6900b59697 Move isDefaultHeader and isDefaultAvatar to utils/accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-13 00:09:00 +01:00
24b790c2d1 Set tile server to empty by default
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-08 16:45:33 +01:00
2137193935 Revert "Remove 'show on map' for now"
This reverts commit 46cb676822.
2022-12-08 16:30:48 +01:00
Alex Gleason
fbd2471dc6
Move StatProvider above UI, increment chats unread counter from streaming events 2022-12-07 00:45:10 -06:00
Alex Gleason
ef4e738625
Load chats even on small screen sizes 2022-12-06 22:22:25 -06:00
Alex Gleason
2cedd69f1d
Merge remote-tracking branch 'origin/develop' into chats 2022-12-06 11:53:47 -06:00
46cb676822 Remove 'show on map' for now
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-02 23:16:11 +01:00
Chewbacca
5816659a09 Refactor chat functions 2022-12-02 15:50:54 -05:00
ea4f7a7332 Merge remote-tracking branch 'soapbox/develop' into events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-30 23:39:49 +01:00
Alex Gleason
31444756e4
Merge remote-tracking branch 'origin/develop' into chats 2022-11-30 12:46:24 -06:00
403bcba525 Compose event modal improvements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-30 19:32:35 +01:00
Alex Gleason
7675860429
Refactor columns 2022-11-30 11:19:16 -06:00
marcin mikołajczak
443b960067 Show quoted statuses list 2022-11-29 23:32:21 +00:00
ee389e523d Allow to configure tile server
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-29 23:14:16 +01:00
Alex Gleason
e5ff4fa176
Merge remote-tracking branch 'origin/develop' into events 2022-11-29 11:40:42 -06:00
marcin mikołajczak
c87826c419 Merge branch 'report-modal-previous' into 'develop'
do not show 'previous' button in last step

See merge request soapbox-pub/soapbox!1964
2022-11-28 16:08:36 +00:00
90cb114237 do not show 'previous' button in last step
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-28 16:56:18 +01:00
marcin mikołajczak
0d278ffc53 Merge branch 'report-modal-previous' into 'develop'
Show 'previous' button in report modal

See merge request soapbox-pub/soapbox!1961
2022-11-28 15:06:29 +00:00
Chewbacca
50f5e2af38 Merge remote-tracking branch 'origin/develop' into chats 2022-11-28 10:03:40 -05:00
4a96507cd1 Show 'previous' button in report modal
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-28 00:08:27 +01:00
Alex Gleason
ed573bfeb2
Merge remote-tracking branch 'origin/develop' into use-instance 2022-11-27 16:42:06 -06:00
9ba56a3945 Merge remote-tracking branch 'soapbox/develop' into events 2022-11-27 23:33:51 +01:00
Alex Gleason
5bb30b6282
Merge remote-tracking branch 'origin/develop' into chats 2022-11-27 15:30:00 -06:00
Alex Gleason
d61e115804 Merge branch 'profile-fields-mobile' into 'develop'
Display custom profile fields on mobile

Closes #1160

See merge request soapbox-pub/soapbox!1955
2022-11-26 22:58:28 +00:00
c61dcddd81 Events page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-26 22:15:58 +01:00
Alex Gleason
8c55af5b5e
Display custom profile fields on mobile
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1160
2022-11-26 14:36:09 -06:00
Alex Gleason
e114b1d362
Break ProfileField out into its own file 2022-11-26 14:25:22 -06:00