eugenijm
1506b97e35
Display 'people voted' instead of 'votes' for multi-choice polls
2021-02-09 16:36:45 +03:00
Henry Jameson
8958f386be
Merge remote-tracking branch 'origin/develop' into settings-changed
...
* origin/develop: (306 commits)
fallback if shadows aren't defined
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Ukrainian)
Translated using Weblate (Italian)
Translated using Weblate (Ukrainian)
Translated using Weblate (Portuguese)
Translated using Weblate (Italian)
Translated using Weblate (Russian)
Translated using Weblate (Portuguese)
Translated using Weblate (Russian)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
...
2021-02-01 19:39:57 +02:00
rinpatch
b76a68e622
UserCard: Make user roles translateable
...
I did not add a translation for my native language in this patch because
I am not sure how weblate would react, but I did add it locally and it
seems to work.
2021-01-20 14:04:00 +03:00
Henry Jameson
64fa662644
added notices for ws events
2021-01-13 21:32:25 +02:00
eugenijm
481c71517e
Group staff members by role in the About page
2020-12-18 13:41:37 +03: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
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
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
22546ea813
Merge branch 'develop' into 'feat/move-external-source-button-to-extra-buttons'
...
# Conflicts:
# CHANGELOG.md
2020-12-15 19:50:59 +00:00
eugenijm
51e6f5e255
Display upload limit on the Features panel
2020-12-11 17:16:59 +03:00
Shpuld Shpuldson
46320090e3
move external source button to extra buttons, make expand button easier to click and highlight on hover
2020-12-03 11:57:17 +02:00
Shpuld Shpuldson
4dde9c4d52
refactor error handling in profile tab
2020-12-02 12:46:31 +02:00
Shpuld Shpludson
838cbd8715
Merge branch 'nsfw-link-preview' into 'develop'
...
Click-to-reveal cover for link previews in NSFW posts
Closes #973
See merge request pleroma/pleroma-fe!1287
2020-11-20 07:54:26 +00:00
eugenijm
45180d4069
Added the NSFW alert to the link preview.
2020-11-19 20:08:56 +03:00
Shpuld Shpuldson
1d2ba946b6
make notifications also use the popup errors, remove all error from status/notif state
2020-11-10 14:28:10 +02:00
Shpuld Shpuldson
d150dae5d1
fixes to timeline error handling
2020-11-10 12:52:54 +02:00
Henry Jameson
e695506c51
proper modified icon + popup
2020-10-17 22:28:49 +03:00
Shpuld Shpludson
8a34ff2957
Merge branch 'develop' into 'feat/masto-ws-deletes'
...
# Conflicts:
# CHANGELOG.md
# src/components/status/status.js
# src/components/status/status.scss
2020-10-01 12:54:54 +00:00
Shpuld Shpludson
91778a0276
Merge branch 'feat/custom-virtual-scrolling' into 'develop'
...
Timeline virtual scrolling
See merge request pleroma/pleroma-fe!1043
2020-09-29 10:18:37 +00:00
Shpuld Shpludson
f174f289a9
Timeline virtual scrolling
2020-09-29 10:18:37 +00:00
Maksim Pechnikov
3dbc1bedbf
Merge branch 'develop' into feature/import_export_mutes
2020-09-18 22:04:01 +03:00
Shpuld Shpuldson
1b811d8b93
change side drawer to use shoutbox name
2020-09-16 11:29:10 +03:00
Maksim Pechnikov
947d7cd6f2
added import/export mutes
2020-09-08 09:41:42 +03:00
Shpuld Shpuldson
0758569625
change i18n phrasing
2020-09-07 10:39:30 +03:00
Shpuld Shpuldson
40ca0b394e
add basic deletes support that works with masto WS
2020-09-06 15:28:09 +03:00
Mark Felder
5809f33c86
Password reset no longer informs user of errors or account existence
2020-09-01 16:48:51 -05:00
lain
3e6e6096bf
Merge branch 'feat/separate-timeline-navigation-from-navpanel' into 'develop'
...
Separate timeline navigation from navpanel
See merge request pleroma/pleroma-fe!1172
2020-08-06 10:17:44 +00:00
Lain Soykaf
96929d9930
ChatPanel: Rename chat
to shoutbox
.
...
To remove confusion with the new ChatMessages.
2020-07-23 17:31:35 +02:00
Mark Felder
149941828f
Improve layout of the Notifications Filters section
2020-07-15 09:56:46 -05:00
Mark Felder
49aaf9dc57
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:01:40 -05:00
Shpuld Shpuldson
89d1fb5cf4
remove remaining autoload i18n
2020-07-14 15:15:02 +03:00
Shpuld Shpuldson
b8c1b25397
remove most of reply preview and autoload related stuff
2020-07-14 15:08:04 +03:00
Shpuld Shpuldson
cac1418aff
fix merge conflicts
2020-07-14 11:44:06 +03:00
Mark Felder
da94935aaa
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:25:23 -05:00
Shpuld Shpuldson
4a6300bbee
add simple You: to chat list last message
2020-07-12 11:11:12 +03:00
eugenijm
18a1f5d62a
Add the empty chat list placeholder.
...
Do not use full height when displaying the chat list.
Remove an unsued chat action.
2020-07-08 15:21:31 +03:00
eugenijm
aa2cf51c05
Add Chats
2020-07-08 15:21:31 +03: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
ddde05771f
update with bookmarks, clean up some code
2020-07-07 17:34:35 +03: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
f254a847d2
move translation strings to correct place, translate error message
2020-07-06 10:53: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
Eugenij
de291e2e33
Add bookmarks
...
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson
ebe885953c
change more opinionated translation
2020-07-03 12:59:30 +03:00
Shpuld Shpuldson
21d1f557f6
change styles for the dropdown, make things work nicely on mobile
2020-07-03 12:56:31 +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
43b7a5d9b3
update the message and changelog
2020-07-01 19:22:39 +03:00
Shpuld Shpuldson
d30b0b28c9
catch localforage error and let the application work, add an alert for user to dismiss
2020-07-01 19:15:28 +03:00
Shpuld Shpuldson
38d8526660
change Show New text to Reload when flushing
2020-06-30 17:37:36 +03:00
Shpuld Shpuldson
79011e02ef
Merge branch 'develop' into xenofem/pleroma-fe-rebased-image-description-authoring
2020-06-29 15:19:41 +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
Shpuld Shpuldson
61f34ff361
remove panel-footer in userpanel, simplify preview header, fix word-wrap in preview
2020-06-28 16:40:39 +03:00
Shpuld Shpuldson
ed5b36f751
make line sizes match for errors/loading and statuses, make X hitbox bigger, remove attachments, add shorter custom message for empty status preview. fix auto update triggering
2020-06-28 15:43:08 +03:00
Shpuld Shpuldson
223fabfe90
add rich text preview
2020-06-28 12:16:41 +03: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
Mark Felder
6606b57f44
Update english i18n
2020-06-26 16:59:22 -05:00
Mark Felder
caf9a2a8f6
Revert i18n to develop
2020-06-26 16:56:57 -05: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
Mark Felder
199fc9351d
Merge branch 'develop' into refactor/notification_settings
2020-06-25 15:28:17 -05:00
Sergey Suprunenko
2451956d83
Add 'bot' flag to Profile settings
2020-06-21 14:59:05 +02:00
kPherox
de9cc033df
Add i18n en
2020-06-10 03:48:41 +09:00
Sergey Suprunenko
1007039478
Autocomplete domain mutes from list of known instances
2020-06-08 13:17:18 +02:00
HJ
acbef1ebdc
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Weblate pleroma pleroma fe
See merge request pleroma/pleroma-fe!1134
2020-06-07 15:21:05 +00:00
Henry Jameson
1e554ee287
indent 2
2020-06-07 18:19:34 +03:00
Henry Jameson
9e3e6b0c69
Merge remote-tracking branch 'origin/develop' into settings-modal
...
* origin/develop: (22 commits)
changelog
alignment fixes
Update CHANGELOG.md
StillImage: Make it work properly in both firefox and chrome.
ReactButton: Change the combined emoji (heart) to a simple one.
Linting fixes.
Settings: Keep a local version of the mutedWordsString
MediaModal: Close on browser navigation events.
StatusContent: Try to get hashtag from dataset first.
Docs: Change wrong documentation.
EntityNormalizerSpec: More fixes.
EntityNormalizerSpec: Test new behavior.
EntityNormalizer: Add colons to emoji alt text.
fixed case in class name
The sidebarRight option wasn't being read
Use consistent naming for Pleroma-FE in README
Remove mention of GNU Social
lint
multiple fixes
fix non-mention notifs
...
2020-06-07 00:10:21 +03:00
Henry Jameson
ebf2ce84fd
alignment fixes
2020-06-06 23:08:52 +03:00
Ben Is
e1475d7f57
Translated using Weblate (English)
...
Currently translated at 100.0% (613 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/en/
2020-06-05 16:13:45 +00:00
Mark Felder
b8350423d9
Updated Notification Settings API use
2020-05-28 10:57:02 -05:00
Henry Jameson
a8e013bd65
Move modal frame parts away from modal-content into modal, improve error handling
2020-05-26 23:58:55 +03:00
Henry Jameson
b5c1d074f8
fix reprööted posts not being muted properly. fix muted posts making
...
desktop notifications
2020-05-25 23:38:31 +03:00
Henry Jameson
7951192cd9
Improve settings-modal async loading, update vue to 2.6.11 to be able
...
to use Vue.observable, to implmement resettable async component
2020-05-25 16:11:05 +03:00
Henry Jameson
138ec85003
Merge remote-tracking branch 'origin/develop' into settings-modal
...
* origin/develop: (95 commits)
Translated using Weblate (Italian)
Translated using Weblate (Chinese (Simplified))
Translated using Weblate (Russian)
Translated using Weblate (Polish)
Translated using Weblate (Dutch)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
Translated using Weblate (German)
...
2020-05-25 03:29:48 +03:00
rinpatch
ca52a7321d
Merge remote-tracking branch 'weblate/develop' into resolve-weblate-merge-conflicts
2020-05-14 22:53:08 +03:00
Anonymous
8db7cba9e1
Translated using Weblate (English)
...
Currently translated at 100.0% (613 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/en/
2020-05-14 18:13:04 +00:00
Henry Jameson
bcebec478e
moved stuff from settings, cleaned up naming for tabs, added close and peek
2020-05-10 06:46:06 +03:00
Mark Felder
9180fdb492
Clarify that we only delete data, not the account
2020-05-08 15:56:53 -05:00
Shpuld Shpludson
f4676e17d3
Merge branch 'develop' into 'feature/copy-link'
...
# Conflicts:
# static/fontello.json
2020-05-08 08:20:03 +00:00
Mark Felder
b3003d4e8d
Add notification privacy option to user settings
2020-05-06 11:46:40 -05:00
Henry Jameson
2e35289c33
initial work on settings modal
2020-05-03 17:36:12 +03:00
eugenijm
01b07f01e9
Add support for follow request notifications
2020-04-30 09:58:55 +03:00
Mark Felder
8c5946b728
Add button in 3dot menu to copy status link to clipboard
2020-03-30 12:39:28 -05:00
Shpuld Shpuldson
ab4005add5
add status unavailable message when status can't be loaded in status preview
2020-03-02 08:35:57 +02:00
HJ
3ddf7ebe2c
Merge branch 'themes-accent' into 'develop'
...
Themes v3 Part 1 "2.1" codenamed "One step for themes, a giant burder for code reviewers"
Closes #750 and #774
See merge request pleroma/pleroma-fe!1037
2020-02-18 21:20:43 +00:00
4aeba026e6
Refactor i18n messages for MRF policy disclosure
2020-02-13 09:43:56 +00:00
HJ
84ebae8ed3
Merge branch 'develop' into 'themes-accent'
...
# Conflicts:
# src/components/emoji_reactions/emoji_reactions.vue
2020-02-11 23:09:15 +00:00
Shpuld Shpludson
f6b482be51
Emoji Reactions - fixes and improvements
2020-02-11 12:24:51 +00:00
Shpuld Shpludson
17b6d8ddb8
Merge branch 'move-type-notification' into 'develop'
...
Add setting for allow following move
Closes #732
See merge request pleroma/pleroma-fe!1054
2020-02-10 14:51:35 +00:00
dafced3a86
MRF Keyword Policy Disclosure
2020-02-10 08:04:58 +00:00
Henry Jameson
611da13a4b
Better Disabled buttons support. Mammal theme fixes. Implemented proper
...
context-aware `mod` argument - now checks lightness of "variant" color. needs
retesting tho
2020-02-07 01:25:26 +02:00
kPherox
ce68ef0138
Add option text
2020-02-04 04:54:36 +09:00
Henry Jameson
f0c4bb1193
Merge remote-tracking branch 'upstream/develop' into themes-accent
...
* upstream/develop: (33 commits)
add emoji reactions to changelog
fix emoji reaction classes broken in develop
review changes
Fix password and email update
remove unnecessary anonymous function
Apply suggestion to src/services/api/api.service.js
remove logs/commented code
remove favs count from react button
remove mock data
change emoji reactions to use new format
Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
Fix missing TWKN when logged in, but server is set to private mode.
Fix follower request fetching
Add domain mutes to changelog
Implement domain mutes v2
change changelog to reflect actual release history of frontend
Fix #750 , fix error messages and captcha resetting
Optimize Notifications Rendering
update CHANGELOG
Use last seen notif instead of first unseen notif for sinceId
...
2020-01-28 20:44:13 +02:00
Henry Jameson
b63e679a31
removed one color TODO
2020-01-28 02:03:21 +02:00
Shpuld Shpuldson
c4beac5f89
Merge branch 'develop' into feat/emoji-reactions
2020-01-26 15:59:59 +02:00
Henry Jameson
d98e31af45
snapshot/source mismatch case
2020-01-22 02:44:39 +02:00
Henry Jameson
644ce497a0
lightBg -> highlight because it causes issues with v2
2020-01-22 01:28:46 +02:00
Henry Jameson
803edcb53a
dismiss warning when loading theme
2020-01-22 01:28:17 +02:00
Henry Jameson
1191207aa5
more help strings
2020-01-22 00:53:51 +02:00
Henry Jameson
9336140486
massively improved initial theme loading code, added checks and warnings when
...
loading theme files (import/localStorage/defaults)
2020-01-22 00:37:19 +02:00
Henry Jameson
93dfb4d352
fix shadow picker preview, change hint
2020-01-20 02:00:13 +02:00
Shpuld Shpludson
7a013ac393
Implement domain mutes v2
2020-01-15 20:22:54 +00:00
Shpuld Shpuldson
b32888194c
fix merge conflicts
2020-01-13 23:47:32 +02:00
Henry Jameson
c3cd66335f
i18n & fixes
2020-01-13 22:26:31 +02:00
Henry Jameson
8d2f2866f6
computed colors support
2020-01-13 01:56:29 +02:00
Henry Jameson
40ba3e2252
added more slots to UI
2020-01-12 23:41:11 +02:00
Henry Jameson
39dd08e694
replace hsl's l with relative luminance for better lightness detection
2020-01-12 17:58:26 +02:00
HJ
215662afde
Merge branch 'develop' into 'fix-move-type-notification'
...
# Conflicts:
# static/fontello.json
2020-01-03 09:05:48 +00:00
Henry Jameson
e5a34870f0
Accent works
2019-12-28 15:55:42 +02:00
kPherox
b4acbf5311
Add user migrates filter to interactions
2019-12-11 18:30:26 +09:00
kPherox
e8333fff8d
change the expression of move
2019-12-11 18:30:23 +09:00
Henry Jameson
6acd889589
Option to enable streaming
2019-12-10 21:30:27 +02:00
kPherox
6af870cd90
Add view for moves notifications
2019-12-11 00:00:45 +09:00
kPherox
2bc63720a5
fix parse for move type notifications
2019-12-11 00:00:36 +09:00
HJ
0eda60eeb4
Merge branch 'greentext-strikes-back' into 'develop'
...
⑨ Added greentext support ⑨
Closes #9
See merge request pleroma/pleroma-fe!994
2019-11-19 14:22:17 +00:00
Shpuld Shpuldson
de945ba3e9
wip commit, add basic popover for emoji reaction select
2019-11-15 16:29:25 +02:00
Henry Jameson
897131572f
Made it optional
2019-11-14 00:47:20 +02:00
taehoon
58839ecef8
change N/A to Hidden
2019-11-12 13:31:30 -05:00
taehoon
85685d6478
add a translation
2019-11-12 11:42:07 -05:00
Ariadne Conill
90f764224d
about: add MRF transparency panel
2019-11-09 00:09:32 -06:00
Ariadne Conill
20ccd93a17
about: add staff panel
2019-11-08 23:21:07 -06:00
e4820012a3
redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id
2019-11-08 22:27:25 +00:00
Henry Jameson
0dcb696e26
Merge remote-tracking branch 'upstream/develop' into emoji-optimizations
...
* upstream/develop: (95 commits)
Lightbox/modal multi image improvements - #381
'/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
Add ability to change user's email
translations-de-batch-1
eu-translate update
profile-banner rounding css, fixes #690
fix indentation
remove needless ref
show preview popover when hover numbered replies
refactor conditions
do not make too many nested div
add fetchStatus action
refactor status loading logic
split status preview popover into a separate component
uninstall mobile-detect library
listen both events
minor css fix
restrict distance at top side only
set different trigger event in desktop and mobile by default
fix eslint warnings
...
2019-11-08 19:48:31 +02:00
Sergey Suprunenko
e3381cdef1
Add ability to change user's email
2019-11-08 02:21:19 +00:00
Maxim Filippov
37be781312
Require password reset
2019-10-16 10:00:26 +00:00
Henry Jameson
6511a744a2
arbitrary limit with option to overcome it
2019-10-08 21:38:27 +03:00
Maksim Pechnikov
541a71c3a5
Merge branch 'develop' into feature/following_reblogs
2019-10-08 16:49:03 +03:00
taehoon
7e5a3fa09f
update copy
2019-10-01 07:36:42 -04:00
taehoon
4f75ad9905
add admin link to nav
2019-10-01 07:36:41 -04:00
194dd88118
Feature/Add _Allow user discovery services_ preference
2019-09-26 22:31:28 +00:00
kaniini
4369ce6f1b
Merge branch 'hide-followers-follows-count' into 'develop'
...
Added a setting to hide follow/follower count from the user profile
See merge request pleroma/pleroma-fe!951
2019-09-26 22:20:01 +00:00
Maksim Pechnikov
19cb98b85f
Merge branch 'develop' into feature/following_reblogs
2019-09-26 21:14:31 +03:00
Henry Jameson
a3305799c7
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
...
* upstream/develop: (42 commits)
Fix formatting in oc.json
avoid using global class
fix logo moving bug when lightbox is open
Reserve scrollbar gap when body scroll is locked
setting display: initial makes trouble, instead, toggle display: none using classname
lock body scroll
add body-scroll-lock directive
install body-scroll-lock
wire up props with PostStatusModal
rename component
recover autofocusing behavior
refactor MobilePostStatusModal using new PostStatusModal
add new module and modal to post new status
remove needless condition
add mention button
wire up user state with global store
collapse fav/repeat notifications from muted users
do not collapse thread muted posts in conversation
detect thread-muted posts
do not change word based muting logic
...
2019-09-25 20:26:49 +03:00
Henry Jameson
7b4cb38734
split spam mode into two separate options (one in settings page)
2019-09-23 20:36:49 +03:00
eugenijm
aafb29c589
Added a setting to hide follow/follower count from the user profile
2019-09-23 16:19:21 +03:00
Maksim Pechnikov
f0b9f5d29c
use repeats
intead boosts
2019-09-22 14:45:42 +03:00
Maksim Pechnikov
8721fb57fc
added support hide\show reblogs from a specific user
2019-09-21 16:24:47 +03:00
taehoon
5ff899b455
add mention button
2019-09-20 11:29:21 -04:00
Henry Jameson
e366adbb6c
updated logic for padding with spaces, improved spam mode
2019-09-15 12:30:02 +03:00
Henry Jameson
14df84d89b
fixed some bugs, added spam mode, minor collateral fixes
2019-09-08 15:51:17 +03:00
Henry Jameson
db086fe1fd
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
...
* upstream/develop: (116 commits)
Password reset page
add a comment
force img updating immediately
Fixed "sequimiento" to "seguimiento".
Replace `/api/externalprofile/show.json` with a MastoAPI equialent
Use mastodon api in follow requests
"Optional" in lowercase.
Update es.json
fix pin/unpin status logic
rename a mutation
update
fix user avatar fallback logic
remove dead code
Corrected "Media Proxy" translation.
Update es.json
make bio textarea resizable vertically only
remove dead code
Make image orientation consistent on FF, fix videos w/ modal
remove dead code
fix crazy watch logic in conversation
...
2019-09-08 13:44:29 +03:00
Eugenij
8ee5abb1a5
Password reset page
2019-09-05 11:23:28 +00:00
Henry Jameson
5851f97eb0
fixed a lot of bugs with emoji picker, improved relevant components
2019-08-12 20:03:48 +03:00
HJ
59f2931361
Merge branch 'fix/text-dont-media-viewer' into 'develop'
...
fix english settings label regarding how to view videos
See merge request pleroma/pleroma-fe!909
2019-08-09 08:31:02 +00:00
3e7f0ecf9b
fix english settings label regarding how to view videos
2019-08-09 08:03:21 +02:00
Shpuld Shpludson
d3f6b581d1
Merge branch 'develop' into 'feat/conversation-muting'
...
# Conflicts:
# src/components/extra_buttons/extra_buttons.js
# src/components/extra_buttons/extra_buttons.vue
2019-07-26 12:44:32 +00:00