Commit Graph

18552 Commits

Author SHA1 Message Date
Jared Tobin
995b92650e
Merge branch 'lf/unread-day-indicators' (#2768)
* origin/lf/unread-day-indicators:
  chat-fe: fix unreadnotice position on mobile
  chat-fe: add unread and day indicators

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-21 13:07:25 +04:00
Jared Tobin
bee001de26
Merge branch 'lf/contacts-separate-user' (#2766)
* origin/lf/contacts-separate-user:
  groups-js: seperate user's ship from rest of contacts

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-21 13:06:49 +04:00
Jared Tobin
358aa5025f
Merge branch 'liam-fitzgerald/lf/chat-markdown-input' (#2756)
* liam-fitzgerald/lf/chat-markdown-input:
  chat-js: revive # prefix for code messages
  chat-js: toggle code editor on icon click
  chat-js: disabled block level elements in messages
  chat-js: render markdown in messages
  chat-js: use CodeMirror for chat input
  chat-js: add CodeMirror dependency

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-21 13:06:18 +04:00
Jared Tobin
a9d10a5471
Merge branch 'liam-fitzgerald/lf/publish-del-edit' (#2734)
* liam-fitzgerald/lf/publish-del-edit:
  chat-fe: move cancel button below comment edit
  publish-js: lift editing state to comment list
  publish: fix check on edit-comment delta
  publish-js: avoid unnecessary scrollbars on note view
  publish-js: allow deletion and editing of comments
  publish: use @tas for comment ref in marks

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-21 13:05:57 +04:00
Jared Tobin
a5b9631c9e
Merge branch 'king-handle-ames-exception' (#2698)
* origin/king-handle-ames-exception:
  king: handle IOError from recvFrom in ames.
  king: increment version for new pill

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-21 13:05:29 +04:00
Liam Fitzgerald
2cec3c4e90 chat-fe: fix unreadnotice position on mobile 2020-04-21 16:58:30 +10:00
Liam Fitzgerald
0fc12b1456 Merge branch 'master' into lf/unread-day-indicators 2020-04-21 15:56:38 +10:00
Liam Fitzgerald
4083af515e Merge branch 'master' into lf/chat-markdown-input 2020-04-21 13:56:30 +10:00
Jared Tobin
39c707e596
Merge branch 'ed/chore-update-contributing' (#2380)
* origin/ed/chore-update-contributing:
  contributing.md: removed interface dev instructions from root-level doc, integrated into existing interface-specific doc
  contributing.md: added more pre-req detail to the beginning of the edit
  contributing.md: Added a new section outlining how to develop urbit's interface

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-20 13:17:27 +04:00
Jared Tobin
8306560a89
Merge branch 'liam-fitzgerald/mp/chat/firefox-take-2' (#2733)
* liam-fitzgerald/mp/chat/firefox-take-2:
  chat-fe: more FF scrollback fixes
  chat-fe: fix index issue with pending messages
  chat-fe: correct FF scroll behaviour
  chat: scrollToBottom on mount for FF
  chat: only scrolltobottom if first backlog grab
  chat: add firefox-specific chat window

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-20 12:41:51 +04:00
Jared Tobin
a2eaec6d6f
Merge branch 'm/link-perf' (#2728)
* origin/m/link-perf:
  link-listen-hook: partially revert 05e6519
  link fe: refactor message display into component
  link fe: more informative "empty list" display
  link-view: in pagination logic, only +lent once
  link: minimal initial view result
  link-view: add some hints to aid profiling

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-20 12:40:58 +04:00
Liam Fitzgerald
f10bf3c894 chat-fe: add unread and day indicators 2020-04-19 02:23:32 +10:00
Liam Fitzgerald
95edde5d27 groups-js: seperate user's ship from rest of contacts 2020-04-18 21:17:47 +10:00
Fang
dbc172af29
Merge pull request #2758 from urbit/m/chat-cli-order
chat-cli: account for reverse message ordering
2020-04-18 13:16:54 +02:00
Fang
0815c56d1d
Merge pull request #2746 from urbit/m/chat-hook-leave
chat-hook: on %remove, try our best to pull subs
2020-04-18 13:13:53 +02:00
Fang
9f42d420b3
chat-hook: remove incorrect comment
We do, in fact, use it. Implicitly, when reestablishing the subscription during
kick handling.
2020-04-18 13:13:08 +02:00
Liam Fitzgerald
4d118ce6c4 chat-js: revive # prefix for code messages 2020-04-18 15:10:19 +10:00
Liam Fitzgerald
535cace962 chat-js: toggle code editor on icon click
Toggles a code editor, to enable sending of 'code' type messages. 'me'
type messages are now sent by beginning a message with /me.
2020-04-17 21:46:17 +10:00
Liam Fitzgerald
11e69b7bd0 chat-js: disabled block level elements in messages 2020-04-17 21:13:58 +10:00
Liam Fitzgerald
5fbe955874 chat-fe: more FF scrollback fixes 2020-04-17 15:17:52 +10:00
Liam Fitzgerald
1b90328f39 chat-fe: fix index issue with pending messages
To produce message elements we iterate over pendingMessage ++ messages,
but to check whether they're adjacent to a message by the same author,
we index back into messages, which produces incorrect results when
pendingMessages is nonEmpty
2020-04-17 14:20:28 +10:00
Liam Fitzgerald
41be649764 Merge branch 'master' into mp/chat/firefox-take-2 2020-04-17 12:06:34 +10:00
Fang
6f13546e2d
chat-cli: account for reverse message ordering
#2618 changed the way chat-store orders messages. We need to account for that
when processing/printing. This is the minimum viable fix.
2020-04-16 16:52:40 +02:00
Jared Tobin
18878727b0
Merge branch 'liam-fitzgerald/lf/links-autoleave' (#2754)
* liam-fitzgerald/lf/links-autoleave:
  link: leave collection on leaving associated group

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-16 16:54:32 +04:00
Jared Tobin
e7984324be
Merge branch 'fix-pending' (#2751)
* origin/fix-pending:
  chat-js: fix chat ordering and pending messages

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-16 16:54:12 +04:00
Jared Tobin
6ef155b82b
Merge branch 'fix-chat-autojoin' (#2749)
* origin/fix-chat-autojoin:
  chat-js: fix auto-join and a chatSynced error
  chat-js: fix issue with autojoining

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-16 16:53:59 +04:00
Jared Tobin
b655105a38
Merge branch 'liam-fitzgerald/lf/link-ios-crash' (#2742)
* liam-fitzgerald/lf/link-ios-crash:
  link-js: fix pages disappearing on small screens

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-16 16:53:36 +04:00
Liam Fitzgerald
a7a539bb24 link: leave collection on leaving associated group
Automatically leaves a collection when the user is removed from a group
2020-04-16 21:45:58 +10:00
Liam Fitzgerald
945fb3fca6 chat-js: render markdown in messages
Renders markdown in text messages but not url or code messages.
2020-04-16 20:21:29 +10:00
Liam Fitzgerald
9574765de6 chat-js: use CodeMirror for chat input
swaps out the textarea for a CodeMirror in markdown mode. Resolves an
issue related to the input shrinking with the content.
2020-04-16 20:21:29 +10:00
Liam Fitzgerald
a424312d12 chat-js: add CodeMirror dependency
Adds CodeMirror dependency and related css
2020-04-16 20:21:27 +10:00
Fang
947b68f0df
Merge pull request #2750 from urbit/m/dbug-not-silent
dbug: avoid printing nothing at all
2020-04-16 11:20:57 +02:00
Fang
4c4858f198
chat-hook: clarify backlog wire handling logic 2020-04-16 01:44:36 +02:00
Fang
d1feabd1fb
dbug: print result with priority
To give it some color, making it less easy to miss.
2020-04-15 23:50:53 +02:00
Logan Allen
e98605c1bb chat-js: fix chat ordering and pending messages 2020-04-15 16:48:33 -04:00
Fang
e2034eca19
dbug: avoid printing nothing at all
Previously, if filtering subscriptions turned up no results, nothing was
printed. With this change, we explicitly print "no matching subscriptions"
instead.
2020-04-15 22:28:59 +02:00
Logan Allen
c497d5a6a6 chat-js: fix auto-join and a chatSynced error 2020-04-15 15:58:03 -04:00
Logan Allen
f035070387 chat-js: fix issue with autojoining 2020-04-15 15:04:54 -04:00
Fang
0f05ed3149
chat-hook: consistently pull backlog subs
We weren't accounting for backlog subscriptions with non-zero message
indexes in their wires. Now, we look through all of our outgoing
subscriptions to identify relevant backlog subscriptions, and leave all
of those.

The more proper fix here is to not include message indexes in the wire
in the first place, since we don't ever reuse that anywhere. But that's
a more invasive change, so we just leave a TODO for it instead.
2020-04-15 19:26:58 +02:00
Jared Tobin
65cad93b1b
Merge branch 'liam-fitzgerald/lf/chat-input-line-height' (#2743)
* liam-fitzgerald/lf/chat-input-line-height:
  chat-js: adjust line height in chat input

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-15 20:18:14 +04:00
Jared Tobin
e6eaae43c4
Merge branch 'liam-fitzgerald/lf/code-links-dark-mode' (#2741)
* liam-fitzgerald/lf/code-links-dark-mode:
  publish: increase legibility for code in dark mode

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-15 20:17:58 +04:00
Fang
084ce356a8
chat-hook: on %remove, try our best to pull subs
Previously, we were removing the relevant entry from the `synced` map
before calling `+pull-wire`, which requires an entry to still be there.
This lead to subscriptions not actually being pulled, commonly leading
to "subscribe wire not unique" errors on re-join.

In addition to fixing that, `%remove` actions now try to pull the
subscription regardless of whether they have an entry in the `synced`
map or not. `%leave` is always safe, and we might want to clean up
subscriptions that shouldn't be there anymore in the first place.
2020-04-15 16:29:26 +02:00
Liam Fitzgerald
8b48f3fa0f chat-js: adjust line height in chat input
Set the line height of the input to be the same as a sent message.
Additionally fixes an issue that would cause unnecessary scrollbars to
be shown.
2020-04-15 15:08:42 +10:00
Liam Fitzgerald
536e3121b6 link-js: fix pages disappearing on small screens
The rightPanelHide prop was being improperly set on the home, settings
and members screens, causing them to be blank on small screen sizes

Fixes #2727
2020-04-15 14:27:29 +10:00
Liam Fitzgerald
50dca97b07 publish: increase legibility for code in dark mode
Makes the rules that set both a background and foreground color come
last in the CSS, increasing their specificity. Changes the highlight to a
lighter grey, to better stand out. Correctly aligns highlights with code
block backgrounds.

Fixes #2684
2020-04-15 13:45:22 +10:00
Liam Fitzgerald
ba18737b5e chat-fe: move cancel button below comment edit 2020-04-15 10:59:56 +10:00
Liam Fitzgerald
963d04831d Merge branch 'master' into lf/publish-del-edit 2020-04-15 10:07:29 +10:00
Liam Fitzgerald
595acd17ff publish-js: lift editing state to comment list 2020-04-15 09:57:43 +10:00
Liam Fitzgerald
c46642af8d publish: fix check on edit-comment delta
An incorrect check caused comment editing to never be propagated.
2020-04-15 09:57:07 +10:00
ixv
b978d4f824
Merge pull request #2736 from urbit/ixv/fix-comment-grow
publish: fix bug in comment mark
2020-04-14 15:53:26 -07:00