Commit Graph

801 Commits (9587c6dac1b40ff07eb421b62010fbd98343a4d9)

Author SHA1 Message Date
shpuld 46f23b7de7 Add an option to automatically show new posts when scrolled to the top, also add fade-in animation for posts.
7 years ago
Henry Jameson c18aace3da imo this looks ugly, compared to general timeline appearance
7 years ago
Henry Jameson 46765d5c1a some fixes towards how conversations appear
7 years ago
Henry Jameson 6a44d1c9ac small shadows + show placeholder for empty panel body
7 years ago
Henry Jameson ec55d49b88 kiinteät venytetyt tunteet
7 years ago
Henry Jameson cbab830d8a fixes fullscreen video having borders and border-radius in firefox
7 years ago
shpuld c682a4b007 Don't add notification on self mention, (and fix that pesky pleroma vs gs delete bug)
7 years ago
Henry Jameson 4cf580ee31 moved notification asking from page load to login event. Added image in
7 years ago
Henry Jameson 3dc375f442 initial implementation for desktop notifications
7 years ago
shpuld 8745fd4bdf please the linter
7 years ago
shpuld 07dc195234 Add a hack to a hack to make it look much less hacky.
7 years ago
Aka 1390513de0 Adds Portuguese translation
7 years ago
Roger Braun b19fe6e004 Update french translation.
7 years ago
shpuld 72806b4a99 Check if logged-in when rendering the block button.
7 years ago
Shpuld Shpludson 56a0665b2f Merge branch 'fix/pleromabe-is-other-user' into 'develop'
7 years ago
lambda 9913601080 Merge branch 'feature/timeago-locales' into 'develop'
7 years ago
eal 26416ed15c Revert to English timeago for latin script languages.
7 years ago
shpuld d2ef145115 Don't show repeats that have been shown already.
7 years ago
lambda bbd80c54bf Merge branch 'ro-translation' into 'develop'
7 years ago
Roger Braun 80ccc2ac27 Add spanish translation.
7 years ago
Tibike 510015b044 Corrected the const en to const ro for romanian
7 years ago
Tibike e8f325f345 Added romanian translations
7 years ago
Tibike b35ef607c4 Added missing hungarinan translations
7 years ago
lambda 0c2f343a66 Merge branch 'fix/i18n-mentions-timeline-title' into 'develop'
7 years ago
lambda 241fcd12f5 Merge branch 'feature/timeago-locales' into 'develop'
7 years ago
Shpuld Shpludson 421221997f Make mentions-timeline use i18n.
7 years ago
eal ceb13a6405 Add timeago locales.
7 years ago
lambda 3cad733593 Merge branch 'develop' into 'develop'
7 years ago
lambda 5322f90c15 Merge branch 'fix/attachment-fixes' into 'develop'
7 years ago
eal be943445e9 Fix isOtherUser on pleroma-be
7 years ago
obrez bce37767f2 Update Estonian translation
7 years ago
naf 26d27165d6 add japanese translation
7 years ago
shpuld 0e716e3cd9 Fix oembeds from overflowing on Firefox, fix video border color as well as vertical size.
7 years ago
Roger Braun 23d1354046 Update polandish.
7 years ago
lambda 7d84147500 Merge branch 'fix/missing-localization-strings' into 'develop'
7 years ago
shpuld 4d5782b51f Fix conflict
7 years ago
lambda 83297aba15 Merge branch 'develop' into 'develop'
7 years ago
obrez a7b2d76347 Add Estonian translation
7 years ago
shpuld 191bbe76a8 Add a bunch of missed localization strings, update english and finnish to match.
7 years ago
shpuld 176421163b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/polish-user-finder-and-nav-buttons
7 years ago
shpuld bfa04bfb11 Hide overflowing elements when userfinder is active. Don't scroll on button presses. Make buttons slightly bigger and more spaced out.
7 years ago
Roger Braun 5dca57cc05 Add Polish translation.
7 years ago
Roger Braun 62a3c63082 Unify statuses/notices.
7 years ago
Roger Braun cadd42c1b2 Merge branch 'develop' into tibike/pleroma-fe-hu-translation
7 years ago
Roger Braun c65974c8c8 Fix typo.
7 years ago
Roger Braun 483fef731a Fix typo.
7 years ago
Roger Braun 32cb5e1a48 Add italian translation.
7 years ago
Roger Braun 38bd0dbfcd Add french translation.
7 years ago
Tibike d6c89a9c09 Added Hungarian translation
7 years ago
eal 608d1e6776 Add blocks.
7 years ago
lambda 7ab7ac7be6 Merge branch 'feature/ger-translation' into 'develop'
7 years ago
Roger Braun 5cf972b348 Update ja translation.
7 years ago
Sebastian Huebner 0320f03cd2
make linter happy
7 years ago
Sebastian Huebner 8a3118d1a7 added ger translation
7 years ago
Roger Braun 33ad62bf72 Japanese is ja.
7 years ago
Roger Braun 71395ebca2 Add japanese translation.
7 years ago
Shpuld Shpludson f89f120c44 Add fi to localization.
7 years ago
Roger Braun 74b513122e Set locale from browser settings.
7 years ago
Roger Braun 7516cd859f Prepare for i18n.
7 years ago
lambda 81b0849889 Merge branch 'fix/friendica-html' into 'develop'
7 years ago
Shpuld Shpuldson acde0b316c Changes inside status html: restrict image/video sizes, make blockquotes waste less space.
7 years ago
eal 784eb8426c Send credentials when fetching remote profile.
7 years ago
lambda fb8b625d9a Merge branch 'fix/stop-inappropriate-scroll-auto-fetch' into 'develop'
7 years ago
Shpuld Shpuldson f897c656fc Also disable select on buttons
7 years ago
Shpuld Shpuldson 10bc83018c Deregister scroll listener properly, only fetch more if timeline is visible.
7 years ago
Shpuld Shpuldson 226f435a17 Add user-select: none to i elements.
7 years ago
eal ba9b04a8ba Use the API endpoint for emoji completion.
7 years ago
eal 447ec91176 Actually actually fix image url.
7 years ago
eal f4b1319eff Actually fix image url.
7 years ago
eal 70d66c48ad Fix image url.
7 years ago
eal 2162ef20b0 Add emoji completion.
7 years ago
eal c96a7b582b Remove another cache file.
7 years ago
eal 59f07c0704 Remove cache file.
7 years ago
eal 9abfcb34ef Add tag timeline view.
7 years ago
lambadalambda 3eaaa4c16d Merge branch 'fix/set-cookie' into 'develop'
7 years ago
lambadalambda 7abcb13ec0 Merge branch 'feature/login-with-cookie' into 'develop'
7 years ago
lambadalambda c6b909570a Merge branch 'fix/upload-buttons-clickable' into 'develop'
7 years ago
eal 5e6ffc0e45 Make user finder more pleasant.
7 years ago
eal 8a51bc6e22 Fix hide and cancel buttons on chromium
7 years ago
eal 298bf5cfca Revert "Include cookie in every request"
7 years ago
Roger Braun 8b4f59e1f7 Try logging in with the existing cookie.
7 years ago
eal 00589a9af1 Include cookie in every request
7 years ago
eal 2b0811dddc Make sure options exists every time on fetch()
7 years ago
eal 522110c0bc Set cookies on fetch
7 years ago
eal 587cd7bcfa Fix 'Statuses' being different color
7 years ago
eal ad6d0a1f0c Move the cog to avatar height
7 years ago
Shpuld Shpuldson 87b18da811 Merge branch 'fix/pleromabe-follow-notifs' into 'develop'
7 years ago
eal 5bd6abc134 Add regex for follows from pleromabe
7 years ago
Shpuld Shpuldson 7061675e96 whoops lint
7 years ago
Shpuld Shpuldson c6798864d4 Add an X icon to clear error message from post status form, hack to allow posting empty statuses if they have attachments
7 years ago
Shpuld Shpuldson bf61592b56 Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict.
7 years ago
Shpuld Shpuldson 2bc261afba Merge branch 'feature/follow-lists' into 'develop'
7 years ago
eal e1ec01dc3e Appease linter.
7 years ago
eal ccfc2e57d0 Add follower and following views
7 years ago
lambadalambda 5a1ad84092 Merge branch 'fix/check-if-follow-notif-matches-self' into 'develop'
7 years ago
lambadalambda e5d0965ff1 Merge branch 'fix/user-card-changes-and-fixes' into 'develop'
7 years ago
Shpuld Shpuldson 6ad5052044 Make pic bigger and remove border and add shadow, make screen name white again, make cog appear only in sidepanel.
7 years ago
Shpuld Shpuldson 2ef915c9f1 Don't allow posting again while previous hasn't returned
7 years ago
Shpuld Shpuldson 3d9d59915b Add regex to check if you're the one being followed before adding notification.
7 years ago
eal 4291263cec Add link to profile on usercard avatar and @handle
7 years ago
Shpuld Shpuldson b5e5a8d1e3 Use _original profile pic instead of the 48x48 thumbnail in the user card content.
7 years ago
Shpuld Shpuldson d3169b057c Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts.
7 years ago
Shpuld Shpuldson dbf2f1621e Adjust the clickable area of notif avatar to not contain everything below it, adjust the status avatar to not have ghost border on top/right
7 years ago
Shpuld Shpuldson 42fb65e274 Add error message in post status form when failing to post and don't get rid of post/attachments when failing.
7 years ago
lambadalambda fb3408d64f Merge branch 'feature/profile-editing' into 'develop'
7 years ago
Shpuld Shpuldson 1136db24cc Fix issue with trying to match() on undefined
7 years ago
Shpuld Shpuldson 052befa581 fix the very annoying thing where favs from pleromabe would not generate notifs when on GS
7 years ago
Shpuld Shpuldson 9503b8fa41 Remove the profile pic change from the old settings menu since it's in the new profile edit menu.
7 years ago
Shpuld Shpuldson 1526b4560c Clean up to have much less redundant code.
7 years ago
Shpuld Shpuldson 2084c92dff Force user profile timeline update when the user id changes (like when another user has been searched/found).
7 years ago
Shpuld Shpuldson 6d7d173e4d Make linter happy.
7 years ago
Shpuld Shpuldson c4920f2d86 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing
7 years ago
lambadalambda dbad99cb4f Merge branch 'feature/follow-notifications' into 'develop'
7 years ago
lambadalambda 3c2073bc8e Merge branch 'fix/user-card-visual-buggery' into 'develop'
7 years ago
eal 701112f043 Add follow notifications.
7 years ago
Shpuld Shpuldson acf3fd5d91 Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service.
7 years ago
Roger Braun b1d9cbaebd Add fetch polyfill.
7 years ago
Roger Braun 9c5f001fd2 Add back relative numbering.
7 years ago
Roger Braun 32e20b2e02 Only run through replies once.
7 years ago
Roger Braun 9e61ab577b Revert "Throttle getReplies so it isn't called that often."
7 years ago
Roger Braun 86773579ed Throttle getReplies so it isn't called that often.
7 years ago
Roger Braun da3b604d9d Fix too long words in profile.
7 years ago
Roger Braun 7d59051fc5 Add logout button.
7 years ago
Shpuld Shpuldson f81d1b0eea Fix long names overflowing and messing everything (now just overflowing parts not drawn), fix non-square avatars not drawn as squares.
7 years ago
Shpuld Shpuldson b284689313 Hotfix for JS error in auto completion in firefox.
7 years ago
lambadalambda 937705ccb0 Merge branch 'feature/registration' into 'develop'
7 years ago
Shpuld Shpuldson 2d5fd21558 Make mobile panel switcher buttons obey the colors of the current style.
7 years ago
Shpuld Shpuldson c1f1599f2f Another minor consistency fix.
7 years ago
Shpuld Shpuldson 97bb03a00c Fix consistency in font families between chromium and ff
7 years ago
Shpuld Shpuldson bf84a87821 Make buttons stand out with some shading.
7 years ago
Shpuld Shpuldson 1a5ee95ee4 Add a config.json option for enabling registration, don't link and redirect away from register page when it's disabled.
7 years ago
Shpuld Shpuldson bfbc94d697 Move customizable terms-of-service into its separate .html file.
7 years ago
Shpuld Shpuldson 95605c32f1 Automatic square cropping for avatar upload, preview of the new avatar.
7 years ago
Shpuld Shpuldson 3785a863cb Update branch and fix conflicts.
7 years ago
Roger Braun 8e5d17a659 Use tags array in status if available.
7 years ago
Roger Braun 7d93546d98 Loop videos.
7 years ago
Shpuld Shpuldson 5dc22e9273 Clicking autocomplete will return focus to text area, make the autocomplete box disappear after clicking on a name.
7 years ago
Shpuld Shpuldson b24b891c1c Clean up styling a bit.
7 years ago
Shpuld Shpuldson 81d262af42 Fancier visuals for autocomplete list, with small avatar previews and all that.
7 years ago
Shpuld Shpuldson d0d95c59aa fix lint
7 years ago
Shpuld Shpuldson e0e8965c08 update branch and fix merge conflicts
7 years ago
Shpuld Shpuldson 7d46e3965d Fix meta-enter hotkey on osx
7 years ago
Roger Braun e663420260 Fix notification deletion.
7 years ago
Roger Braun 48a6d2e987 Don't use too advanced features.
7 years ago
Roger Braun bbb9a9c93c Fetch user from timeline.
7 years ago
Roger Braun 5328aca1ef Use userId in timeline.
7 years ago
Roger Braun bda0a76c89 Clear timeline on user change.
7 years ago
Roger Braun 2e7029b670 Display user timeline
7 years ago
Roger Braun 090148ef60 Start fetching user timelines.
7 years ago
Roger Braun 85cf036acd Fix race condition in color calculation.
7 years ago
lambadalambda fc341aa40d Merge branch 'feature/reply-previews' into 'develop'
7 years ago
Roger Braun 0effef236a Small cleanup.
7 years ago
Shpuld Shpuldson dcd7d52eb5 lint fix
7 years ago
Roger Braun 9982296866 Don't crash on unknown status deletion.
7 years ago
Shpuld Shpuldson f915ae174d Add floating status-previews on reply-link mouseover in conversations and make them optional in the settings, fix a small visual inconsistency in muted statuses while editing the file already..
7 years ago
Roger Braun 72de959221 Remove notifications for deleted messages.
7 years ago
Roger Braun 9af18e014d Re-use conversation property.
7 years ago
Shpuld Shpuldson 64a7db1d8b Change replies element flex to cover more width if needed.
7 years ago
Shpuld Shpuldson 12000536aa remove commented lines, make linter happy
7 years ago
Shpuld Shpuldson 4fabeda3ec Add list of replies under the name/links in conversation statuses, clicking them will highlight the statuses and scroll you to them, expanding a status will scroll you to that status once the conversation has opened.
7 years ago
Shpuld Shpuldson d82fa5516b remove whitespace
7 years ago
Shpuld Shpuldson bac1d3bd57 Move user-finder into navbar and hide it behind a toggle button, update fontello icons with user-plus and menu.
7 years ago
Shpuld Shpuldson 67452923a5 Hotfix for firefox to prevent loading on every scroll event.
7 years ago
Shpuld Shpuldson 65646c5a12 Add an option to initiate fetching older statuses automatically when scrolled 750 pixels or less from the bottom.
7 years ago
Roger Braun e901e064de Key notifications so the open reply windows won't switch places.
7 years ago
Shpuld Shpuldson 24b7d7d9d4 Add mouseover tooltips for names in notif headings and timeline repeats, make the timeline repeat name into a link to the repeater profile and use the word 'repeat' instead of 'retweet'.
7 years ago
lambadalambda b92be6a7ef Merge branch 'feature/status-improvement-cleanup' into 'develop'
7 years ago
lambadalambda 934bbd16f1 Merge branch 'feature/autoresize-post-status-form' into 'develop'
7 years ago
Shpuld Shpuldson c149330e50 Fix bugginess with heading links overlapping icons on the right.
7 years ago
Shpuld Shpuldson 52e6b470be Revert some of those mobile optimizations, breaks mention notifs.
7 years ago
Shpuld Shpuldson d063607b9d Mobile optimizations.
7 years ago
Shpuld Shpuldson 807c0d1464 Remove silly opacity from timestamp, make unmute icon line up with the rest better.
7 years ago
Shpuld Shpuldson ea8a700796 Move a bunch of status-related styles from App to status component, alter status header layout for better user experience hopefully, make status actions placing more consistent, adjust margins.
7 years ago
Shpuld Shpuldson b6b0a221c6 please the linter
7 years ago
Shpuld Shpuldson 7447f7c64d Set minimum height of 3 lines for textarea on focus, make it reset on post.
7 years ago
lambadalambda 9723d7285d Merge branch 'feature/notification-improvements' into 'develop'
7 years ago
lambadalambda bf7190bfca Merge branch 'feature/custom-timestamps' into 'develop'
7 years ago
Shpuld Shpuldson 5465791372 eslint fix
7 years ago
Shpuld Shpuldson e704e1daaf Make post-status-form automatically resize to fit the input.
7 years ago
Shpuld Shpuldson 3a1ae3a30e Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago'
7 years ago
Shpuld Shpuldson 960577ca28 Revert main.js to what it was in develop
7 years ago
Shpuld Shpuldson 1b79ae09e0 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/notification-improvements
7 years ago
Shpuld Shpuldson 5ad4d043e7 Enable reply/rt/fav for mention notifications by using a barebones status in place of plain notification content.
7 years ago
Shpuld Shpuldson e621be1428 Cut notification header length from 3 lines to 1.
7 years ago
Roger Braun d389d3a763 Copy cool retweet look.
7 years ago
Roger Braun 76624c9e4b Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
7 years ago
Roger Braun 2ec7069b3c Add user finder.
7 years ago
Roger Braun 48725ff9d0 Make linter happy.
8 years ago
Roger Braun 32d1d2178a Make linter happy.
8 years ago
Roger Braun 3fdc420990 Merge branch 'develop' into feature/hash-routed
8 years ago
Roger Braun 0c41adccff Remove tributejs
8 years ago
Shpuld Shpuldson c2db700544 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/hash-routed
8 years ago
Shpuld Shpuldson 143aa3b990 Started captcha and better avatar control, improved login form to fit register link better.
8 years ago
Shpuld Shpuldson b3b6d43dcc Add ToS field into registration form (still need to make it fetch it somewhere.) Make the register form look more polished.
8 years ago
Shpuld Shpuldson 88309b446f Adjust attachment preview margins.
8 years ago
Shpuld Shpuldson a3a9d8edd1 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/post-form-improvement
8 years ago
Shpuld Shpuldson 6b75874136 Move attachments below buttons to prevent the buttons from shifting after uploading.
8 years ago
Roger Braun ce896d393b Fix linting.
8 years ago
Shpuld Shpuldson ca8755a6f3 Make X icon parent position: relative; to prevent it from floating on its own.
8 years ago
Roger Braun dede7f7f2f Update existing currentusers if there is one.
8 years ago
Roger Braun 37c10be5e2 Add basic avatar changing.
8 years ago
Roger Braun 55edd6d8c2 Restore old media upload endpoint.
8 years ago
Roger Braun 4228cfc342 Add email field to registration.
8 years ago
Roger Braun a766e886f5 Add a registration form.
8 years ago
Roger Braun 6d7fcb057d Add missing route-link end tags.
8 years ago
Shpuld Shpuldson ea184f33b0 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/reply-navigation
8 years ago
Shpuld Shpuldson c708ebb5d2 Fix statusoid == undefined bug that prevented conversation opening in new tabs.
8 years ago
lambadalambda dcced2d2e1 Merge branch 'feature/sidepanel-independent-scrolling' into 'develop'
8 years ago
Shpuld Shpuldson e64905d88b Change attachments margin to not cause the element to overflow.
8 years ago
Shpuld Shpuldson 2efddaf874 Tweak values to minimize distracting artifacting when scrollbars are smaller or don't exist.
8 years ago
Shpuld Shpuldson 69ef9101d4 Fix login screen, (remove one duplicate line from user card css).
8 years ago
Shpuld Shpuldson f1764796e1 Fixed flex issue between 980 and 960 pixels width
8 years ago
Shpuld Shpuldson ff9142d7ab Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/sidepanel-independent-scrolling
8 years ago
Shpuld Shpuldson 83205b8c0e Make sidepanel scroll independently from timeline, allows for seeing notifications and posting new statuses even when scrolled deep down.
8 years ago
lambadalambda 7a948ba3a5 Merge branch 'feature/reply-navigation' into 'develop'
8 years ago
Shpuld Shpuldson d8a01454dc another lint fix
8 years ago
Shpuld Shpuldson c989170321 lint fixes
8 years ago
Shpuld Shpuldson 3f477986cf Removed smooth scrolling, does not work in other browsers than FF
8 years ago
Shpuld Shpuldson a675cfbb3e Goto-original-arrow button now sets conversation highlight/focus even when inline, setting focus now scrolls you to the focused post smoothly. Hide the arrow button when not expanded.
8 years ago
wakarimasen 66b59f2752 Fix daily average on accounts younger than a day
8 years ago
Roger Braun 36655002d0 Merge branch 'develop' into feature/hash-routed
8 years ago
Roger Braun cd959d9df8 Remove completely empty words.
8 years ago
Roger Braun 40b607bdea Set state to loaded if it crashes while loading.
8 years ago
Roger Braun 1ea19dcf1d Take unmuting out of expandable condition.
8 years ago
Roger Braun e531c78079 Only persist state after we loaded one.
8 years ago
Roger Braun a53555254a Add word-based muting to settings / statuses.
8 years ago
lambadalambda f3ca011fbe Add chrome picture stretching fix back in.
8 years ago
Shpuld Shpuldson 05dfd96571 Revert nsfw image sizing, give attachments max-height to reduce scrolling
8 years ago
Shpuld Shpuldson 39a6867557 Make muted notifications take much less space (handy for bot spam).
8 years ago
Roger Braun 44923afbee Make linter happy.
8 years ago
Roger Braun 5249b1d23a Add basic mention completion.
8 years ago
Roger Braun 024230c7f4 Basic word position and completion service.
8 years ago
Shpuld Shpuldson 0c7450252a Merge branch 'fix/small-buttons-chrome-tweak' into 'develop'
8 years ago
Shpuld Shpuldson d427eaca90 Merge branch 'feature/daily-avg' into 'develop'
8 years ago
shpuld 9061fa36ac Change the small buttons (Read and Show new) to look better on chrome and other non-firefox browsers.
8 years ago
shpuld 21111878be Give link attachments a rounded border, give images and links base03 border.
8 years ago
wakarimasen fe5082023d Add a daily post average to the user card
8 years ago
lambadalambda 9e42472679 Merge branch 'fix/make-nav-panel-not-so-bright' into 'develop'
8 years ago
shpuld c1681d53ba Add a border to conversation heading to add distinction between it and a hilighted post. (TODO: add the same base03-border to all headings for consistency's sake if it looks alright?)
8 years ago
Roger Braun 112adcf8f8 Merge branch 'develop' into feature/hash-routed
8 years ago
wakarimasen 896de016ad Merge branch 'develop' of https://gitgud.io/lambadalambda/pleroma-fe into wakarimasen/pleroma-fe-develop
8 years ago
shpuld 3bb5f86d0d Use conditional class for reply icon color.
8 years ago
shpuld 6f450fe7b0 base01 -> base00, base02 -> base01
8 years ago
shpuld df4dad1804 Separate reply form from inside status to make it resistant to hilighting, make the reply button light up when reply window is open.
8 years ago
Shpuld Shpuldson 2f0fcd14c9 Merge branch 'fix/no-border-on-last-notif' into 'develop'
8 years ago
shpuld bd7a05dee1 Fix red border not appearing on the last notification.
8 years ago
wakarimasen d669c37f13 Remove unused fetchMentions()
8 years ago
wakarimasen bfd530aaea Let timeline component fetch mentions
8 years ago
Shpuld Shpuldson 7aa1f02e38 Merge branch 'feature/timeline-fetch-error' into 'develop'
8 years ago
wakarimasen e064d2da4d Use one error variable for all timelines
8 years ago