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 |
|
Shpuld Shpludson
|
19b5aea081
|
Merge branch 'preserve-follows-followers-visibility-settings' into 'develop'
Set hide_follows and hide_followers settings when parsing Mastodon format
See merge request pleroma/pleroma-fe!873
|
2019-07-07 10:20:55 +00:00 |
|
Eugenij
|
14ec12b4f6
|
Set hide_follows and hide_followers settings when parsing Mastodon format
|
2019-07-07 10:20:55 +00:00 |
|
Shpuld Shpludson
|
e80ed386be
|
Merge branch 'fix-hmr' into 'develop'
fix hot reload always reloading the page
See merge request pleroma/pleroma-fe!874
|
2019-07-07 10:20:36 +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 |
|
Henry Jameson
|
4991e34c49
|
fix hot reload always reloading the page
|
2019-07-06 23:42:03 +03:00 |
|
Egor Kislitsyn
|
9fc9925488
|
Use target from the settings
|
2019-07-06 18:14:19 +07:00 |
|
taehoon
|
bba4b57dd8
|
preserve formatting of content
|
2019-07-05 21:57:48 -04:00 |
|
taehoon
|
c712754150
|
add unit tests
|
2019-07-05 13:38:52 -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
|
d8e210df4d
|
update test for clearTimeline action
|
2019-07-02 15:07:18 -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 |
|
HJ
|
221db9f210
|
Merge branch 'fix-emoji-input' into 'develop'
fix all known problems with clicks on autocomplete emojis
See merge request pleroma/pleroma-fe!857
|
2019-06-25 21:38:45 +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
|
a6bcd56c9f
|
Merge branch 'fix/gallery-margin-fix' into 'develop'
fix specificity that made attachments misalign
See merge request pleroma/pleroma-fe!855
|
2019-06-25 16:30:21 +00: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 |
|
HJ
|
05aec11906
|
Merge branch '591' into 'develop'
Add resolve param to user search api request
Closes #591
See merge request pleroma/pleroma-fe!853
|
2019-06-24 17:31:54 +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
|
79d39356c4
|
Merge branch 'fix/not-all-polls-showing-up' into 'develop'
Fix: problems with polls state
See merge request pleroma/pleroma-fe!849
|
2019-06-22 14:01:36 +00:00 |
|
Shpuld Shpludson
|
947f69a953
|
Fix: problems with polls state
|
2019-06-22 14:01:36 +00:00 |
|
Shpuld Shpludson
|
c2b48c32a2
|
Merge branch 'fix/move-character-counter' into 'develop'
Move character counter into the input box
See merge request pleroma/pleroma-fe!848
|
2019-06-22 13:41:02 +00:00 |
|
Shpuld Shpludson
|
30a340955e
|
Move character counter into the input box
|
2019-06-22 13:41:02 +00:00 |
|
HJ
|
5a8f3dddfd
|
Merge branch 'fix-token-auth-login' into 'develop'
Fix broken token authentication
See merge request pleroma/pleroma-fe!846
|
2019-06-22 07:47:30 +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 |
|