35c3753cc3
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-18 09:07:23 -06:00
8d9bf3efc8
Merge branch 'plain-bg' into 'develop'
...
Solid color wallpaper support
See merge request pleroma/pleroma-fe!1314
2020-12-18 08:37:01 +00:00
122f96579e
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-17 19:18:17 -06:00
10399c193a
Merge branch 'feat/move-external-source-button-to-extra-buttons' into 'develop'
...
Move external source link to extra buttons, expand the expand button
See merge request pleroma/pleroma-fe!1303
2020-12-16 17:46:15 +00:00
466fc84e82
Merge branch 'fix/fix-error-handling-in-profile-tab' into 'develop'
...
fix #1020 fix error handling in profile tab
Closes #1020
See merge request pleroma/pleroma-fe!1299
2020-12-16 16:51:03 +00:00
0cf06cb9ec
Merge remote-tracking branch 'origin/develop' into plain-bg
...
* origin/develop:
fix remote follow button style
Disable horizontal textarea resize
Add uk.json in messages.js
Display upload limit on the Features panel
use title html for poll options before vote
fix recent mistakes in react button
2020-12-16 18:43:38 +02:00
5cb41c7175
theme ui
2020-12-16 18:28:10 +02:00
c197756767
Basic no-wallpaper support
2020-12-16 18:25:07 +02:00
22546ea813
Merge branch 'develop' into 'feat/move-external-source-button-to-extra-buttons'
...
# Conflicts:
# CHANGELOG.md
2020-12-15 19:50:59 +00:00
1d35209db2
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-12 14:14:05 -06:00
51e6f5e255
Display upload limit on the Features panel
2020-12-11 17:16:59 +03:00
46320090e3
move external source button to extra buttons, make expand button easier to click and highlight on hover
2020-12-03 11:57:17 +02:00
4dde9c4d52
refactor error handling in profile tab
2020-12-02 12:46:31 +02:00
92728dd8ec
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-11-20 15:50:47 -06:00
838cbd8715
Merge branch 'nsfw-link-preview' into 'develop'
...
Click-to-reveal cover for link previews in NSFW posts
Closes #973
See merge request pleroma/pleroma-fe!1287
2020-11-20 07:54:26 +00:00
313d2d34a6
new default text
2020-11-19 21:03:17 -06:00
4b1b9cacc6
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-11-19 21:01:48 -06:00
45180d4069
Added the NSFW alert to the link preview.
2020-11-19 20:08:56 +03:00
1d2ba946b6
make notifications also use the popup errors, remove all error from status/notif state
2020-11-10 14:28:10 +02:00
d150dae5d1
fixes to timeline error handling
2020-11-10 12:52:54 +02:00
1d28afbaf6
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-10-12 09:22:31 -05:00
671186c73c
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-10-05 14:31:54 -05:00
8a34ff2957
Merge branch 'develop' into 'feat/masto-ws-deletes'
...
# Conflicts:
# CHANGELOG.md
# src/components/status/status.js
# src/components/status/status.scss
2020-10-01 12:54:54 +00:00
91778a0276
Merge branch 'feat/custom-virtual-scrolling' into 'develop'
...
Timeline virtual scrolling
See merge request pleroma/pleroma-fe!1043
2020-09-29 10:18:37 +00:00
f174f289a9
Timeline virtual scrolling
2020-09-29 10:18:37 +00:00
3dbc1bedbf
Merge branch 'develop' into feature/import_export_mutes
2020-09-18 22:04:01 +03:00
08d6fee1e7
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-09-17 16:31:48 -05:00
1b811d8b93
change side drawer to use shoutbox name
2020-09-16 11:29:10 +03:00
947d7cd6f2
added import/export mutes
2020-09-08 09:41:42 +03:00
0758569625
change i18n phrasing
2020-09-07 10:39:30 +03:00
40ca0b394e
add basic deletes support that works with masto WS
2020-09-06 15:28:09 +03:00
5aee3b2bd1
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-09-03 20:39:15 -05:00
5809f33c86
Password reset no longer informs user of errors or account existence
2020-09-01 16:48:51 -05:00
5d1fe9c282
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-08-06 23:39:52 -05:00
3e6e6096bf
Merge branch 'feat/separate-timeline-navigation-from-navpanel' into 'develop'
...
Separate timeline navigation from navpanel
See merge request pleroma/pleroma-fe!1172
2020-08-06 10:17:44 +00:00
150fe52a66
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-07-26 11:17:56 -05:00
96929d9930
ChatPanel: Rename `chat` to `shoutbox`.
...
To remove confusion with the new ChatMessages.
2020-07-23 17:31:35 +02:00
23f9ad5cfa
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-07-16 16:17:19 -05:00
149941828f
Improve layout of the Notifications Filters section
2020-07-15 09:56:46 -05:00
49aaf9dc57
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:01:40 -05:00
89d1fb5cf4
remove remaining autoload i18n
2020-07-14 15:15:02 +03:00
b8c1b25397
remove most of reply preview and autoload related stuff
2020-07-14 15:08:04 +03:00
cac1418aff
fix merge conflicts
2020-07-14 11:44:06 +03:00
da94935aaa
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:25:23 -05:00
646a4f6d50
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-07-12 12:47:52 -05:00
4a6300bbee
add simple You: to chat list last message
2020-07-12 11:11:12 +03:00
18a1f5d62a
Add the empty chat list placeholder.
...
Do not use full height when displaying the chat list.
Remove an unsued chat action.
2020-07-08 15:21:31 +03:00
aa2cf51c05
Add Chats
2020-07-08 15:21:31 +03:00
a65daa3685
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-07-08 05:45:46 -05:00
eea002e6f5
streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff
2020-07-08 10:11:17 +00:00
Your New SJW Waifu
HJ
Shpuld Shpludson
Henry Jameson
eugenijm
Maksim Pechnikov
Mark Felder
lain