b225c3578f
Merge branch 'rc/2.1.2' into 'master'
...
Merge 2.1.2 to MASTER
See merge request pleroma/pleroma-fe!1236
2020-09-17 17:26:22 +00:00
30efbaab34
Merge branch 'master' into 'rc/2.1.2'
...
# Conflicts:
# CHANGELOG.md
2020-09-17 17:17:21 +00:00
8ca0586c0f
update changelog for 2.1.2
2020-09-17 20:15:08 +03:00
ee620f6028
Merge branch 'fix/use-shoutbox-name-in-sidedrawer' into 'develop'
...
change side drawer to use shoutbox name - fix #956
Closes #956
See merge request pleroma/pleroma-fe!1235
2020-09-16 09:22:05 +00:00
20d33c2fbc
change icon to a megaphone
2020-09-16 11:53:54 +03:00
1b811d8b93
change side drawer to use shoutbox name
2020-09-16 11:29:10 +03:00
d6fe4f6a4f
update changelog
2020-09-16 10:27:31 +03:00
38189ee838
Merge branch 'fix-chat-message-list-fetch' into 'develop'
...
Fix chat messages being missed sometimes when the streaming is disabled and the messages are sent by both participants simultaneously
Closes #957
See merge request pleroma/pleroma-fe!1233
2020-09-16 07:13:31 +00:00
c00c20a31f
Merge branch 'fix-chat-list-order' into 'develop'
...
Fix the chat list order update
Closes #955
See merge request pleroma/pleroma-fe!1234
2020-09-16 06:59:04 +00:00
8c4514013d
Fix chat messages being missed when the streaming is disabled and the messages are sent by both participants simultaneously
2020-09-16 09:21:24 +03:00
92caaa2d7f
Fix the chat list order and last message timestamp updates
2020-09-16 05:10:09 +03:00
679a1f5e1c
Merge branch 'fix/fix-vue-errors' into 'develop'
...
fix vue warnings and errors
See merge request pleroma/pleroma-fe!1230
2020-09-09 10:21:54 +00:00
afb2241a5b
change a eslint disable to nextline only
2020-09-08 16:29:10 +03:00
938887ef91
Merge branch 'rc/2.1.1' into 'master'
...
Update master with 2.1.1
See merge request pleroma/pleroma-fe!1231
2020-09-08 09:46:19 +00:00
f31bc5310e
Merge branch 'master' into 'rc/2.1.1'
...
# Conflicts:
# CHANGELOG.md
2020-09-08 09:35:36 +00:00
925bf5b5a4
update changelog with 2.1.1
2020-09-08 12:30:45 +03:00
8975589bca
fix vue warnings and errors
2020-09-08 10:44:08 +03:00
da63894072
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1226
2020-09-07 08:11:54 +00:00
26c42484f0
Translated using Weblate (Basque)
...
Currently translated at 77.4% (513 of 662 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2020-09-07 08:01:49 +00:00
002cd61353
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (662 of 662 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2020-09-07 08:01:49 +00:00
a0aa45d328
Translated using Weblate (Spanish)
...
Currently translated at 83.2% (551 of 662 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2020-09-07 08:01:48 +00:00
31a9da05ff
Translated using Weblate (Spanish)
...
Currently translated at 83.2% (551 of 662 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2020-09-07 08:01:48 +00:00
8a0f280cd8
Merge branch 'chat-desktop-notifications-fix' into 'develop'
...
Do not show desktop notifications for your own chat messages
Closes #951
See merge request pleroma/pleroma-fe!1225
2020-09-07 08:01:06 +00:00
b8afdb4c02
Do not show desktop notifications for your own chat messages
2020-09-04 23:11:10 +03:00
a73b09c732
Merge branch 'fix/locked-account-link-fix' into 'develop'
...
Open profile tab from 'locked' link in FO-post warning - Fix #945
Closes #945
See merge request pleroma/pleroma-fe!1223
2020-09-04 08:11:31 +00:00
4adccf2216
Merge branch 'fix/autocomplete-fixes' into 'develop'
...
Rewrite word split for autocomplete, fix #930 fix #681
Closes #681 and #930
See merge request pleroma/pleroma-fe!1218
2020-09-03 14:08:36 +00:00
f281663b49
Add hacky functionality to open specific settings tabs
2020-09-03 15:45:13 +03:00
02ea173947
Merge branch 'fix/password-reset-behavior' into 'develop'
...
Password reset no longer informs user of errors or account existence
See merge request pleroma/pleroma-fe!1221
2020-09-02 14:18:35 +00:00
5809f33c86
Password reset no longer informs user of errors or account existence
2020-09-01 16:48:51 -05:00
5b7decea3d
Merge branch 'develop' into 'fix/autocomplete-fixes'
...
# Conflicts:
# CHANGELOG.md
2020-08-31 13:58:02 +00:00
acc45b49a5
Merge branch 'fix/hide-polls-in-collapsed-posts' into 'develop'
...
hide poll when subject collapsed, fix #683
Closes #683
See merge request pleroma/pleroma-fe!1220
2020-08-31 12:30:29 +00:00
ca0ce902ea
add changelog entry
2020-08-31 11:54:27 +03:00
b5d15eddcf
hide poll when subject collapsed, but show poll icon
2020-08-31 11:50:26 +03:00
4da248f8bc
update changelog for autocomplete fixes
2020-08-28 12:35:02 +03:00
c01a3720ac
Merge branch 'develop' into fix/autocomplete-fixes
2020-08-28 12:34:20 +03:00
39f8587171
Merge branch 'chore/fix-changelog' into 'develop'
...
Chore/fix-changelog
See merge request pleroma/pleroma-fe!1219
2020-08-28 09:33:45 +00:00
82b872df44
update changelog with 2.1.0, fix Add -> Added in older releases
2020-08-28 12:24:48 +03:00
0347d79bda
Rewrite word split imperatively for control
2020-08-28 12:02:52 +03:00
e768ec1fca
Merge branch '2.1.0-rc0' into 'master'
...
2.1.0 into master
See merge request pleroma/pleroma-fe!1217
2020-08-27 14:45:03 +00:00
d09f43ba7a
Merge branch '2.1.0-rc0' of git.pleroma.social:pleroma/pleroma-fe into 2.1.0-rc0
2020-08-27 17:13:43 +03:00
748c4d8c71
fix boomarks mistake in changelog
2020-08-27 17:13:14 +03:00
c7ddfefe34
Merge branch 'master' into '2.1.0-rc0'
...
# Conflicts:
# CHANGELOG.md
# src/services/api/api.service.js
2020-08-27 13:59:56 +00:00
c0205d582a
add missing release to changelog to fix conflicts
2020-08-27 16:56:47 +03:00
4ac882a3b0
add back unreleased/patch
2020-08-27 16:51:16 +03:00
bdbc4b27b6
set 2.1.0 date and remove rc from changelog
2020-08-27 16:49:01 +03:00
f5e4ad601a
wip start
2020-08-27 16:46:23 +03:00
42598fc675
change changelog
2020-08-26 14:28:43 +03:00
65ac71139e
Merge branch 'fix/long-poll-words' into 'develop'
...
fix long poll labels overflowing
See merge request pleroma/pleroma-fe!1216
2020-08-25 09:32:11 +00:00
c9ea2db69d
fix long poll labels overflowing
2020-08-25 12:17:42 +03:00
ff328e7c55
Merge branch 'fix/user-card-avatar-too-small' into 'develop'
...
Fix some Avatar related css bugs
See merge request pleroma/pleroma-fe!1215
2020-08-25 08:50:28 +00:00
Shpuld Shpludson
lain
eugenijm
tarteka
Anonymous
Mark Felder
HJ