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
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
fa6210872f
Feature/add sticker picker
...
Squash to avoid storing commits with stickers in it to avoid possible copyright problems and excess storage space. --hj
2019-07-24 19:35:52 +00:00
3370dd80dc
Merge branch 'develop' into 'feat/conversation-muting'
...
# Conflicts:
# src/services/api/api.service.js
2019-07-15 19:09:01 +00:00
69a4bcb238
New search
2019-07-15 16:42:27 +00:00
4f26299bd5
update copy
2019-07-10 21:01:08 -04:00
0c52d69a52
update copy
2019-07-10 21:01:07 -04:00
ace3b399ff
support i18n
2019-07-10 21:01:07 -04:00
7ed9d17ce7
Add thread muting to context menu of status
2019-07-07 23:02:09 +03:00
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
77eceedbf7
Revert "add TOTP/Recovery Form for mobile version"
...
This reverts commit a3811f9448
2019-06-12 20:16:55 +00:00
855566f887
notification controls: redesign entirely
2019-05-25 23:44:36 +00:00
28ca504576
wire up notification settings
2019-05-25 07:34:59 +00:00
b78ad8998d
Merge branch 'masto-remains' into 'develop'
...
Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that
See merge request pleroma/pleroma-fe!792
2019-05-20 20:54:05 +00:00
7976d118ca
Cleanup, little documentation, localization
2019-05-15 20:44:35 +03:00
beaf512573
add translation
2019-05-15 12:04:26 -04:00
d76bd0044f
fix typo
2019-05-15 12:04:26 -04:00
9fc997500e
#468 - add extra buttons for status actions
2019-05-15 12:04:25 -04:00
177e53cf6a
Merge branch 'mobile-scope' into 'develop'
...
Display additional scope description above the status form for mobile users.
Closes #505
See merge request pleroma/pleroma-fe!767
2019-05-09 17:13:50 +00:00
a89010843d
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
2019-05-08 16:50:39 +03:00
157d4e601e
Merge branch 'fix/floating-button' into 'develop'
...
Mobile Post button fix
Closes #506
See merge request pleroma/pleroma-fe!769
2019-05-07 18:40:49 +00:00
4af343374a
Move scope visibility notice to the status form, make it dismissible
2019-05-07 19:13:45 +03:00
cf72ebb407
update copy
2019-05-03 11:40:05 -04:00
5d0bae5569
update generic error message
2019-05-03 11:40:05 -04:00
d115d98a1b
add translations
2019-05-03 11:40:05 -04:00
2cda9010df
add user reporting modal
2019-05-03 11:40:05 -04:00
b1bd5bd08e
Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
...
# Conflicts:
# src/services/api/api.service.js
2019-04-30 15:11:30 +00:00
ae1496cfb4
Make floating post button configurable
2019-04-29 21:32:29 +03:00
95bc2d727b
add “export blocks” feature
2019-04-27 08:31:06 -04:00
08eaf9bd33
make reusable Exporter component
2019-04-27 08:31:06 -04:00
0ab2f9dfa5
add “block import” feature
2019-04-27 08:31:06 -04:00
6d0e98a1c2
make Importer component reusable
2019-04-27 08:31:06 -04:00
55823b8d67
add BBCode strings
2019-04-26 22:48:21 +00:00
8af8f719e4
fix i18n
2019-04-22 21:37:27 +03:00
ac9ddfb1e2
support i18n
2019-04-17 11:32:49 -04:00
d874ca905c
support i18n
2019-04-14 23:44:50 -04:00
546ced43d9
Merge branch 'moderation-menu' into 'develop'
...
Moderation menu #310
See merge request pleroma/pleroma-fe!595
2019-04-08 19:01:40 +00:00
70071b870f
#469 - update text copy
2019-04-02 12:46:22 -04:00
67258571c5
#469 - update behavior of safe_dm
2019-04-02 11:19:45 -04:00
6b6878bde0
Added moderation menu
2019-04-01 23:30:06 +03:00
3c2931529e
Merge branch 'minimal-scopes-mode' into 'develop'
...
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
See merge request pleroma/pleroma-fe!633
2019-04-01 19:32:37 +00:00
dee9ab7bda
#470 - update button text capitalization
2019-04-01 13:04:40 -04:00
6847e70a49
#470 - update i18n
2019-04-01 12:58:23 -04:00
9f4a9bff46
Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
...
* upstream/develop: (173 commits)
Fix: Change condition
fix typo
update store according to retweeted status
#433 - update sort by for conversation
display replies_count right after reply icon
expose replies_count from mastodon api
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
make side drawer use gesture service and fix its animations
review/remove error hiding
errata
review
#433 - sort conversation for retweets and clean up
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
Remove console log
Fix warnings in user profile routing
Add tests for gesture service, fix bug with perpendicular directions
#255 - clean up autocomplete form
#255 - clean up user settings page with self-closing html tags
...
2019-03-30 12:31:50 +02:00
2f1e690478
Merge branch 'issue-442-placeholder-fix' into 'develop'
...
#442 - clean up Bio placeholder text
Closes #442
See merge request pleroma/pleroma-fe!689
2019-03-25 22:29:17 +00:00
9857002bf5
Add hideMutedPosts setting and wire up to post-returning endpoints
2019-03-21 16:33:02 -04:00
9890e41440
Merge branch 'feature/bypass-avatar-cropper' into 'develop'
...
#443 Add button to save without cropping
Closes #443
See merge request pleroma/pleroma-fe!691
2019-03-21 15:44:26 +00:00
3108722eda
Add button to save without cropping
2019-03-18 18:19:42 -07:00
5717d97182
#442 - update placeholder linebreak
2019-03-18 10:35:13 -04:00
HJ
matrixsasuke
Shpuld Shpludson
absturztaube
Eugenij
taehoon
lain
Maksim
William Pitcock
Henry Jameson
dave
jared
jasper