hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3728 commits 4 branches 0 tags 44 MiB
Commit graph

3728 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
feld
114a36c9be Revert "Merge branch 'csp-header' into 'develop'" 
This reverts merge request !856
 2019-07-10 22:30:32 +00:00
HJ
0a7c60c303 Merge branch 'csp-header' into 'develop' 
Add Content-Security-Policy header

See merge request pleroma/pleroma-fe!856
 2019-07-10 18:44:27 +00:00
taehoon
34d95454b3 add csp header to dev server 2019-07-10 13:49:53 -04:00
Shpuld Shpludson
cf2dc5b683 Merge branch '582' into 'develop' 
Refactor user search api, better api error response handling

See merge request pleroma/pleroma-fe!844
 2019-07-10 16:58:49 +00: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
HJ
2f87540612 Merge branch '588' into 'develop' 
Sync the counters in Favs and Repeats view and near the buttons

Closes #588

See merge request pleroma/pleroma-fe!854
 2019-07-09 13:46:06 +00:00
Henry Jameson
abf36dc466 Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop:
  check for user before checking users props
  Set hide_follows and hide_followers settings when parsing Mastodon format
  all the manual fixes
  fix merge conflict
  fix hot reload always reloading the page
  Use target from the settings
  preserve formatting of content
  add unit tests
  update regex for commit hash
  eslint --fix --ext .js,.vue src
  npm eslint --fix .
  Support compositionupdate event to properly show autocomplete popup for IMEs and android
  place scope selector on the left consistently
  hide text format when only plaintext is available
  update test for clearTimeline action
  make sure that user timelines are empty when opening profile page
  clear userId property of timeline by default in clearTimeline action
  Revoke oAuth token
  Update oc.json
 2019-07-08 09:06:20 +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
HJ
6b4fe1c2d9 Merge branch 'fix/console-errors-with-reply-filter' into 'develop' 
Fix console errors in status.js

See merge request pleroma/pleroma-fe!875
 2019-07-07 23:27:46 +00: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
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