Your New SJW Waifu
dc852a83b5
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-29 22:07:37 -06:00
HJ
34d8893f1c
Merge branch 'fix/compat-aarch64-mac' into 'develop'
...
Newer chromedriver works on MacOS aarch64
See merge request pleroma/pleroma-fe!1318
2020-12-29 01:54:18 +00:00
Mark Felder
a36922ae1b
Newer chromedriver works on MacOS aarch64
...
469dd0a6ee
2020-12-28 13:27:13 -06:00
Shpuld Shpludson
3df84ccd5b
Merge branch 'fix/follows-followers-not-displaying' into 'develop'
...
Fix #1034 follows/followers lists not working after update
Closes #1034
See merge request pleroma/pleroma-fe!1317
2020-12-28 18:07:47 +00:00
Shpuld Shpuldson
243383852b
make with-load-more not use computeds when they don't work for it
2020-12-28 17:08:15 +02:00
Shpuld Shpludson
2312f6c15a
Merge branch 'update-changelog-2.2.2' into 'develop'
...
update develop changelog with latest release
See merge request pleroma/pleroma-fe!1316
2020-12-28 09:41:46 +00:00
Shpuld Shpuldson
f01dce99df
update changelog with latest release
2020-12-28 11:32:52 +02:00
Your New SJW Waifu
40c1c17f9f
update favicons
2020-12-18 09:08:55 -06:00
Your New SJW Waifu
35c3753cc3
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-18 09:07:23 -06:00
HJ
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
Your New SJW Waifu
122f96579e
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-17 19:18:17 -06:00
Your New SJW Waifu
85b8716a14
update favicons
2020-12-17 19:17:58 -06:00
Henry Jameson
93af7ee36a
simplified code, review
2020-12-18 01:01:58 +02:00
Shpuld Shpludson
3359d4ddf6
Merge branch 'fix/timeline-bar-clickables-offset' into 'develop'
...
Fix #923 block clicks in blank area of timeline menu, fix 'up-to-date' align
Closes #923
See merge request pleroma/pleroma-fe!1300
2020-12-16 17:57:59 +00:00
Shpuld Shpludson
a2f1ad93f5
Merge branch 'develop' into 'fix/timeline-bar-clickables-offset'
...
# Conflicts:
# CHANGELOG.md
2020-12-16 17:49:11 +00:00
Shpuld Shpludson
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
Shpuld Shpludson
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
Henry Jameson
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
Henry Jameson
81bac9f8ac
change your log
2020-12-16 18:33:54 +02:00
Henry Jameson
5cb41c7175
theme ui
2020-12-16 18:28:10 +02:00
Henry Jameson
c197756767
Basic no-wallpaper support
2020-12-16 18:25:07 +02:00
Shpuld Shpludson
34c65e3bcf
Merge branch 'fix/remote-follow-button-style' into 'develop'
...
fix remote follow button style
See merge request pleroma/pleroma-fe!1313
2020-12-16 10:14:10 +00:00
Shpuld Shpuldson
6a469963b0
fix remote follow button style
2020-12-16 12:05:13 +02:00
Your New SJW Waifu
412ab20ff3
update favicons
2020-12-15 16:28:41 -06:00
Your New SJW Waifu
f458b9ef1f
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-15 16:28:13 -06:00
Shpuld Shpludson
e8cebb568b
Merge branch 'develop' into 'fix/timeline-bar-clickables-offset'
...
# Conflicts:
# CHANGELOG.md
2020-12-15 19:54:00 +00:00
Shpuld Shpludson
22546ea813
Merge branch 'develop' into 'feat/move-external-source-button-to-extra-buttons'
...
# Conflicts:
# CHANGELOG.md
2020-12-15 19:50:59 +00:00
Shpuld Shpludson
5077549c73
Merge branch 'fix/no-emoji-in-poll-when-voting' into 'develop'
...
fix #1026 use title html for poll options before vote
Closes #1026
See merge request pleroma/pleroma-fe!1307
2020-12-15 19:49:32 +00:00
HJ
32ed09bae5
Merge branch 'prevent-textarea-resize-in-bio' into 'develop'
...
Disable horizontal textarea resize
Closes #741
See merge request pleroma/pleroma-fe!1312
2020-12-15 18:27:59 +00:00
eugenijm
6d9c79fb6d
Disable horizontal textarea resize
2020-12-15 21:18:59 +03:00
HJ
39c4672175
Merge branch 'patch-1' into 'develop'
...
Add uk.json in messages.js
See merge request pleroma/pleroma-fe!1311
2020-12-14 20:03:45 +00:00
W. W
4451ac9f7c
Add uk.json in messages.js
2020-12-14 19:52:07 +00:00
Your New SJW Waifu
6446960156
update modloader
2020-12-12 14:20:57 -06:00
Your New SJW Waifu
ed0660892a
update favicons
2020-12-12 14:15:12 -06:00
Your New SJW Waifu
1d35209db2
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-12 14:14:05 -06:00
Shpuld Shpludson
bdb994d450
Merge branch 'file-limit-info' into 'develop'
...
Display the upload limit on the Features panel
Closes #785
See merge request pleroma/pleroma-fe!1308
2020-12-12 14:39:46 +00:00
eugenijm
51e6f5e255
Display upload limit on the Features panel
2020-12-11 17:16:59 +03:00
Your New SJW Waifu
c95f71305a
update background for christmas
2020-12-09 15:32:42 -06:00
Your New SJW Waifu
b92909979a
update favicons
2020-12-09 15:19:08 -06:00
Your New SJW Waifu
1e61181aaa
add snowfall with help from @absturztaube
2020-12-09 15:17:53 -06:00
Your New SJW Waifu
122682885d
PADORU.EXE
2020-12-08 16:59:17 -06:00
Your New SJW Waifu
a55270b178
update favicons
2020-12-08 16:54:38 -06:00
Your New SJW Waifu
5dfeb792f0
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-08 16:54:12 -06:00
Shpuld Shpuldson
415119cda9
use title html for poll options before vote
2020-12-07 00:11:21 +02:00
Shpuld Shpludson
99e12091b7
Merge branch 'fix/react-button-whoops' into 'develop'
...
fix #1025 recent mistakes in react button
Closes #1025
See merge request pleroma/pleroma-fe!1306
2020-12-06 21:54:31 +00:00
Shpuld Shpuldson
83bc74de0a
fix recent mistakes in react button
2020-12-06 23:45:34 +02:00
Your New SJW Waifu
0a541a8886
it's christmas time
2020-12-05 11:16:54 -06:00
Your New SJW Waifu
0965baa26c
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-04 09:49:18 -06:00
Your New SJW Waifu
1c1aadf0e1
updaate favicons
2020-12-04 09:49:08 -06:00
HJ
674c302350
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1298
2020-12-04 14:46:53 +00:00
