urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-01 06:35:32 +03:00
Code Issues Packages Projects Releases Wiki Activity
18,702 Commits 768 Branches 10 Tags 215 MiB
252a83e6b0
Commit Graph

18702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Monk
252a83e6b0
maintainers: mention hotfixes can be pr'd to master 2020-05-08 11:05:34 -07:00
Philip Monk
54f2b6427e
maintainers: typo 
Co-authored-by: Luke Champine <luke.champine@gmail.com>
 2020-05-07 18:36:10 -07:00
Philip Monk
4d96a6b40b
maintainers: update with "release branch" scheme 2020-05-07 14:51:17 -07:00
Fang
69b6495d3d
Merge pull request #2854 from urbit/m/claz-register 
claz: correct lockup registration arg order
 2020-05-06 14:40:58 +02:00
Isaac Visintainer
734e643eb7 release: urbit-os-v1.0.15 2020-05-05 19:32:08 -06:00
ixv
0c57e65b38
Merge pull request #2846 from sigilante/master 
Add SVG support to img tags in Chat.
 2020-05-05 17:59:45 -07:00
ixv
277debf710
Merge pull request #2842 from urbit/mp/chat/message-fixing 
chat: message input fixes
 2020-05-05 17:59:07 -07:00
ixv
06f44ab9f1
Merge pull request #2825 from urbit/lf/chat-bottom-scroll 
chat-js: fix scrolling and unread behaviour
 2020-05-05 17:58:42 -07:00
ixv
8df1d078b1
Merge pull request #2859 from urbit/lf/drum-start-fix 
drum: fix broken app start
 2020-05-05 17:43:51 -07:00
Liam Fitzgerald
54969afdd2 drum: fix broken app start 
If we find an agent that has already been launched then we continue
iterating through the list of apps instead of stopping

Fixes: #2858
 2020-05-06 09:45:17 +10:00
Fang
baf8ff1182
claz: correct lockup registration arg order 
We were confusing "rate" and "rateUnit". These are "stars per tick" and
"duration of a tick" respectively, not the other way around.
 2020-05-05 23:18:07 +02:00
matildepark
ebbb3c8349
Merge pull request #2841 from urbit/lf/groups-kick-fix 
groups: fix self destruct on kick
 2020-05-05 17:03:08 -04:00
Liam Fitzgerald
6fb41209cd chat: fix ship search not wrapping correctly 
fixes #2832
 2020-05-05 16:17:45 +10:00
Liam Fitzgerald
23eb4acc37 Merge branch 'master' into lf/chat-bottom-scroll 2020-05-05 16:13:36 +10:00
ixv
c328e548d2
Merge pull request #2850 from urbit/ixv/publish-metadata-noop 
publish: allow crash case to no-op instead
 2020-05-04 22:06:27 -07:00
