aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-04-09
|\ | | | | | | issue-436-mastoapi-notifications
| * Merge branch '486-expand-button' into 'develop'Shpuld Shpludson2019-04-09
| |\ | | | | | | | | | | | | | | | | | | #486 - remove expand button on conversation page Closes #486 See merge request pleroma/pleroma-fe!742
| | * #486 - remove expand button on conversation pagejared2019-04-09
| | |
| * | Merge branch 'fix/prevent-repeated-fetching' into 'develop'Shpuld Shpludson2019-04-09
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | #485 Prevent repeated fetching Closes #485 See merge request pleroma/pleroma-fe!738
| | * | fix small bugjasper2019-04-09
| | | |
| | * | Add await to login befor redirect to friends timelinejasper2019-04-09
| | | |
| | * | Prevent repeated fetchingjasper2019-04-09
| | | |
| * | | Merge branch 'fix/notification-bugs' into 'develop'Shpuld Shpludson2019-04-09
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | #474 Fix notification bugs Closes #474 See merge request pleroma/pleroma-fe!728
| | * | Add spacejasper2019-04-04
| | | |
| | * | Separate timeline and notificationjasper2019-04-04
| | | |
| | * | Remove useless codesjasper2019-04-03
| | | |
| | * | Fix notification bugsjasper2019-04-03
| | | |
* | | | #436 - merge developdave2019-04-08
|\| | |
| * | | Merge branch 'moderation-menu' into 'develop'Shpuld Shpludson2019-04-08
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Moderation menu #310 See merge request pleroma/pleroma-fe!595
| | * | | Added moderation menueugenijm2019-04-01
| | |/ /
* | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-04-08
|\| | | | | | | | | | | | | | | issue-436-mastoapi-notifications
| * | | remove debug messageMaksim2019-04-08
| | |/ | |/|
| * | #469 - update text copydave2019-04-02
| | |
| * | #469 - update behavior of safe_dmdave2019-04-02
| | |
| * | #469 - clean updave2019-04-02
| | |
| * | #469 - DM warning text should vary based on BE settingdave2019-04-02
| |/
* | #436 - revert stripe html for notificationdave2019-04-03
| |
* | #436 - notification html to text contentdave2019-04-03
| |
* | #436 - revert notification silience configdave2019-04-03
| |
* | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-04-02
|\| | | | | | | issue-436-mastoapi-notifications
| * Merge branch 'feature/mobile-improvements-3' into 'develop'Shpuld Shpludson2019-04-01
| |\ | | | | | | | | | | | | Mobile notifications in nav bar, separate mobile navbar to its own component See merge request pleroma/pleroma-fe!703
| | * fix conflictshpuld2019-04-01
| | |\
| | * \ Merge branch 'develop' into feature/mobile-improvements-3shpuld2019-04-01
| | |\ \
| | * | | remove window width copypastashpuld2019-04-01
| | | | |
| | * | | add gesture to close notifications drawershpuld2019-03-28
| | | | |
| | * | | Merge branch 'develop' into feature/mobile-improvements-3shpuld2019-03-28
| | |\ \ \
| | * \ \ \ merge develop inshpuld2019-03-23
| | |\ \ \ \
| | * | | | | make notifications close on navigationshpuld2019-03-23
| | | | | | |
| | * | | | | make mobile notifs drawer more like an actual drawer, make mobile nav ↵shpuld2019-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | buttons bigger to press, fix alert dot
| | * | | | | remove notifications from sidebar, make notifications appear on login onlyshpuld2019-03-14
| | | | | | |
| | * | | | | make nav bar slide, move mobile post status to mobile navshpuld2019-03-14
| | | | | | |
| | * | | | | merge develop, add mobile nav componentshpuld2019-03-12
| | |\ \ \ \ \
| | * | | | | | more work with notifications drawershpuld2019-03-03
| | | | | | | |
| | * | | | | | start working on one tap notificationsshpuld2019-03-02
| | | | | | | |
| * | | | | | | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-04-01
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | [i18n] Update oc.json for !611 and !691 See merge request pleroma/pleroma-fe!712
| | * | | | | | Update oc.json for !611 and !691Exilat2019-03-27
| | | | | | | |
| * | | | | | | Merge branch 'fix/sending-requests-when-loading' into 'develop'Shpuld Shpludson2019-04-01
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #463 Add Promise.all to send requests when loading Closes #463 See merge request pleroma/pleroma-fe!723
| | * | | | | | | Fix login handlingjasper2019-04-01
| | | | | | | | |
| | * | | | | | | Add Promise.all to send requests when loadingjasper2019-04-01
| | | | | | | | |
| * | | | | | | | Merge branch 'patch-2' into 'develop'Shpuld Shpludson2019-04-01
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Update Polish translation See merge request pleroma/pleroma-fe!719
| | * | | | | | | Update Polish translationMarcin Mikołajczak2019-03-31
| | |/ / / / / /
| * | | | | | | Merge branch '471-timeline-since-id' into 'develop'Shpuld Shpludson2019-04-01
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #471 - fix timeline fetch with since_id Closes #471 See merge request pleroma/pleroma-fe!722
| | * | | | | | | #471 - fix timeline fetch with since_idjared2019-04-01
| | | | | | | | |
| * | | | | | | | Merge branch 'minimal-scopes-mode' into 'develop'HJ2019-04-01
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode See merge request pleroma/pleroma-fe!633
| | * | | | | | | | final touchesHenry Jameson2019-03-30
| | | | | | | | | |