179af131ee
Fix changelog merge conflict
...
# Conflicts:
# CHANGELOG.md
2021-07-22 20:46:41 +00:00
Shpuld Shpludson
891611816c
Merge branch 'editProfile' into 'develop'
...
Minor change: Add edit profile button onto self user card
See merge request pleroma/pleroma-fe!1398
2021-07-19 16:35:28 +00:00
6125dc885a
Update for latest develop merges to CHANGELOG
2021-06-20 21:06:59 +00:00
cd9dd352e3
Fix follow request count position on mobile
2021-06-20 06:27:32 +00:00
b2ebfc1fd6
Merge branch 'develop' into 'editProfile'
...
# Conflicts:
# CHANGELOG.md
2021-06-17 19:35:09 +00:00
e1361a1cae
Add edit profile button
2021-06-17 19:29:58 +00:00
cab0095989
Merge branch 'develop' into 'showMobileNewPost'
...
# Conflicts:
# CHANGELOG.md
# src/App.js
2021-06-15 21:49:33 +00:00
1fcccd7570
Update CHANGELOG.md
2021-06-14 19:43:47 +00:00
adfe56a3a3
New option: Always show floating New Post button
2021-06-14 17:54:40 +00:00
7341b8a551
Implement right sidebar option as user option
2021-05-26 22:22:55 +00:00
Shpuld Shpludson
d57ee274de
Merge branch 'feat/notification-quick-filters' into 'develop'
...
Add quick filters for notifications
See merge request pleroma/pleroma-fe!1364
2021-03-17 08:17:23 +00:00
Shpuld Shpludson
a00212a3bb
Merge branch 'websocket-fixes' into 'develop'
...
Various websocket fixes
See merge request pleroma/pleroma-fe!1326
2021-03-15 09:45:38 +00:00
Shpuld Shpuldson
c682c1730f
fix changelog
2021-03-15 11:05:00 +02:00
Shpuld Shpuldson
19fc7dda9e
merge conflict, use v-slot:trigger, fix popover svg dimensions bug
2021-03-15 11:02:16 +02:00
Shpuld Shpludson
184364c7e0
Merge branch 'feat/timeline-menu-in-navpanel' into 'develop'
...
Add timeline menu toggle to nav panel
See merge request pleroma/pleroma-fe!1352
2021-03-15 07:03:22 +00:00
Shpuld Shpludson
0475e1c61c
Update CHANGELOG.md
2021-03-09 09:45:28 +00:00
Shpuld Shpludson
088683538d
Update CHANGELOG.md
2021-03-09 09:45:14 +00:00
Shpuld Shpludson
badb2196a2
Merge branch 'develop' into 'feat/notification-quick-filters'
...
# Conflicts:
# CHANGELOG.md
2021-03-09 09:43:01 +00:00
Henry Jameson
2e7bd99444
Merge remote-tracking branch 'origin/develop' into websocket-fixes
...
* origin/develop: (119 commits)
Apply 1 suggestion(s) to 1 file(s)
Make it possible to localize user highlight options
remove shoutbox test hacks
fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack
update changelog with 2.3.0
change icons around
Translated using Weblate (Japanese)
Update timeline_quick_settings.js
add screen_name_ui to tests
separate screen_name and screen_name_ui with decoded punycode
Update CHANGELOG.md
add basic validation for statusless status notifications
changelog mention
fix chat unread badge
update shelljs to get rid of warnings on build
save a few characters
focus input in emoji picker and react picker
fix vue warnings
add only to wording
basic loggedin check for reply filtering
...
2021-03-08 22:01:28 +02:00
Shpuld Shpuldson
d1ab424ebc
update changelog with 2.3.0
2021-03-02 09:53:17 +02:00
Shpuld Shpuldson
11a036d6d6
changelog
2021-03-01 16:27:24 +02:00
Shpuld Shpludson
91f93d4a55
Merge branch 'develop' into 'feat/timeline-quick-settings'
...
# Conflicts:
# CHANGELOG.md
2021-02-28 15:37:39 +00:00
Shpuld Shpludson
b4782ad159
Merge branch 'feat/sensitive-by-default' into 'develop'
...
close #1054 add sensitive by default option
Closes #1054
See merge request pleroma/pleroma-fe!1354
2021-02-27 18:31:13 +00:00
Shpuld Shpludson
92a9ce67c5
Update CHANGELOG.md
2021-02-27 18:23:11 +00:00
Shpuld Shpludson
237f272d15
Merge branch 'develop' into 'fix/punycode-buggy'
...
# Conflicts:
# CHANGELOG.md
2021-02-27 18:03:49 +00:00
Shpuld Shpuldson
09fe160e8b
separate screen_name and screen_name_ui with decoded punycode
2021-02-26 16:23:11 +02:00
Shpuld Shpludson
7c37f495f6
Update CHANGELOG.md
2021-02-26 12:36:58 +00:00
Shpuld Shpuldson
cd2f5ced31
add basic validation for statusless status notifications
2021-02-26 14:27:25 +02:00
Shpuld Shpludson
59db4582b0
Merge branch 'feat/focus-input-with-emoji-pickers' into 'develop'
...
close #1048 : Focus input in emoji picker and react picker
Closes #1048
See merge request pleroma/pleroma-fe!1357
2021-02-26 11:13:33 +00:00
Shpuld Shpuldson
2e7529cf50
changelog mention
2021-02-26 11:03:26 +02:00
Shpuld Shpuldson
34d18ac0c4
focus input in emoji picker and react picker
2021-02-25 17:27:29 +02:00
Shpuld Shpuldson
51a78e8b8a
add a quick settings menu for timeline headers
2021-02-25 10:56:16 +02:00
Shpuld Shpuldson
29dae3c12e
update changelog
2021-02-23 10:03:29 +02:00
Shpuld Shpuldson
485f4b899c
changelog conflict
2021-02-22 18:11:27 +02:00
Shpuld Shpuldson
e14b9ddc02
changelog conflict fix
2021-02-22 18:00:02 +02:00
Shpuld Shpludson
3d013630ae
Merge branch 'fix/scroll-lock-jumpiness' into 'develop'
...
Fix some UI jumpiness on scroll lock
See merge request pleroma/pleroma-fe!1343
2021-02-22 15:14:23 +00:00
Shpuld Shpludson
589ab6510c
Merge branch 'feat/keep-chat-perf-up' into 'develop'
...
Optimize chat perf in long run
See merge request pleroma/pleroma-fe!1350
2021-02-22 15:01:05 +00:00
Shpuld Shpuldson
2f60c6a821
fix redline again
2021-02-22 16:44:12 +02:00
Shpuld Shpuldson
98cb9abac7
Add timeline menu toggle to nav panel
2021-02-22 16:24:04 +02:00
Shpuld Shpuldson
ee1cf36d52
update changelog
2021-02-17 10:54:14 +02:00
Shpuld Shpuldson
23a5c601a7
changelog
2021-02-15 11:35:14 +02:00
Shpuld Shpludson
7f3fd9ca21
Merge branch 'multi-choice-poll-wording' into 'develop'
...
Display 'people voted' instead of 'votes' for multi-answers polls
Closes #993
See merge request pleroma/pleroma-fe!1341
2021-02-12 19:15:42 +00:00
Shpuld Shpuldson
c7018057f1
changelog
2021-02-12 18:49:57 +02:00
Shpuld Shpludson
8b7c367b04
Merge branch 'staff-grouping' into 'develop'
...
Group staff by role in the About page
Closes #737
See merge request pleroma/pleroma-fe!1309
2021-02-12 08:05:55 +00:00
eugenijm
1506b97e35
Display 'people voted' instead of 'votes' for multi-choice polls
2021-02-09 16:36:45 +03:00
Shpuld Shpuldson
9cf487497e
fix wrong route in side drawer shoutbox link
2021-01-25 18:49:03 +02:00
Shpuld Shpuldson
daa9f211a6
Merge branch 'develop' into fix/convert-more-hyperlinks-to-buttons
2021-01-22 12:04:58 +02:00
Shpuld Shpludson
0358284ebf
Merge branch 'feat/language-picker-native-names' into 'develop'
...
Use native language names in the language picker
See merge request pleroma/pleroma-fe!1302
2021-01-21 13:41:36 +00:00
rinpatch
11c7355749
Use native language names in the language picker
...
This seems more intuitive to me and is what I've seen in most other
language pickers.
2021-01-21 14:24:16 +03:00
Shpuld Shpuldson
02ab803725
change a few more buttons to real buttons
2021-01-20 17:36:40 +02:00