taehoon
b2bd128f05
allow zooming avatar in profile panel header
2019-07-28 21:05:13 -04:00
taehoon
5881d92eb7
use $route instead of $router.currentRoute
2019-07-28 21:05:13 -04:00
taehoon
7c2982064e
enlarge avatar in profile page
2019-07-28 21:05:13 -04: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
taehoon
65ef039316
add unit test for elimination logic
2019-07-25 08:03:41 -04:00
taehoon
53c9517a4a
use array.includes instead of array.indexOf
2019-07-24 22:42:06 -04:00
taehoon
0f8ace4836
update status eliminating logic
2019-07-24 21:02:37 -04:00
taehoon
876c6de806
fix typos
2019-07-24 21:02:37 -04:00
taehoon
dca384f123
update prop syntax
2019-07-24 21:02:37 -04:00
taehoon
d7dc070667
put two loops in one parent
2019-07-24 21:02:37 -04:00
taehoon
ae829e8df1
move pinned statuses showing logic in timeline
2019-07-24 21:02:37 -04:00
taehoon
4826d72549
update prop name
2019-07-24 21:02:37 -04:00
taehoon
7f9feacd26
prevent showing pinned statuses twice
2019-07-24 21:02:37 -04:00
tarteka
6380f7df16
Update es.json (add sticker)
2019-07-24 22:06:45 +00:00
absturztaube
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
taehoon
8375d7a3aa
guard more secure routes
2019-07-24 11:08:05 -04:00
taehoon
ad29e20324
guard secure routes by redirecting to root
2019-07-24 11:08:05 -04:00
Shpuld Shpludson
1f8f2e26e3
Merge branch 'patch-2' into 'develop'
...
Update es.json
See merge request pleroma/pleroma-fe!889
2019-07-24 13:32:57 +00:00
taehoon
1cefaa8446
closest can returns itself as well
2019-07-23 20:59:37 -04:00
taehoon
17ad5bbdf9
find inside status-content div only
2019-07-23 15:44:41 -04:00
taehoon
09efcb48a4
try to use the closest a tag as target
2019-07-23 15:43:03 -04:00
tarteka
51fc0a5c52
Update es.json
2019-07-23 15:16:03 +00:00
Toromino
fb9f254f8d
Also apply keyword filter to subjects
2019-07-20 19:06:54 +02:00
shpuld
619608ea7a
fix issues caused by merges in usersearch on @
2019-07-18 17:22:51 +03:00
Wyatt Benno
5909baba7c
Add user search at
2019-07-18 03:40:02 +00:00
taehoon
051b3b5141
fix eslint warnings
2019-07-15 21:22:41 -04:00
taehoon
e3ac71968b
fix moderation menu partially hidden by usercard boundary
2019-07-15 21:22:41 -04:00
taehoon
c4789a348f
migrate popper css
2019-07-15 21:22:41 -04:00
taehoon
4f74392641
rewrite ModerationTools using v-tooltip
2019-07-15 21:22:41 -04:00
taehoon
b9c547828e
make popover position for status action dropdow relative to parent node
2019-07-15 21:22:41 -04:00
taehoon
005815c825
rewrite ExtraButtons using v-tooltip
2019-07-15 21:22:40 -04:00
taehoon
1727c815f8
install v-tooltip
2019-07-15 21:22:40 -04:00
HJ
f734a72116
Merge branch 'fix/respect-hide-post-stats' into 'develop'
...
Hide favs/rts properly when hide post stats is enabled
See merge request pleroma/pleroma-fe!877
2019-07-15 21:47:45 +00:00
Shpuld Shpludson
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
Hakaba Hitoyo
54b45ec4a3
i18n/Update pedantic Japanese translation
2019-07-15 19:18:40 +00:00
Hakaba Hitoyo
f665ac83e7
i18n/Update easy Japanese trasnlation
2019-07-15 19:18:20 +00:00
Shpuld Shpludson
3370dd80dc
Merge branch 'develop' into 'feat/conversation-muting'
...
# Conflicts:
# src/services/api/api.service.js
2019-07-15 19:09:01 +00:00
Eugenij
69a4bcb238
New search
2019-07-15 16:42:27 +00:00
taehoon
ff90d864cc
fix wrong eslint comments
2019-07-12 15:11:54 -04:00
taehoon
78594f61d4
add a todo comment
2019-07-12 15:10:30 -04:00
taehoon
57c5d269b8
add bell-ringing icon
2019-07-11 12:52:05 -04:00
taehoon
b2dbf01a72
eslint —fix
2019-07-10 21:01:08 -04:00
taehoon
9712e324e5
hide subscribe button unless following
2019-07-10 21:01:08 -04:00
taehoon
1237d0d2b8
use normal bell for unsubscribed state
2019-07-10 21:01:08 -04:00
taehoon
4f26299bd5
update copy
2019-07-10 21:01:08 -04:00
taehoon
0f4cccd115
improve ui
2019-07-10 21:01:08 -04:00
taehoon
38ba5fe028
change subscribe button to icon button
2019-07-10 21:01:08 -04:00
taehoon
2ab00387fe
clean up + add btn-group css class
2019-07-10 21:01:07 -04:00
taehoon
e1d6e56e1b
clean up layout
2019-07-10 21:01:07 -04:00
taehoon
0fc154d9d4
clean up UserCard css
2019-07-10 21:01:07 -04:00
taehoon
dbe2decc59
clean up UserCard template
2019-07-10 21:01:07 -04:00
taehoon
3b9ab0e343
no need to covert to boolean
2019-07-10 21:01:07 -04:00
taehoon
670cbfdd1c
change subscribing to subscribed
2019-07-10 21:01:07 -04:00
taehoon
0c52d69a52
update copy
2019-07-10 21:01:07 -04:00
taehoon
ace3b399ff
support i18n
2019-07-10 21:01:07 -04:00
taehoon
deee07d6fb
show subscribe button only if user is logged in
2019-07-10 21:01:07 -04:00
taehoon
646d197bf1
mutate updated relationship to the store
2019-07-10 21:01:07 -04:00
taehoon
e9e6daa76e
show text in progress only when slot is given
2019-07-10 21:01:07 -04:00
taehoon
f4a16e6541
add subscribing to user entity normalizer
2019-07-10 21:01:07 -04:00
taehoon
4cf402ff21
migrate SubscribeButton to the existing common component
2019-07-10 21:01:07 -04:00
jared
d5e8315e83
#482 - add subscribe button
2019-07-10 21:01:07 -04:00
jared
f2c95f9d0b
#482 - add new endpoints to subscribe to the user
2019-07-10 21:01:07 -04:00
Tae Hoon
532b76eb64
Refactor user search api, better api error response handling
2019-07-10 16:58:49 +00:00
shpuld
59ade4084e
Hide favs/rts properly when hide post stats is enabled
2019-07-09 16:50:23 +03:00
taehoon
0131effb01
add comments
2019-07-07 22:49:18 -04:00
taehoon
ab4d7d9616
refetch favs and repeats separately
2019-07-07 22:49:18 -04:00
taehoon
e9b6e0e2b7
refetch favs and repeats when stats are changed
2019-07-07 22:49:18 -04:00
taehoon
17498ef906
update favs and repeats stats using favoritedByUsers and rebloggedByUsers data
2019-07-07 22:49:18 -04:00
shpuld
7ed9d17ce7
Add thread muting to context menu of status
2019-07-07 23:02:09 +03:00
shpuld
e5879e3d4d
check for user before checking users props
2019-07-07 22:23:04 +03:00
Shpuld Shpludson
54b0f90133
Merge branch 'eslint-fix' into 'develop'
...
Fix shitton warning eslint gives
See merge request pleroma/pleroma-fe!871
2019-07-07 19:12:33 +00:00
Shpuld Shpludson
171673113f
Merge branch 'revoke-token' into 'develop'
...
Revoke oAuth token on logout
Closes pleroma#952
See merge request pleroma/pleroma-fe!864
2019-07-07 18:29:36 +00:00
Shpuld Shpludson
c8794b2b84
Merge branch '580' into 'develop'
...
Fix backend version string parsing
Closes #580
See merge request pleroma/pleroma-fe!868
2019-07-07 10:30:45 +00:00
Shpuld Shpludson
e7ff9b5227
Merge branch '600-2' into 'develop'
...
Preserve formatting of status content
Closes #600
See merge request pleroma/pleroma-fe!872
2019-07-07 10:21:55 +00:00
Eugenij
14ec12b4f6
Set hide_follows and hide_followers settings when parsing Mastodon format
2019-07-07 10:20:55 +00:00
Henry Jameson
020c6d1bcf
all the manual fixes
2019-07-07 00:54:17 +03:00
Henry Jameson
1ec4caa0bb
fix merge conflict
2019-07-06 23:52:10 +03:00
HJ
8f53796420
Merge branch 'develop' into 'eslint-fix'
...
# Conflicts:
# src/components/post_status_form/post_status_form.vue
2019-07-06 20:43:38 +00:00
taehoon
bba4b57dd8
preserve formatting of content
2019-07-05 21:57:48 -04:00
taehoon
66842efd81
update regex for commit hash
2019-07-05 11:11:31 -04:00
Shpuld Shpludson
60b413d02c
Merge branch '602' into 'develop'
...
Fix mixed profiles bug on user profile page
Closes #586
See merge request pleroma/pleroma-fe!865
2019-07-05 13:28:15 +00:00
Shpuld Shpludson
7ec02445cc
Merge branch 'develop' into 'develop'
...
[i18n] Update of the Occitan translation
See merge request pleroma/pleroma-fe!866
2019-07-05 13:22:49 +00:00
Shpuld Shpludson
4f0ba97be9
Merge branch '603' into 'develop'
...
Hide text format when only plaintext is available
Closes #603
See merge request pleroma/pleroma-fe!867
2019-07-05 13:22:04 +00:00
Henry Jameson
8d6750d9c2
eslint --fix --ext .js,.vue src
2019-07-05 10:17:44 +03:00
Henry Jameson
2c2b84d31d
npm eslint --fix .
2019-07-05 10:02:14 +03:00
HJ
6bea363b9d
Merge branch 'fix-android-emoji-autocompletion' into 'develop'
...
Fix android emoji autocompletion
Closes #606
See merge request pleroma/pleroma-fe!869
2019-07-04 18:55:13 +00:00
Henry Jameson
f86f4b514f
Support compositionupdate event to properly show autocomplete popup for IMEs and
...
android
2019-07-03 23:08:51 +03:00
taehoon
6c6aa8446d
place scope selector on the left consistently
2019-07-03 12:19:25 -04:00
taehoon
0c102deeed
hide text format when only plaintext is available
2019-07-02 16:36:14 -04:00
taehoon
b70c2bfef7
make sure that user timelines are empty when opening profile page
2019-07-02 14:43:01 -04:00
taehoon
0e9b8be88c
clear userId property of timeline by default in clearTimeline action
2019-07-02 14:32:46 -04:00
Egor Kislitsyn
52319acf58
Revoke oAuth token
2019-07-02 15:33:40 +07:00
Exilat
fe500c44ed
Update oc.json
2019-06-30 14:24:34 +00:00
Henry Jameson
82464b3a7e
review
2019-06-26 00:34:09 +03:00
Henry Jameson
9dbafa4c78
lint fix
2019-06-25 21:39:33 +03:00
Henry Jameson
01bda605a7
fix all known problems with clicks on autocomplete emojis
2019-06-25 21:31:43 +03:00
Shpuld Shpludson
b059deb551
fix specificity that made attachments misalign
2019-06-25 16:30:21 +00:00
HJ
8d33832fe1
Merge branch 'clearer-user-profile-tabs' into 'develop'
...
Clearer user profile tabs when status is empty
See merge request pleroma/pleroma-fe!847
2019-06-25 06:32:08 +00:00
Wyatt Benno
f2d84ef233
Keep statuses always enabled
2019-06-25 10:27:41 +09:00
HJ
bb8e2b1933
Merge branch 'timeline-skip-fix' into 'develop'
...
timeline-skip-fix
See merge request pleroma/pleroma-fe!850
2019-06-24 22:08:09 +00:00
taehoon
1c03bd0ebc
add resolve param to user search api request
2019-06-24 07:49:22 -04:00
Wyatt Benno
7a5d06a6cf
change isPinned to noIdUpdate
2019-06-24 12:01:13 +09:00
Shpuld Shpludson
947f69a953
Fix: problems with polls state
2019-06-22 14:01:36 +00:00
Shpuld Shpludson
30a340955e
Move character counter into the input box
2019-06-22 13:41:02 +00:00
Wyatt Benno
a1c50c3fc1
fix for #553
2019-06-21 10:31:00 +09:00
Wyatt Benno
308c4c9789
Make scss change for tab switcher only
2019-06-21 08:35:02 +09:00
taehoon
bd377148ad
delete state.token instead of setting false
2019-06-20 11:48:31 -04:00
taehoon
8a32731e4d
use clientSecret in login flow
2019-06-20 11:48:30 -04:00
taehoon
c23228f196
fix error breaking logout flow
2019-06-20 11:48:30 -04:00
taehoon
268e9ce504
make sure to clear old token when logout
2019-06-20 11:48:29 -04:00
Shpuld Shpludson
e5e9bb27f3
Move poll state handling to its own module
2019-06-20 13:02:04 +00:00
Shpuld Shpludson
44a03922e6
Fix/messed up long polls
2019-06-20 13:00:10 +00:00
Wyatt Benno
066efd5b3c
A small sass fix for #577
2019-06-20 16:15:49 +09:00
taehoon
90fda1f245
reset margin property of form controls
2019-06-19 07:55:54 -04:00
HJ
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
lain
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
Dashie
57dbfc269c
Update translation with review comments
2019-06-18 22:14:02 +02:00
Dashie
64d7dd60cc
Update file with current en.json
2019-06-18 21:22:22 +02:00
Satak
3fcc4ba288
Update fr.json
...
added missing ,
2019-06-18 21:22:21 +02:00
Satak
ceffe72f6f
Update fr.json
...
stoped at line 134, more to do below
2019-06-18 21:22:15 +02:00
HJ
69eff65130
Merge branch 'refactor-emoji-input' into 'develop'
...
EmojiInput refactoring
Closes #565
See merge request pleroma/pleroma-fe!824
2019-06-18 19:17:37 +00:00
Henry Jameson
46e0122067
review
2019-06-18 22:13:03 +03:00
Henry Jameson
0032802f0a
review
2019-06-18 21:30:35 +03:00
HJ
e5020d6936
Update emoji-input.js
2019-06-18 17:49:43 +00:00
Shpuld Shpludson
c0c012ccf9
Merge branch 'fix-user-search' into 'develop'
...
fix user search
See merge request pleroma/pleroma-fe!839
2019-06-18 16:32:11 +00:00
HJ
3cd4201ce4
Merge branch '573' into 'develop'
...
Apply font smoothing in webkit and firefox
Closes #573
See merge request pleroma/pleroma-fe!841
2019-06-18 16:31:33 +00:00
Shpuld Shpludson
76efbcbe92
Misc fixes: Fix uploads stretching on chrome, fix warnings in console
2019-06-18 16:31:20 +00:00
taehoon
2b5ac611c9
apply font smoothing in webkit and firefox
2019-06-17 23:34:20 -04:00
Henry Jameson
de03eda9f3
fix user search
2019-06-17 23:39:30 +03:00
HJ
ac46de3972
Merge branch 'mastoapi-login-and-config-fixes' into 'develop'
...
Mastoapi login and config fixes
See merge request pleroma/pleroma-fe!833
2019-06-17 20:17:58 +00:00
HJ
22a3351208
Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js
2019-06-17 20:12:11 +00:00
Henry Jameson
5f4a8dcc05
properly position the caret after replacement
2019-06-17 21:24:10 +03:00
HJ
8caf13bbce
Apply suggestion to src/services/api/api.service.js
2019-06-17 08:20:02 +00:00
Henry Jameson
06c84a9cf3
fix MFA crashing on user-settings page
2019-06-16 20:36:21 +03:00
Henry Jameson
6744396f82
getting and setting user background via MastoAPI
2019-06-16 20:17:59 +03:00
Henry Jameson
e3638af031
Removed formattingOptionsEnabled in favor of relying on BE-provided list of
...
accepted formatting options
2019-06-16 20:16:52 +03:00
HJ
1db3c785d8
Merge branch 'masto-register-app-secret' into 'develop'
...
Proper clientId/secret/token caching, MastoAPI registration
Closes #554
See merge request pleroma/pleroma-fe!806
2019-06-16 11:18:21 +00:00
taehoon
de2504ad6c
fix typo
2019-06-13 15:00:13 -04:00
Henry Jameson
acbeea59ff
rename mutations according to actual property names
2019-06-13 10:11:17 +03:00
Henry Jameson
f9c3aabea4
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
...
* upstream/develop:
fix user banner
2019-06-13 10:05:53 +03:00
Henry Jameson
0988065f50
fix
2019-06-13 10:05:22 +03:00
Henry Jameson
dba8d8910c
fix
2019-06-13 10:00:06 +03:00
Henry Jameson
d551b39859
fix logged out post-update
2019-06-13 09:48:43 +03:00
Henry Jameson
d1fd3e3a1c
fix user banner
2019-06-13 01:48:41 +03:00
Henry Jameson
edb24da016
fix
2019-06-13 01:02:08 +03:00
Henry Jameson
c8a57ad32e
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
...
* upstream/develop:
Revert "add TOTP/Recovery Form for mobile version"
2019-06-13 00:51:14 +03:00
Henry Jameson
1e94aecbc9
AMERICA
2019-06-13 00:47:06 +03:00
Henry Jameson
6cd4546873
comments
2019-06-13 00:44:25 +03:00
Henry Jameson
af75c6d1ea
No longer sending extra data, renamed some properties
2019-06-13 00:39:51 +03:00
Henry Jameson
77511a5338
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
...
* upstream/develop:
Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
i18n/Update Japanese translation
render modal at the root level using portal
install portal vue
Small improve of the who to follow panel layout
Fix/Small fix in the who to follow page
remove console spam
i18n
wire up user.description with masto api data
i18n/Add Japanese with kanji (2)
move drowdown menu to popper
notification controls: redesign entirely
entity normalizer: collapse data.pleroma if blocks
wire up notification settings
do not miss statusnet_profile_url of mentions
Translation to Hebrew of everything other than theme_helpers and style.
Translate up to settings.
mastoapi login works
2019-06-13 00:07:28 +03:00