3a3db35985
Merge branch 'patch-3' into 'develop'
...
Little fix to some strings on es.json
See merge request pleroma/pleroma-fe!967
2019-10-29 06:06:58 +00:00
37be781312
Require password reset
2019-10-16 10:00:26 +00:00
d2feba1487
Merge branch 'feature/following_reblogs' into 'develop'
...
[#664 ] implementes to hide/show reblogs from a specific user.
See merge request pleroma/pleroma-fe!956
2019-10-15 06:26:12 +00:00
6511a744a2
arbitrary limit with option to overcome it
2019-10-08 21:38:27 +03:00
541a71c3a5
Merge branch 'develop' into feature/following_reblogs
2019-10-08 16:49:03 +03:00
16c03995cb
[i18n] spanish new strings translations
...
update to translate the latest text strings
2019-10-07 21:21:16 +02:00
Echedey López Romero
97f9628bea
Little fix to "login"/"description" and "register" strings to es.json referenced as verbs.
2019-10-07 12:34:38 +00:00
67436ed144
update and fix
2019-10-07 10:22:17 +02:00
7e5a3fa09f
update copy
2019-10-01 07:36:42 -04:00
4f75ad9905
add admin link to nav
2019-10-01 07:36:41 -04:00
194979783e
i18n/Update Pedantic Japanese Messages
2019-09-30 05:09:05 +00:00
087a5b612d
i18n/Update Japanese Messages
2019-09-30 05:07:57 +00:00
194dd88118
Feature/Add _Allow user discovery services_ preference
2019-09-26 22:31:28 +00:00
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
19cb98b85f
Merge branch 'develop' into feature/following_reblogs
2019-09-26 21:14:31 +03:00
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
e55645aec1
Fix formatting in oc.json
2019-09-25 10:25:44 +03:00
49ea63ddf3
Merge branch 'develop' into 'develop'
...
[i18n] Update for the Occitan language file
See merge request pleroma/pleroma-fe!901
2019-09-25 07:12:34 +00:00
7a1081aa66
Merge branch 'es-translate' into 'develop'
...
[i18n] Update es translate
See merge request pleroma/pleroma-fe!944
2019-09-25 07:10:11 +00:00
4c55e0d1be
Merge branch 'eu-translate' into 'develop'
...
[i18n] update eu translate
See merge request pleroma/pleroma-fe!943
2019-09-25 07:09:57 +00:00
7b4cb38734
split spam mode into two separate options (one in settings page)
2019-09-23 20:36:49 +03:00
aafb29c589
Added a setting to hide follow/follower count from the user profile
2019-09-23 16:19:21 +03:00
f0b9f5d29c
use `repeats` intead `boosts`
2019-09-22 14:45:42 +03:00
8721fb57fc
added support hide\show reblogs from a specific user
2019-09-21 16:24:47 +03:00
5ff899b455
add mention button
2019-09-20 11:29:21 -04:00
e366adbb6c
updated logic for padding with spaces, improved spam mode
2019-09-15 12:30:02 +03:00
a8cddecd41
fix some translation about blocks
2019-09-11 22:37:19 -07:00
d0fc509ad1
Complete the Chinese language file based on the version 0.9.999
2019-09-10 19:50:06 -07:00
6217ef4718
fix some translates
2019-09-10 10:09:07 +02:00
14df84d89b
fixed some bugs, added spam mode, minor collateral fixes
2019-09-08 15:51:17 +03:00
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
5026d3719a
fix some translates
2019-09-07 09:07:34 +02:00
17a97ee6f5
fix some translates
2019-09-07 09:00:25 +02:00
1167bafb19
Update es translate
2019-09-06 14:58:20 +02:00
f48d12b4bc
update eu translate
2019-09-06 14:24:37 +02:00
8ee5abb1a5
Password reset page
2019-09-05 11:23:28 +00:00
Echedey López Romero
d1244e4896
Fixed "sequimiento" to "seguimiento".
2019-09-03 17:51:50 +00:00
Echedey López Romero
66e9f17c58
"Optional" in lowercase.
2019-09-02 11:41:30 +00:00
Echedey López Romero
4f82ea0fea
Update es.json
2019-09-01 21:57:07 +00:00
Echedey López Romero
a15810afc8
Corrected "Media Proxy" translation.
2019-08-27 19:07:07 +00:00
Echedey López Romero
50bf9e633b
Update es.json
2019-08-26 21:37:39 +00:00
58713e342d
Merge branch 'eu-translate' into 'develop'
...
add Basque translate
See merge request pleroma/pleroma-fe!900
2019-08-17 08:16:45 +00:00
84c3403143
Merge branch 'es-translate' into 'develop'
...
[i18n] Spanish corrections
See merge request pleroma/pleroma-fe!904
2019-08-17 08:15:06 +00:00
aef97bc9bc
Merge branch 'update-nb' into 'develop'
...
Update norwegian bokmål translation
See merge request pleroma/pleroma-fe!906
2019-08-17 08:14:47 +00:00
091fb5573c
i18n/Update Japanese
2019-08-17 08:14:17 +00:00
fc68c3907d
i18n/Update pedantic Japanese
2019-08-17 08:14:00 +00:00
5851f97eb0
fixed a lot of bugs with emoji picker, improved relevant components
2019-08-12 20:03:48 +03:00
5e0b4e06ec
i18n: Translated to Telugu (44.3%)
...
Verified that the translation strings work by running Pleroma-FE locally.
Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
2019-08-10 16:50:59 +05:30
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
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
Shpuld Shpludson
Maxim Filippov
HJ
Henry Jameson
Maksim Pechnikov
tarteka
Echedey López Romero
taehoon
Hakaba Hitoyo
kaniini
Shpuld Shpuldson
eugenijm
davidyin
Joseph Nuthalpati
matrixsasuke
morguldir
Exilat
absturztaube
lain
Dashie
Satak
kaniini
William Pitcock
j1t
dave
Marcin Mikołajczak