Commit graph

164 commits

Author SHA1 Message Date
dave 6143b1ce0f Resolve merge conflict,
Fix few issues (conversation page highlight, fetch conversation, ...)
2019-03-25 14:47:54 -04:00
Henry Jameson cb122e3a99 review 2019-03-25 20:11:06 +02:00
dave 6a9159b255 #433 - fix broken conversation page 2019-03-25 10:50:09 -04:00
Henry Jameson 67719e9a23 less hackery, more direct usage of mastoapi 2019-03-21 23:45:18 +02:00
Henry Jameson d6c62fa50f minor UI improvements - keep current behavior of showing originating post initially 2019-03-21 23:27:14 +02:00
Henry Jameson ee94a6732a why did i do that 2019-03-21 22:49:26 +02:00
dave 63d7c7bd80 #433: persistency of status form 2019-03-11 16:24:37 -04:00
dave 4f455eefe5 #433: do not remove the reply dialog 2019-03-11 10:52:28 -04:00
Henry Jameson 49b0f0a04a Fetching convos via MastoAPI. Had to change conversation component a bit for
better support, since MastoAPI doesn't have coversation ids
2019-03-09 18:33:49 +02:00
Henry Jameson 688906a61e fix convos 2019-02-14 00:11:11 +02:00
dave 25bb80a982 #341 - fix naming 2019-02-12 10:35:54 -05:00
dave 493d542d92 #341 - automatic scroll with repeats/reports 2019-02-12 05:10:27 -05:00
Henry Jameson 9f914824cb i should take it easy 2019-01-25 17:55:56 +03:00
Henry Jameson eb33951186 hotfix 2019-01-25 16:24:41 +03:00
Henry Jameson f48e3d0db8 quickfix 2019-01-25 01:39:19 +03:00
Henry Jameson 9d0d6b86c8 this attempts converting id to number to sort them numerically, since "99" >
"100" while 99 < 100
2019-01-25 01:08:08 +03:00
Henry Jameson 80a7035154 removing unnecessary conversions since it should already be converted in normalizer 2019-01-17 23:57:24 +03:00
Henry Jameson 5251de317d Merge branch 'switch-to-string-ids' into favorites
with some changes/merge conflicts resolution

* switch-to-string-ids:
  fixx?????
  fix notifications?
  fix lint
  fix tests, removed one unused function, fix real problem that tests helped to surface
  added some more explicit to string conversion since BE seem to be sending numbers and it could cause an issue.
  Remove all explicit and implicit conversions of statusId to number, changed explicit ones so that they convert them to string
