92380652fe
Merge branch 'feat/conversation-muting' into 'develop'
...
Add Conversation/Thread Muting
See merge request pleroma/pleroma-fe!876
2019-08-08 10:09:07 +00:00
b9fd3bebc5
Update norwegian bokmål translation
2019-08-08 00:47:48 +02:00
c0e8d1a809
Corrections and semantics changes for Spanish translation
2019-08-05 15:23:39 +02:00
39106dc545
Update oc.json
2019-08-03 14:04:49 +00:00
920bd05081
Update for Interactions, new search, sticker picker, update copy.
2019-08-03 13:55:05 +00:00
5f6456703c
add Basque translate
2019-08-01 18:21:32 +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
6380f7df16
Update es.json (add sticker)
2019-07-24 22:06:45 +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
51fc0a5c52
Update es.json
2019-07-23 15:16:03 +00:00
e86f6edb7c
Merge branch 'patch-2' into 'develop'
...
Update es.json
See merge request pleroma/pleroma-fe!794
2019-07-15 19:21:37 +00:00
54b45ec4a3
i18n/Update pedantic Japanese translation
2019-07-15 19:18:40 +00:00
f665ac83e7
i18n/Update easy Japanese trasnlation
2019-07-15 19:18:20 +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
fe500c44ed
Update oc.json
2019-06-30 14:24:34 +00:00
c4fcdc7125
Merge branch 'mr-origin-740' into 'develop'
...
Update french translation
See merge request pleroma/pleroma-fe!829
2019-06-18 20:39:59 +00:00
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
57dbfc269c
Update translation with review comments
2019-06-18 22:14:02 +02:00
64d7dd60cc
Update file with current en.json
2019-06-18 21:22:22 +02:00
3fcc4ba288
Update fr.json
...
added missing ,
2019-06-18 21:22:21 +02:00
ceffe72f6f
Update fr.json
...
stoped at line 134, more to do below
2019-06-18 21:22:15 +02:00
77eceedbf7
Revert "add TOTP/Recovery Form for mobile version"
...
This reverts commit a3811f9448
2019-06-12 20:16:55 +00:00
322c9fbfb6
i18n/Update Japanese translation
2019-06-11 12:10:47 +00:00
b4796ccbf6
Merge branch 'feature/notification-controls' into 'develop'
...
wire up notification settings
See merge request pleroma/pleroma-fe!809
2019-06-01 05:16:15 +00:00
443794b000
i18n/Add Japanese with kanji (2)
2019-05-29 05:31:03 +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
4249a2fd6f
Translation to Hebrew of everything other than theme_helpers and style.
2019-05-22 21:33:05 +03:00
3b3e4ffc54
Translate up to settings.
2019-05-22 01:46:08 +03: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
b436e0dd12
Merge branch 'webpack-4-dart-sass' into 'develop'
...
Massive update for dependencies
See merge request pleroma/pleroma-fe!734
2019-05-20 18:09:14 +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
bacbfc1154
Update es.json
2019-05-15 09:16:49 +00:00
750dca4a10
Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
...
* upstream/develop: (116 commits)
Fix small mistake in Polish translation
link interaction avatars to the user profile
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
use backendInteractor
refactor api service functions using new helper
clean up
update favorite number earlier
update status interaction upon retweet action response
sync up favoritedBy with favorite/unfavorite action
do not regenerate status object
reduce needless calculation
Move scope visibility notice to the status form, make it dismissible
Revert "eliminate expandable prop in favor of inConversation"
status attention doesn’t have relationship entities
make it short
fix wrong inlineExpanded
expanded is always false, eliminate it
eliminate expandable prop in favor of inConversation
fix conversationId comparision bug using integer format
Display additional scope description above the status form for mobile users.
...
2019-05-13 20:38:54 +03:00
caf9e627a7
Fix small mistake in Polish translation
2019-05-10 06:52:01 +00: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
bfd25a5c3f
Update es.json
2019-05-06 08:38:24 +00: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
0438031da4
Merge branch 'develop' into 'develop'
...
[i18n]Update oc.json
See merge request pleroma/pleroma-fe!777
2019-05-03 14:57:04 +00:00
09253420a2
Update es.json
2019-05-03 00:22:14 +00:00
b98bab52a9
Update oc.json
2019-05-01 16:40:40 +00: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
e0247e21f6
Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
...
* upstream/develop: (126 commits)
entity normalizer: hook up in_reply_to_account_acct
add BBCode strings
fix follow button not updating bug in follow-card
refer searched user objects from the global user rep
set max-width of textarea in settings page
Remove space in the timeline setting copy
user_card.vue: Fix .emoji to apply to img
Update oc.json
Update oc.json
Update oc.json
Update oc.json
replace pencil with wrench icon
rebuild fontello with wrench icon added
fetch all friends using pagination
stop fetching user relationship when user is unauthorized
Revert "recover border between basic-user-card using list component"
remove extra spacing
code readability
fix typos
clean up
...
2019-04-27 12:26:17 +03:00
55823b8d67
add BBCode strings
2019-04-26 22:48:21 +00:00
2b5cf61a8f
firefox
2019-04-24 21:53:51 +03:00
8af8f719e4
fix i18n
2019-04-22 21:37:27 +03:00
ed9aa8df76
Update oc.json
2019-04-20 14:44:43 +00:00
213891ac71
Update oc.json
2019-04-20 14:38:04 +00:00
69468c7c41
Update oc.json
2019-04-20 14:35:14 +00:00
44f18caf4d
Update oc.json
2019-04-20 14:29:04 +00:00
ac9ddfb1e2
support i18n
2019-04-17 11:32:49 -04:00
d874ca905c
support i18n
2019-04-14 23:44:50 -04:00
fd171da0dc
attempt at making it work
2019-04-13 18:28:50 +03: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
a595febcb8
Merge branch 'develop' into 'develop'
...
[i18n] Update oc.json for !611 and !691
See merge request pleroma/pleroma-fe!712
2019-04-01 19:49:16 +00:00
3b38e1b8a7
Merge branch 'patch-2' into 'develop'
...
Update Polish translation
See merge request pleroma/pleroma-fe!719
2019-04-01 19:44:11 +00: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
6828c7d74c
Update Polish translation
2019-03-31 13:50:51 +00: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
e1e0b8b254
Update oc.json for !611 and !691
2019-03-27 18:46:40 +00: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
9e17853b2c
Merge branch 'patch-2' into 'develop'
...
[i18n] Update oc.json
See merge request pleroma/pleroma-fe!684
2019-03-21 15:38:19 +00:00
a284a267ce
Merge branch 'develop' into 'develop'
...
Fixing typos and badly translated strings (Portuguese)
See merge request pleroma/pleroma-fe!676
2019-03-21 15:37:05 +00:00
57cd6f8018
Merge branch 'feature/version-info' into 'develop'
...
Added new tab to display versions of BE/FE
Closes #397
See merge request pleroma/pleroma-fe!671
2019-03-21 15:25:59 +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
543cc0d285
#442 - clean up Bio placeholder text
2019-03-17 16:59:08 -04:00
7babbce522
[i18n] Update oc.json
2019-03-15 17:23:30 +00:00
3c5c09c74f
Merge branch 'develop' into feature/version-info
2019-03-13 15:24:09 -07:00
03f1b95252
fixing typos and badly translated strings
2019-03-11 18:26:40 -03:00
130fb7ae1e
#434 - fix plain text issue
2019-03-11 16:48:27 -04:00
3414fce53b
I18n: Update Czech translation
2019-03-11 14:28:44 +00:00
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
bf1fa52e5e
Merge branch 'fix/post-content-type' into 'develop'
...
#327 : Load post status content type from instance config
Closes #327
See merge request pleroma/pleroma-fe!641
2019-03-07 16:03:06 +00:00
Shpuld Shpludson
morguldir
tarteka
Exilat
absturztaube
Hakaba Hitoyo
Eugenij
taehoon
HJ
lain
Dashie
Satak
Maksim
kaniini
William Pitcock
j1t
Henry Jameson
dave
Marcin Mikołajczak
jared
jasper
Edijs
Rond
Lorem Ipsum