aboutsummaryrefslogtreecommitdiff
path: root/src/modules
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into feature/mobile-improvements-3shpuld2019-04-01
|\
| * 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 remote-tracking branch 'upstream/develop' into minimal-scopes-modeHenry Jameson2019-03-30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (173 commits) Fix: Change condition fix typo update store according to retweeted status #433 - update sort by for conversation display replies_count right after reply icon expose replies_count from mastodon api Apparently, MastoAPI gives status in ancestors if you try opening a repeat... make side drawer use gesture service and fix its animations review/remove error hiding errata review #433 - sort conversation for retweets and clean up Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' Remove console log Fix warnings in user profile routing Add tests for gesture service, fix bug with perpendicular directions #255 - clean up autocomplete form #255 - clean up user settings page with self-closing html tags ...
| | * Merge branch 'issues/#465' into 'develop'Shpuld Shpludson2019-03-29
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | update store according to retweeted status Closes #465 See merge request pleroma/pleroma-fe!713
| | | * update store according to retweeted statusBrenden Bice2019-03-28
| | | |
| * | | Initial work on deprecating scopeModesEnabled in favor of minimalScopeModeHenry Jameson2019-03-03
| | | |
* | | | Merge branch 'develop' into feature/mobile-improvements-3shpuld2019-03-28
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'upstream/develop' into mastoapi/actionsHenry Jameson2019-03-27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: errata review Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' correctly paginate on MastoAPI #442 - update placeholder linebreak #442 - clean up Bio placeholder text wip support for follower/following, a bit broken and with regression switch direct messages to mastoapi switch public and TWKN to MastoAPI undo this change since BE returns empty object for relationship, add in a separate MR updates normalizer for proper user handling and adds support for friends tl via mastoapi
| | * | | errataHenry Jameson2019-03-27
| | | | |
| | * | | reviewHenry Jameson2019-03-27
| | | | |
| | * | | correctly paginate on MastoAPIHenry Jameson2019-03-25
| | | |/ | | |/|
| * | | Merge remote-tracking branch 'upstream/develop' into mastoapi/actionsHenry Jameson2019-03-25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (87 commits) review Update attachment normalizer Add fallback for attachments uploaded via the other platforms Get correct mimetype through entity_normalizer Set default parameter Switch to mastoapi for posting status and uploading media Revert changes prevent text pasting if image is pasted remove border radius of suggested emojis #450 - dispatch login after saved state is loaded #448 - fix timeline fetch error when status text is null #451 - add class to username span No need to fetch mutes on load anymore 🙌 switch to mastoapi switch to mastoapi masto api sends muted property now No need to fetch user data using old api anymore 🎉 Switch to mastoapi reactivity fixes less hackery, more direct usage of mastoapi ...
| | * | Merge remote-tracking branch 'upstream/develop' into mastoapi/convosHenry Jameson2019-03-25
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (34 commits) Update attachment normalizer Add fallback for attachments uploaded via the other platforms Get correct mimetype through entity_normalizer Set default parameter Switch to mastoapi for posting status and uploading media Revert changes prevent text pasting if image is pasted remove border radius of suggested emojis #450 - dispatch login after saved state is loaded #448 - fix timeline fetch error when status text is null #451 - add class to username span No need to fetch mutes on load anymore 🙌 switch to mastoapi switch to mastoapi masto api sends muted property now No need to fetch user data using old api anymore 🎉 Switch to mastoapi Add comment Reset statusnet_blocking of all fetched users first while refreshing block list Add hideMutedPosts setting and wire up to post-returning endpoints ...
| | | * | Revert changestaehoon2019-03-24
| | | | |
| | | * | No need to fetch mutes on load anymore 🙌taehoon2019-03-21
| | | | |
| | | * | switch to mastoapitaehoon2019-03-21
| | | | |
| | | * | switch to mastoapitaehoon2019-03-21
| | | | |
| | | * | masto api sends muted property nowtaehoon2019-03-21
| | | | |
| | | * | No need to fetch user data using old api anymore 🎉taehoon2019-03-21
| | | | |
| | | * | Add commenttaehoon2019-03-21
| | | | |
| | | * | Reset statusnet_blocking of all fetched users first while refreshing block listtaehoon2019-03-21
| | | | |
| | | * | Add hideMutedPosts setting and wire up to post-returning endpointstaehoon2019-03-21
| | | | |
| | | * | Add todo commenttaehoon2019-03-21
| | | | |
| | | * | Reset old mutes state after fetching new mutes datataehoon2019-03-21
| | | | |
| | | * | Remove old muting logictaehoon2019-03-21
| | | | |
| | | * | Fetct full data of muted users after fetchMutes api calltaehoon2019-03-21
| | | | |
| | | * | Add mute/unmute mutationstaehoon2019-03-21
| | | | |
| | | * | Add mute/unmute featrue and mutes management tabtaehoon2019-03-21
| | | | |
| | * | | reactivity fixesHenry Jameson2019-03-22
| | |/ /
| * | | basic user and status actions implementedHenry Jameson2019-03-10
| | | |
* | | | merge develop inshpuld2019-03-23
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'feature/version-info' into 'develop'Shpuld Shpludson2019-03-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new tab to display versions of BE/FE Closes #397 See merge request pleroma/pleroma-fe!671
| | * \ \ Merge branch 'develop' into feature/version-infoEdijs2019-03-13
| | |\ \ \
| | * | | | Added new tab to display versions of BE/FEEdijs2019-03-10
| | | |/ / | | |/| |
| * | | | Merge branch 'mastoapi/user-stuff' into 'develop'HJ2019-03-15
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Transition to MastoAPI: user data See merge request pleroma/pleroma-fe!655
| | * | | fix flake id users not fetching correctlyHenry Jameson2019-03-14
| | | | |
| | * | | fix console errorHenry Jameson2019-03-14
| | | | |
| | * | | レインせんぱいにサンキューHenry Jameson2019-03-12
| | | | |
| | * | | instead of filtering nulls, let's just not have them in the first placeHenry Jameson2019-03-11
| | | | |
| | * | | fixed tests, review fixes, now storing local users with downcase screen name forHenry Jameson2019-03-11
| | | | | | | | | | | | | | | | | | | | better compatibility
| | * | | fix reply-to marker, also whoops console logHenry Jameson2019-03-09
| | | | |
| | * | | revert some stuff, turns out it's actually breaking. Fixed some local user ↵Henry Jameson2019-03-09
| | | | | | | | | | | | | | | | | | | | things
| | * | | Since BE doesn't support fetching user by screen name over MastoAPI we'll gonnaHenry Jameson2019-03-08
| | | | | | | | | | | | | | | | | | | | just fetching it over QvitterAPI real quick :DDDDDDDDD
| | * | | Partially transitioned user data to MastoAPI. Added support for fetchingHenry Jameson2019-03-08
| | |/ / | | | | | | | | | | | | | | | | relationship data. Upgraded code to be more resilient to nulls caused by missing data in either APIs
* | | | merge develop, add mobile nav componentshpuld2019-03-12
|\| | |
| * | | Merge branch 'develop' into 'develop'lambda2019-03-11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only connect to chat upon authenticating Closes #403 See merge request pleroma/pleroma-fe!666
| | * | | Only connect to chat when authenticating in the first placeslice2019-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | To avoid duplication of the connection, the chat socket is destroyed upon logging out.
| | * | | Check for websocket token before connecting to chatslice2019-03-10
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Closes #403. Previously, a socket to the chat channel would be opened if chat is enabled, regardless if the user is logged in or not. This patch only allows a connection to be opened if a wsToken (websocket token) is present, which prevents websocket errors from unauthenticated users.
| * / / Make minId reset with minVisibleId to prevent gaps when showing newshpuld2019-03-10
| |/ /