2019-01-17 19:16:45 +03:00
Henry Jameson 519f49e29b separated normalization into a another file, removed catchall and added more stuff 2019-01-13 22:14:55 +03:00
Henry Jameson ef2585e32b Remove all explicit and implicit conversions of statusId to number, changed
explicit ones so that they convert them to string
2019-01-11 02:40:17 +03:00
Henry Jameson dc0b47e8bd fix collapse link being too small 2018-09-03 23:30:07 +03:00
Henry Jameson 065d1c7f49 fix 2018-08-30 20:16:36 +03:00
chip fcc1ab1d85 Pass the "Collapse" label throught the translation function 2018-05-19 20:35:14 +02:00
shpuld a1f6ef1dca Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein. 2018-04-11 19:34:40 +03:00
shpuld 8835c98529 Merge hj's css overhaul and fix conflicts 2018-04-10 00:28:24 +03:00
shpuld f4f9b3fa26 small fixes 2018-04-09 19:43:31 +03:00
Henry Jameson aa0564406a getting rid of baseXX, some small fixes. Seems to be usable. 2018-04-07 16:34:11 +03:00
shpuld e13c8c3fd2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/custom-theme 2017-11-17 02:17:47 +02:00
shpuld 44073e72fd Update theme editor to have 4 colors, rewrite the color setter, change a LOT of base16 assignments for better consistency. 2017-11-17 02:17:36 +02:00
shpuld ab1d1b3dd0 Move previews from conversation to status, put the reply preview arrow back on timeline statuses, add a spinner when the preview is still loading. 2017-11-13 16:33:54 +02:00
Henry Jameson c18aace3da imo this looks ugly, compared to general timeline appearance 2017-11-13 01:28:08 +03:00
Henry Jameson 46765d5c1a some fixes towards how conversations appear 2017-11-13 01:26:43 +03:00
shpuld 191bbe76a8 Add a bunch of missed localization strings, update english and finnish to match. 2017-11-08 12:34:15 +02:00
Roger Braun 9c5f001fd2 Add back relative numbering. 2017-07-29 19:10:09 +02:00
Roger Braun 32e20b2e02 Only run through replies once. 2017-07-29 18:53:49 +02:00
Roger Braun 9e61ab577b Revert "Throttle getReplies so it isn't called that often."
This reverts commit 86773579ed.
2017-07-28 15:52:05 +02:00
Roger Braun 86773579ed Throttle getReplies so it isn't called that often. 2017-07-28 11:20:54 +02:00
Roger Braun 0effef236a Small cleanup. 2017-06-07 18:15:15 +02:00
Shpuld Shpuldson dcd7d52eb5 lint fix 2017-06-07 18:13:24 +03:00
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.. 2017-06-07 17:58:24 +03:00
Roger Braun 9af18e014d Re-use conversation property. 2017-06-05 12:15:30 +02:00
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. 2017-06-04 23:58:15 +03:00
Shpuld Shpuldson c708ebb5d2 Fix statusoid == undefined bug that prevented conversation opening in new tabs. 2017-04-14 15:58:34 +03:00
Shpuld Shpuldson c989170321 lint fixes 2017-04-12 19:07:55 +03:00
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. 2017-04-12 18:25:19 +03:00
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?) 2017-03-10 15:26:36 +02:00
Roger Braun 2f52669380 Merge branch 'develop' into wakarimasen/pleroma-fe-develop 2017-03-09 09:19:40 +01:00
Roger Braun bde1241843 eslint fixes. 2017-03-08 17:58:49 +01:00
shpuld ae570ea0ff Put conversation 'Collapse' back on the same line with the rest of the heading.' 2017-03-07 16:00:45 +02:00
wakarimasen 9d56721533 Highlight original notice when expanding retweets 2017-03-06 16:21:11 +01:00
shpuld 31c0a2dfef Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/load-new-statuses-in-heading 2017-03-06 14:51:01 +02:00
Roger Braun 51160f0fdb Style fixes. 2017-03-05 20:36:22 +01:00
shpuld e19bfb9a22 Merged from develop, made 'new notices' into a 'show new' button placed on the heading element, updated headings and buttons to be more consistent with new changes (log-in, notifications/read, conversation/collapse), changed bottom 'load older' block to not disappear on click to keep screen from scrolling and changed its styling more consistent with everything else. 2017-03-05 19:00:35 +02:00
wakarimasen 289326855c Add focused prop to status 2017-03-05 16:31:01 +01:00
wakarimasen c921662036 Add inConversation prop to status 2017-03-05 14:34:14 +01:00
Roger Braun 74931dece7 Revert "Show actual status in notifications when mentioned."
This reverts commit 0e1ab69c33.
2017-02-23 00:26:37 +01:00
Roger Braun 0e1ab69c33 Show actual status in notifications when mentioned. 2017-02-22 23:37:12 +01:00
Roger Braun 5ec4f1b047 Extract conversation and create conversation page. 2017-02-04 13:52:26 +01:00
Roger Braun fc7e13e7bb Add styling with base16.
Solarized-dark for now.
2017-01-15 15:44:56 +01:00
Roger Braun b839ad95c5 Throw out retweets from conversations. 2016-11-28 18:01:23 +01:00
Roger Braun cc00eb898f Switch from moment.js to vue-timeago.
Much smaller filesize for vendor.js, although we'll have to see if all
the intervals are ok.
2016-11-28 17:37:47 +01:00
Roger Braun c9604eec9d Fetch conversation again on route change.
This might happen when you visit other convos via the notifications bar.
2016-11-28 13:36:19 +01:00
Roger Braun 215e51f764 Move some interactions to the backendInteractor
The idea is that all interactions should move there, so components
don't have to pass around credentials all the time.
2016-11-26 18:57:08 +01:00
Roger Braun e245074ef7 Add status / conversation component.
And wire it up.
2016-11-24 18:17:09 +01:00