aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into feat/media-modalshpuld2019-01-28
|\
| * Merge branch 'fix/dont-fetch-favorites-for-others' into 'develop'lambda2019-01-28
| |\ | | | | | | | | | | | | fix/don't fetch favs if the profile isnt current user See merge request pleroma/pleroma-fe!484
| | * dont fetch favs if profile isnt usshpuld2019-01-28
| | |
| * | Merge branch 'fix/add-back-login-error' into 'develop'lambda2019-01-28
| |\ \ | | | | | | | | | | | | | | | | Fix/add back login error See merge request pleroma/pleroma-fe!485
| | * | Formattingshpuld2019-01-28
| | | |
| | * | Add back that login error thing that someone removedshpuld2019-01-28
| |/ /
| * | Merge branch 'fix/fix-warnings' into 'develop'lambda2019-01-28
| |\ \ | | | | | | | | | | | | | | | | Fix annoying console warnings See merge request pleroma/pleroma-fe!480
| | * | Remove logsshpuld2019-01-27
| | | |
| | * | Fix replies to deleted posts/users pushing vue warningsshpuld2019-01-27
| | | |
| | * | Fix registration path warning and translation warningsshpuld2019-01-27
| | | |
| * | | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-01-28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add Dutch translation See merge request pleroma/pleroma-fe!482
| | * | | Add Dutch translationspctrl2019-01-27
| | | | |
| * | | | Merge branch 'fix-chat' into 'develop'Shpuld Shpludson2019-01-27
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Properly handle websocket token (fixes chat). See merge request pleroma/pleroma-fe!483
| | * | | Properly handle websocket token (fixes chat).lain2019-01-27
| |/ / /
| * | | Merge branch 'fix/following-status-on-usercard' into 'develop'Shpuld Shpludson2019-01-27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix follow-button on usercard not showing following status correctly See merge request pleroma/pleroma-fe!479
| | * | | Move following to qvitter only spaceshpuld2019-01-27
| | | | |
| | * | | Add forgotten prop to entity normalizershpuld2019-01-27
| | | |/ | | |/|
| * | | Merge branch 'feat/better-perf-side-drawer-anim' into 'develop'Shpuld Shpludson2019-01-27
| |\ \ \ | | |/ / | |/| | | | | | | | | | use translate over margin animation (stupid me) See merge request pleroma/pleroma-fe!478
| | * | use translate over margin animation (stupid me)shpuld2019-01-27
| |/ /
| * | Merge branch 'feature/media-timeline' into 'develop'Shpuld Shpludson2019-01-26
| |\ \ | | |/ | |/| | | | | | | media timeline See merge request pleroma/pleroma-fe!472
| | * attempt to fix testsWilliam Pitcock2019-01-26
| | |
| | * user profile: add media timelineWilliam Pitcock2019-01-26
| | |
| | * api service: add the ability to fetch a media-only timelineWilliam Pitcock2019-01-26
| |/
* | Add default config for new options, fix firefox inline playingshpuld2019-01-26
| |
* | Merge develop and fix conflictshpuld2019-01-26
|\|
| * Merge branch 'hotifx-convos' into 'develop'HJ2019-01-25
| |\ | | | | | | | | | | | | Fix ordering in convos See merge request pleroma/pleroma-fe!477
| | * i should take it easyHenry Jameson2019-01-25
| |/
| * Merge branch 'hotfix-broken-convos' into 'develop'HJ2019-01-25
| |\ | | | | | | | | | | | | Hotfix broken convos See merge request pleroma/pleroma-fe!476
| | * hotfixHenry Jameson2019-01-25
| | |
| * | Merge branch 'hotfix/summary-html' into 'develop'lambda2019-01-25
| |\ \ | | |/ | |/| | | | | | | entity normalizer: provide summary_html property See merge request pleroma/pleroma-fe!475
| | * entity normalizer: provide summary_html propertyWilliam Pitcock2019-01-25
| | | | | | | | | | | | | | | | | | 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.
| * | quickfixHenry Jameson2019-01-25
| | |
| * | Merge branch 'fixSortingSequentials' into 'develop'HJ2019-01-24
| |\ \ | | |/ | |/| | | | | | | Fix TL sorting See merge request pleroma/pleroma-fe!474
| | * this attempts converting id to number to sort them numerically, since "99" >Henry Jameson2019-01-25
| |/ | | | | | | "100" while 99 < 100
| * Merge branch 'fix-custom-nsfw-image' into 'develop'HJ2019-01-24
| |\ | | | | | | | | | | | | fix custom nsfwCensorImage not working See merge request pleroma/pleroma-fe!469
| | * "spring" cleaningHenry Jameson2019-01-24
| | |
| | * fix custom nsfwCensorImage not workingHenry Jameson2019-01-23
| | |
| * | Merge branch 'favorites-fixes' into 'develop'HJ2019-01-24
| |\ \ | | | | | | | | | | | | | | | | fix reply-to tooltip being somewhat unreliable See merge request pleroma/pleroma-fe!473
| | * | reviewHenry Jameson2019-01-24
| | | |
| | * | fix reply-to tooltip being somewhat unreliableHenry Jameson2019-01-23
| | |/
| * | Merge branch 'fix-who-to-follow-panel-shuffling' into 'develop'Shpuld Shpludson2019-01-24
| |\ \ | | | | | | | | | | | | | | | | Fix who to follow panel shuffling See merge request pleroma/pleroma-fe!470
| | * | Fix who to follow panel shufflingHakaba Hitoyo2019-01-24
| |/ /
| * | Merge branch 'fix/hide-network-setting' into 'develop'HJ2019-01-24
| |\ \ | | |/ | |/| | | | | | | Always send "hide_network" when updating user profile See merge request pleroma/pleroma-fe!471
| | * Always send "hide_network" when updating user profileMaxim Filippov2019-01-23
| |/
| * Revert "fix reply-to tooltip being somewhat unreliable"HJ2019-01-22
| | | | | | This reverts commit 66dc72deb2b4b518ba09b984d792be57451c4bfc
| * fix reply-to tooltip being somewhat unreliableHenry Jameson2019-01-23
| |
| * fix errors in consoleHenry Jameson2019-01-22
| |
| * Merge branch 'favorites' into 'develop'HJ2019-01-22
| |\ | | | | | | | | | | | | | | | | | | Add Favorites TL to user profile, add some initial support for MastoAPI Closes #265 and #262 See merge request pleroma/pleroma-fe!462
| | * lintingHenry Jameson2019-01-22
| | |
| | * update test namesHenry Jameson2019-01-22
| | |