Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2185 commits 59 branches 16 tags 15 MiB
Commit graph

2185 commits

This branch
This branch
All branches
Author SHA1 Message Date
lambda
d367ca9290 Merge branch 'fix/user-timeline-again' into 'develop' 
Fix user TL getting stuck again

See merge request pleroma/pleroma-fe!487
 2019-01-28 18:52:47 +00:00
Shpuld Shpludson
b0b6ebee17 Merge branch 'rename-service-worker' into 'develop' 
Rename service worker to not clash with mastodon sw.

See merge request pleroma/pleroma-fe!486
 2019-01-28 18:20:27 +00:00
shpuld
ca78623b34 fix user tl clearing and give it a test 2019-01-28 20:15:00 +02:00
lain
2ce6fba2ba Rename service worker to not clash with mastodon sw. 2019-01-28 18:03:24 +01:00
shpuld
51024a2c8a Merge branch 'develop' into feat/media-modal 2019-01-28 19:02:46 +02:00
lambda
bb2ee04f04 Merge branch 'fix/dont-fetch-favorites-for-others' into 'develop' 
fix/don't fetch favs if the profile isnt current user

See merge request pleroma/pleroma-fe!484
 2019-01-28 16:22:03 +00:00
lambda
53712c1570 Merge branch 'fix/add-back-login-error' into 'develop' 
Fix/add back login error

See merge request pleroma/pleroma-fe!485
 2019-01-28 16:21:33 +00:00
shpuld
4d3907b86a Formatting 2019-01-28 17:48:00 +02:00
shpuld
1b76a5a9ea Add back that login error thing that someone removed 2019-01-28 17:43:51 +02:00
shpuld
82ef57cd59 dont fetch favs if profile isnt us 2019-01-28 16:59:01 +02:00
lambda
3b1cafc19f Merge branch 'fix/fix-warnings' into 'develop' 
Fix annoying console warnings

See merge request pleroma/pleroma-fe!480
 2019-01-28 10:52:24 +00:00
shpuld
96c36af731 refactor the FE parts 2019-01-28 05:50:12 +00:00
William Pitcock
2b86f6e883 status: only show link preview in main post view 2019-01-28 05:50:12 +00:00
William Pitcock
0924907c64 add link-preview component 2019-01-28 05:50:12 +00:00
William Pitcock
b27ec058ca entity normalizer: add support for opengraph cards 2019-01-28 05:50:12 +00:00
Shpuld Shpludson
2585dfa4c2 Merge branch 'develop' into 'develop' 
Add Dutch translation

See merge request pleroma/pleroma-fe!482
 2019-01-28 04:32:55 +00:00
Shpuld Shpludson
8258c8b3f0 Merge branch 'fix-chat' into 'develop' 
Properly handle websocket token (fixes chat).

See merge request pleroma/pleroma-fe!483
 2019-01-27 20:49:09 +00:00
lain
e4303da372 Properly handle websocket token (fixes chat). 2019-01-27 21:38:33 +01:00
spctrl
d40a2f0429 Add Dutch translation 2019-01-27 19:44:17 +01:00
Shpuld Shpludson
6e945ee14b Merge branch 'fix/following-status-on-usercard' into 'develop' 
Fix follow-button on usercard not showing following status correctly

See merge request pleroma/pleroma-fe!479
 2019-01-27 14:14:59 +00:00
shpuld
b9142e6fac Move following to qvitter only space 2019-01-27 16:10:55 +02:00
shpuld
20f113e811 Remove logs 2019-01-27 11:35:29 +02:00
shpuld
ff5f5095df Fix replies to deleted posts/users pushing vue warnings 2019-01-27 11:31:23 +02:00
shpuld
2d94a49798 Fix registration path warning and translation warnings 2019-01-27 11:13:32 +02:00
shpuld
4c9f3b946d Add forgotten prop to entity normalizer 2019-01-27 08:42:34 +02:00
Shpuld Shpludson
b7c13fd4b4 Merge branch 'feat/better-perf-side-drawer-anim' into 'develop' 
use translate over margin animation (stupid me)

