Shpuld Shpludson
|
f31bc5310e
|
Merge branch 'master' into 'rc/2.1.1'
# Conflicts:
# CHANGELOG.md
|
2020-09-08 09:35:36 +00:00 |
|
Shpuld Shpuldson
|
925bf5b5a4
|
update changelog with 2.1.1
|
2020-09-08 12:30:45 +03:00 |
|
Shpuld Shpludson
|
5b7decea3d
|
Merge branch 'develop' into 'fix/autocomplete-fixes'
# Conflicts:
# CHANGELOG.md
|
2020-08-31 13:58:02 +00:00 |
|
Shpuld Shpuldson
|
ca0ce902ea
|
add changelog entry
|
2020-08-31 11:54:27 +03:00 |
|
Shpuld Shpuldson
|
4da248f8bc
|
update changelog for autocomplete fixes
|
2020-08-28 12:35:02 +03:00 |
|
Shpuld Shpuldson
|
82b872df44
|
update changelog with 2.1.0, fix Add -> Added in older releases
|
2020-08-28 12:24:48 +03:00 |
|
Shpuld Shpuldson
|
748c4d8c71
|
fix boomarks mistake in changelog
|
2020-08-27 17:13:14 +03:00 |
|
Shpuld Shpuldson
|
c0205d582a
|
add missing release to changelog to fix conflicts
|
2020-08-27 16:56:47 +03:00 |
|
Shpuld Shpuldson
|
4ac882a3b0
|
add back unreleased/patch
|
2020-08-27 16:51:16 +03:00 |
|
Shpuld Shpuldson
|
bdbc4b27b6
|
set 2.1.0 date and remove rc from changelog
|
2020-08-27 16:49:01 +03:00 |
|
Shpuld Shpuldson
|
42598fc675
|
change changelog
|
2020-08-26 14:28:43 +03:00 |
|
lain
|
0ea23a03ce
|
Merge branch 'feat/idempotency' into 'develop'
Status posting Idempotency
See merge request pleroma/pleroma-fe!1194
|
2020-07-23 13:17:44 +00:00 |
|
Shpuld Shpuldson
|
85e09d81c7
|
update changelog
|
2020-07-16 17:47:26 +03:00 |
|
Shpuld Shpuldson
|
bca77ef97f
|
update changelog
|
2020-07-16 10:50:03 +03:00 |
|
Mark Felder
|
49aaf9dc57
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-15 09:01:40 -05:00 |
|
Shpuld Shpuldson
|
97a01b057d
|
mention removed options in changelog
|
2020-07-14 15:35:39 +03:00 |
|
Mark Felder
|
da94935aaa
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-13 13:25:23 -05:00 |
|
Shpuld Shpludson
|
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 |
|
Shpuld Shpuldson
|
e3991db5c4
|
fix conflicts and add error handling to media descriptions
|
2020-07-07 10:01:37 +03:00 |
|
Shpuld Shpuldson
|
87b5f828d7
|
fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts
|
2020-07-06 14:01:03 +03:00 |
|
Shpuld Shpuldson
|
afdc3f96f0
|
fix conflicts, make subject update the preview
|
2020-07-06 10:45:47 +03:00 |
|
Shpuld Shpludson
|
af4a26b588
|
Merge branch 'feat/allow-use-without-cookies' into 'develop'
Fix #815: Allow use without cookies, Add a global notice popup system
Closes #815
See merge request pleroma/pleroma-fe!1166
|
2020-07-05 06:53:29 +00:00 |
|
Shpuld Shpludson
|
acc3b083aa
|
Merge branch 'feat/parent-visible-support' into 'develop'
#874 Add strike-through to "Reply to" when parent_visible is set to false
See merge request pleroma/pleroma-fe!1162
|
2020-07-05 06:15:35 +00:00 |
|
Eugenij
|
de291e2e33
|
Add bookmarks
Co-authored-by: jared <jaredrmain@gmail.com>
|
2020-07-03 19:45:49 +00:00 |
|
Shpuld Shpludson
|
c0fb35b106
|
Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'
# Conflicts:
# CHANGELOG.md
|
2020-07-02 04:50:03 +00:00 |
|
Shpuld Shpuldson
|
43b7a5d9b3
|
update the message and changelog
|
2020-07-01 19:22:39 +03:00 |
|
Shpuld Shpuldson
|
ea09bbecf8
|
Make use of backend reply filtering
|
2020-06-30 17:02:38 +03:00 |
|
Shpuld Shpuldson
|
3a79918b89
|
update changelog for reply-to strikethrough
|
2020-06-30 15:23:47 +03:00 |
|
Shpuld Shpuldson
|
a09709f71d
|
update changelog with media-descriptions and the fixes
|
2020-06-29 15:37:46 +03:00 |
|
Shpuld Shpuldson
|
0287d5c07e
|
update changelog with status previews
|
2020-06-28 13:29:07 +03:00 |
|
Shpuld Shpuldson
|
3113d904b9
|
update changelog with profile fields
|
2020-06-27 10:34:28 +03:00 |
|
Mark Felder
|
199fc9351d
|
Merge branch 'develop' into refactor/notification_settings
|
2020-06-25 15:28:17 -05:00 |
|
Sergey Suprunenko
|
c04f8b2ccb
|
Show a 'bot' badge on the service account page
|
2020-06-21 15:06:07 +02:00 |
|
lain
|
1afa0f0044
|
Merge branch 'notification-unification-experiments' into 'develop'
Notification unification / WebPush i18n.
See merge request pleroma/pleroma-fe!1142
|
2020-06-19 13:34:04 +00:00 |
|
lain
|
ed908e0195
|
Changelog: Add info about push notifications.
|
2020-06-19 15:25:57 +02:00 |
|
Shpuld Shpludson
|
6343ee929c
|
Merge branch '589-poll-options' into 'develop'
Polls: Construct an html field during normalization.
Closes #589
See merge request pleroma/pleroma-fe!1146
|
2020-06-18 13:33:00 +00:00 |
|
Shpuld Shpuldson
|
abbad84b00
|
update changelog
|
2020-06-18 12:56:22 +03:00 |
|
Shpuld Shpludson
|
84a69f9502
|
Merge branch 'develop' into 'fix/popovers-cutting-off-in-notifications'
# Conflicts:
# CHANGELOG.md
|
2020-06-16 14:51:12 +00:00 |
|
Shpuld Shpuldson
|
c18a8ab308
|
update changelog
|
2020-06-16 17:35:12 +03:00 |
|
Shpuld Shpuldson
|
fc6ca20a42
|
disable subject field when posting
|
2020-06-16 17:34:22 +03:00 |
|
lain
|
8427c5a067
|
Changelog: Add info about poll option emoji.
|
2020-06-15 09:59:39 +02:00 |
|
Henry Jameson
|
c0a4752bd5
|
changelog
|
2020-06-14 16:14:32 +03:00 |
|
Shpuld Shpludson
|
4e3ce18703
|
Merge branch 'feature/autocomplete-domain-mutes' into 'develop'
Autocomplete domain mutes from list of known instances
Closes #824
See merge request pleroma/pleroma-fe!1103
|
2020-06-10 11:18:30 +00:00 |
|
Shpuld Shpuldson
|
855b8d4dad
|
fix conflict
|
2020-06-10 11:52:46 +03:00 |
|
Shpuld Shpuldson
|
1308fdd3bc
|
update changelog
|
2020-06-10 11:29:28 +03:00 |
|
Henry Jameson
|
cad42eec2a
|
changelog
|
2020-06-10 11:20:40 +03:00 |
|
lain
|
d8211392c4
|
Apply suggestion to CHANGELOG.md
|
2020-06-08 17:24:08 +00:00 |
|
lain
|
d5ec269d88
|
Update changelog.
|
2020-06-08 19:14:13 +02:00 |
|
Sergey Suprunenko
|
1007039478
|
Autocomplete domain mutes from list of known instances
|
2020-06-08 13:17:18 +02:00 |
|
HJ
|
e47d0f2103
|
Merge branch 'fix-reprooted-muted-posts' into 'develop'
Fixed some issues with muting
See merge request pleroma/pleroma-fe!1120
|
2020-06-06 20:31:43 +00:00 |
|