Isaac Visintainer
b9c5699ee4 publish: add debug poke to reset the warp loop 2020-05-04 21:39:57 -06:00
Isaac Visintainer
a91a3e50e1 publish: no-op on some other cases as well 2020-05-04 21:35:56 -06:00
Isaac Visintainer
da5f78df18 publish: allow crash case to no-op instead 2020-05-04 20:55:41 -06:00
Matilde Park
8c3e2cff92 Merge branch 'lf/chat-new-dm-race' (#2823) 
* origin/lf/chat-new-dm-race:
  chat-js: fix race condition in new-dm flow

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-05-04 20:48:50 -04:00
Matilde Park
3c06c15505 Merge branch 'lf/hood-boot-order' (#2805) 
* origin/lf/hood-boot-order:
  drum: partially restore reverted changes
  Revert "drum: address review comments"
  chat-cli: remove unnecessary %gu scry
  link-proxy-hook: remove unnecessary %gu scry
  drum: address review comments
  drum: sort cli connections
  drum: account for app dependencies on boot

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-05-04 20:41:10 -04:00
Sigilante
456e1bd3b8
Merge pull request #2 from sigilante/sigilante-svg-patch 
Add SVG.
 2020-05-04 14:24:55 -05:00
Sigilante
596e8f7906
Add SVG. 2020-05-04 14:23:24 -05:00
Sigilante
4d88c38a21
Merge pull request #1 from urbit/master 
Catch up.
 2020-05-04 13:30:20 -05:00
Matilde Park
60db7d06c7 chat: amend codeeval asset for graphical tweak 
The inverted CodeEval png would have noticable inverted borders,
so we now render the border using css and tweak its colouring as
necessary.
 2020-05-04 13:30:30 -04:00
Matilde Park
6a10987602 chat: toggle input out of code mode after sending 
Closes #2836. Code input would stick after sending a code message, so we
now toggle out of it if we were in it, on enter.
 2020-05-04 13:29:47 -04:00
Matilde Park
40378d2b79 chat: require and remove leading space for /me 
Closes #2834. Previously, starting a message with '/me' removed itself,
retaining the space between it and the message itself; it also allowed
"/memessages" to be processed as /me messages.
 2020-05-04 12:41:06 -04:00
matildepark
03d80b8c63
Merge pull request #2800 from urbit/avatar-s3 
Minimal S3 support
 2020-05-03 22:12:32 -04:00
Liam Fitzgerald
68324ec71b groups: propagate remove correctly 2020-05-04 10:25:40 +10:00
Liam Fitzgerald
774f7f53f0 contacts-js: handle remove of contact correctly 
the remove functionality in contact-card.js incorrectly assumed that we
are always removing ourselves from the group.

Fixes #2816
 2020-05-02 14:08:24 +10:00
Logan Allen
c8e972aa4e chat-js: updated codeeval.png, margin, and size of icons 2020-05-01 19:08:36 -04:00
ixv
b383037a8f
Merge pull request #2830 from urbit/king-https-fix 
Get HTTPS working in King Haskell.
 2020-04-30 13:08:13 -07:00
ixv
51876044f9
Merge pull request #2820 from urbit/king-crud-type 
king: don't parse crud events, just treat them as nouns.
 2020-04-30 13:07:54 -07:00
Benjamin Summers
f66405615f king: Split cert from urbit into cert+chain before giving to warp (HTTP Server library). 2020-04-30 12:13:14 -07:00
Benjamin Summers
75f60504ee king: In http-server/set-config effect, key+cert is Wain, not Cord. 2020-04-30 11:18:23 -07:00
Liam Fitzgerald
1167699ae6 chat-js: refactor unread message fetch 2020-04-30 13:08:38 +10:00
Liam Fitzgerald
bdec28c541 chat-js: load all unreads and autoread on activity 
if the number of unread messages is larger that the number we are going
to load, then load enough messages to display the unread marker.
Additionally, only automatically read a message if the user has been
active in the last minute. Freeze scroll position on inactivity.  Also
unconditionally scroll to the bottom upon sending your own message.
 2020-04-30 11:47:15 +10:00
Matilde Park
e7d05988d3 Merge branch 'mp/chat/pending-reordering' (#2824) 
* origin/mp/chat/pending-reordering:
  chat: prepend new pending messages, not append

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-04-29 16:28:52 -04:00
Matilde Park
df2c55c049 Merge branch 'mp/chat/input-autofocus' (#2822) 
* origin/mp/chat/input-autofocus:
  chat: autofocus input on desktop

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-04-29 16:28:06 -04:00
Matilde Park
34b234b652 Merge branch 'master' into mp/chat/input-autofocus 2020-04-29 16:27:29 -04:00
Matilde Park
cf6ef7512f Merge branch 'lf/chat-eval-scroll' (#2815) 
* origin/lf/chat-eval-scroll:
  chat-js: only show scrollbars if overflow

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-04-29 16:24:39 -04:00
Matilde Park
048de06f76 Merge branch 'mp/jank-regex' (#2813) 
* origin/mp/jank-regex:
  chat: strictly match URLs in outgoing strings

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-04-29 16:24:17 -04:00
Matilde Park
0926454e08 Merge branch 'mp/chat/code-toggle-2' (#2796) 
* origin/mp/chat/code-toggle-2:
  chat: toggle code at start of input

Signed-off-by: Matilde Park <matilde@tlon.io>
 2020-04-29 16:22:25 -04:00
matildepark
c050ca10c7
Merge pull request #2784 from urbit/la-channel-err 
channel-js: fixed long-standing issue with subscription errors not being propagated
 2020-04-29 12:41:23 -04:00
Liam Fitzgerald
17e1dd8362 chat-js: update read on initialisation 2020-04-29 13:37:58 +10:00
Liam Fitzgerald
eb6b50e0ca chat-js: truncate nicknames in autocomplete 2020-04-29 13:29:09 +10:00
Liam Fitzgerald
e96bd35f81 various-js: pass props.size into flexBasis for sigil 
Fixes #2817
 2020-04-29 12:51:13 +10:00
Liam Fitzgerald
ae0e5025ad chat-js: fix race condition in new-dm flow 
Creating a new DM might redirect the user to the chat before it is
actually created. Fixed by waiting for confirmation before redirecting.

Fixes #2792
 2020-04-29 10:14:13 +10:00
Matilde Park
6836135b71 chat: prepend new pending messages, not append 2020-04-28 20:13:09 -04:00
Matilde Park
5487e48ca2 chat: autofocus input on desktop 2020-04-28 19:46:10 -04:00
Liam Fitzgerald
5dc241dbe5 drum: partially restore reverted changes 2020-04-29 08:40:38 +10:00