Shpuld Shpuldson
|
150516df4e
|
Merge branch 'xenofem/pleroma-fe-rebased-image-description-authoring' of git.pleroma.social:pleroma/pleroma-fe into xenofem/pleroma-fe-rebased-image-description-authoring
|
2020-07-02 14:31:07 +03:00 |
|
Shpuld Shpuldson
|
b8ed904c0c
|
change px to em
|
2020-07-02 14:28:35 +03: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
|
38d8526660
|
change Show New text to Reload when flushing
|
2020-06-30 17:37:36 +03:00 |
|
Shpuld Shpuldson
|
ea09bbecf8
|
Make use of backend reply filtering
|
2020-06-30 17:02:38 +03:00 |
|
Shpuld Shpuldson
|
0ca3a6e63d
|
fix gallery-videos being weirdly offset
|
2020-06-30 11:02:10 +03:00 |
|
Shpuld Shpuldson
|
79011e02ef
|
Merge branch 'develop' into xenofem/pleroma-fe-rebased-image-description-authoring
|
2020-06-29 15:19:41 +03:00 |
|
Shpuld Shpuldson
|
8c2335f84f
|
conflict whem merging xenofem changes
|
2020-06-29 15:03:51 +03:00 |
|
Shpuld Shpuldson
|
96d2c86d3b
|
change placeholders to use descriptions, use icons with placeholders, change uploads to use attachment component
|
2020-06-29 14:48:22 +03:00 |
|
lain
|
82944f862d
|
Merge branch '812-subject-separation' into 'develop'
StatusContent: Better separate subject from status content.
Closes #812
See merge request pleroma/pleroma-fe!1150
|
2020-06-29 07:53:12 +00:00 |
|
xenofem
|
529d72c297
|
suppress enter key on media description input field
|
2020-06-28 16:05:22 -04:00 |
|
xenofem
|
03aa1f3154
|
fix vue style warnings
|
2020-06-28 02:31:57 -04:00 |
|
xenofem
|
1ff55e17b1
|
fix invalid end tag on input element
|
2020-06-28 02:16:58 -04:00 |
|
William Pitcock
|
2c6ec37e6a
|
media description support
|
2020-06-28 02:10:06 -04:00 |
|
Shpuld Shpludson
|
ea0a12f604
|
Merge branch 'develop' into 'iss-149/profile-fields-setting'
# Conflicts:
# src/components/settings_modal/tabs/profile_tab.vue
|
2020-06-27 07:19:49 +00:00 |
|
Shpuld Shpuldson
|
8c3106c588
|
Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used
|
2020-06-26 18:20:32 +03:00 |
|
Shpuld Shpuldson
|
44edb730c1
|
rip restyle subject, fix some issues with long subject
|
2020-06-26 14:07:39 +03:00 |
|
Sergey Suprunenko
|
2b6d16900b
|
Use more correct class name for user badges
|
2020-06-21 15:36:20 +02:00 |
|
Sergey Suprunenko
|
c04f8b2ccb
|
Show a 'bot' badge on the service account page
|
2020-06-21 15:06:07 +02:00 |
|
Sergey Suprunenko
|
2451956d83
|
Add 'bot' flag to Profile settings
|
2020-06-21 14:59:05 +02:00 |
|
Henry Jameson
|
5aa65e32ef
|
fix huge emoji in usernames
|
2020-06-19 16:09:44 +03:00 |
|
kPherox
|
bad3dacfac
|
implement user suggestor for profile fields
|
2020-06-19 21:18:36 +09:00 |
|
kPherox
|
fd2157efe4
|
Fix emoji input error
|
2020-06-19 20:51:53 +09:00 |
|
lain
|
4da0a0c0bf
|
StatusContent: Fix greentext.
|
2020-06-19 12:49:42 +02:00 |
|
lain
|
a79bad5cdb
|
StatusContent: Better separate subject from status content.
|
2020-06-19 12:46:48 +02:00 |
|
Shpuld Shpludson
|
95f5c7fff6
|
Merge branch 'iss-149/profile-fields-display' into 'develop'
Display profile fields
See merge request pleroma/pleroma-fe!1004
|
2020-06-19 08:04:54 +00: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 |
|
lain
|
b0b33be9dd
|
Poll, StatusContent: Move emoji css to status body.
|
2020-06-18 14:41:40 +02:00 |
|
kPherox
|
eed58a7b97
|
fix width of long field value
|
2020-06-18 20:13:44 +09:00 |
|
kPherox
|
bb513dd961
|
change key-value to look like one
|
2020-06-18 20:08:00 +09:00 |
|
Shpuld Shpuldson
|
f1175b4e9b
|
revert import style
|
2020-06-18 13:41:04 +03:00 |
|
Shpuld Shpuldson
|
9c884fef11
|
remove search blocker, fix debounce params
|
2020-06-18 12:29:13 +03:00 |
|
Shpuld Shpuldson
|
632f62ee0f
|
resume the previous emoji size for now
|
2020-06-17 18:34:24 +03:00 |
|
Shpuld Shpuldson
|
580fcd3ad9
|
restyle the fields
|
2020-06-17 18:26:06 +03:00 |
|
Shpuld Shpuldson
|
f8cf92a01f
|
Merge branch 'develop' into kPherox/pleroma-fe-iss-149/profile-fields-display
|
2020-06-17 11:23:32 +03:00 |
|
Shpuld Shpludson
|
24e47eb604
|
Update popover.js
|
2020-06-16 15:12:44 +00: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
|
fc6ca20a42
|
disable subject field when posting
|
2020-06-16 17:34:22 +03:00 |
|
Shpuld Shpuldson
|
5a8a428c15
|
remove log whoops
|
2020-06-16 17:30:56 +03:00 |
|
Shpuld Shpuldson
|
5cf1574fdb
|
fix popovers cutting off in notifications, port popover changes from chats mr
|
2020-06-16 17:20:36 +03:00 |
|
lain
|
d41c9a717c
|
Polls: Construct an html field during normalization.
|
2020-06-14 13:16:08 +02:00 |
|
Henry Jameson
|
ac270d7060
|
fix #866
|
2020-06-13 14:42:53 +03:00 |
|
Henry Jameson
|
8cd5041663
|
add support for defining the greentext
|
2020-06-13 13:25:56 +03:00 |
|
Henry Jameson
|
c13d5b4f1b
|
Fix faint links in notifications
|
2020-06-13 13:09:55 +03:00 |
|
Shpuld Shpuldson
|
14348d8ddf
|
fix the contain option
|
2020-06-11 14:27:36 +03:00 |
|
Shpuld Shpuldson
|
2b6a6fe7ea
|
make object-fit cover work like it should
|
2020-06-11 13:44: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
|
ea2b2a35bb
|
add fade-in fade-out
|
2020-06-10 12:41:02 +03:00 |
|
Shpuld Shpuldson
|
855b8d4dad
|
fix conflict
|
2020-06-10 11:52:46 +03:00 |
|
Shpuld Shpuldson
|
d3187720c5
|
remove useless captures
|
2020-06-10 11:49:04 +03:00 |
|