See merge request pleroma/pleroma-fe!478
 2019-01-27 06:32:21 +00:00
shpuld
474fbf6bf4 use translate over margin animation (stupid me) 2019-01-27 08:27:41 +02:00
Shpuld Shpludson
b82ba54add Merge branch 'feature/media-timeline' into 'develop' 
media timeline

See merge request pleroma/pleroma-fe!472
 2019-01-26 21:11:02 +00:00
shpuld
676acdbf82 Add default config for new options, fix firefox inline playing 2019-01-26 17:59:59 +02:00
shpuld
0ab828bb30 Merge develop and fix conflict 2019-01-26 17:50:41 +02:00
shpuld
3978aaef84 Redo everything in the MR 2019-01-26 17:45:03 +02:00
William Pitcock
efad3ad0a5 attempt to fix tests 2019-01-26 13:51:07 +00:00
William Pitcock
7b296696a3 user profile: add media timeline 2019-01-26 13:49:24 +00:00
William Pitcock
dbe0205a9c api service: add the ability to fetch a media-only timeline 2019-01-26 13:49:24 +00:00
HJ
8197c77f75 Merge branch 'hotifx-convos' into 'develop' 
Fix ordering in convos

See merge request pleroma/pleroma-fe!477
 2019-01-25 15:00:06 +00:00
Henry Jameson
9f914824cb i should take it easy 2019-01-25 17:55:56 +03:00
HJ
a733a33d36 Merge branch 'hotfix-broken-convos' into 'develop' 
Hotfix broken convos

See merge request pleroma/pleroma-fe!476
 2019-01-25 13:29:24 +00:00
Henry Jameson
eb33951186 hotfix 2019-01-25 16:24:41 +03:00
lambda
28d1571530 Merge branch 'hotfix/summary-html' into 'develop' 
entity normalizer: provide summary_html property

See merge request pleroma/pleroma-fe!475
 2019-01-25 10:10:27 +00:00
William Pitcock
5e68161d91 entity normalizer: provide summary_html property 
Mastodon API returns HTML always in spoiler_text, while TwitterAPI sends both a
text version as well as an HTML version of the message subject, which we started
to use when we allowed custom emoji in message subjects.
 2019-01-25 10:05:19 +00:00
Henry Jameson
f48e3d0db8 quickfix 2019-01-25 01:39:19 +03:00
HJ
63df815dd9 Merge branch 'fixSortingSequentials' into 'develop' 
Fix TL sorting

See merge request pleroma/pleroma-fe!474
 2019-01-24 22:16:26 +00:00
Henry Jameson
9d0d6b86c8 this attempts converting id to number to sort them numerically, since "99" > 
"100" while 99 < 100
 2019-01-25 01:08:08 +03:00
HJ
03ffa7e84e Merge branch 'fix-custom-nsfw-image' into 'develop' 
fix custom nsfwCensorImage not working

See merge request pleroma/pleroma-fe!469
 2019-01-24 18:13:07 +00:00
HJ
8b7faa8106 Merge branch 'favorites-fixes' into 'develop' 
fix reply-to tooltip being somewhat unreliable

See merge request pleroma/pleroma-fe!473
 2019-01-24 18:05:09 +00:00
Henry Jameson
f38da239d9 "spring" cleaning 2019-01-24 21:03:13 +03:00
Henry Jameson
416424d048 review 2019-01-24 20:27:20 +03:00
Shpuld Shpludson
3492ab6697 Merge branch 'fix-who-to-follow-panel-shuffling' into 'develop' 
Fix who to follow panel shuffling

See merge request pleroma/pleroma-fe!470
 2019-01-24 15:17:35 +00:00
Hakaba Hitoyo
efa0c85ac0 Fix who to follow panel shuffling 2019-01-24 15:17:35 +00:00
HJ
9305dad005 Merge branch 'fix/hide-network-setting' into 'develop' 
Always send "hide_network" when updating user profile

See merge request pleroma/pleroma-fe!471
 2019-01-24 12:15:46 +00:00