aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
|/
* 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
| |
| * confusionHenry Jameson2019-01-21
| |
| * better handling of attachmentsHenry Jameson2019-01-21
| |
| * support for extended fields (for future, doesn't work yet), fix reply bugHenry Jameson2019-01-19
| |
| * more fields for usersHenry Jameson2019-01-17
| |
| * some more post fieldsHenry Jameson2019-01-17
| |
| * support for CW/Subject. fix replies.Henry Jameson2019-01-17
| |
| * removing unnecessary conversions since it should already be converted in ↵Henry Jameson2019-01-17
| | | | | | | | normalizer
| * fix indentsHenry Jameson2019-01-17
| |
| * some consistencyHenry Jameson2019-01-17
| |
| * localization stringsHenry Jameson2019-01-17
| |
| * add support for tab-switcher to automatically switch to first tab if asked indexHenry Jameson2019-01-17
| | | | | | | | is invalid
| * fix login and favorites tab...Henry Jameson2019-01-17
| |
| * Revert "some initial work to make it possible to use "unregistered" ↵Henry Jameson2019-01-17
| | | | | | | | | | | | | | | | timelines, i.e. not" and some stuff to make favorites still work This reverts commit 039a4074006fb91ac9031b41b4e9af4a15766dfa.
| * forgot the fileHenry Jameson2019-01-17
| |
| * tests for the tests god! bugfixes for bugfixes throne!Henry Jameson2019-01-17
| |
| * consistency in tests tooHenry Jameson2019-01-17
| |