Commit Graph

18728 Commits

Author SHA1 Message Date
Isaac Visintainer
7c9f128910 publish: fix publish-info mark quote escaping 2020-05-21 17:16:54 -06:00
Isaac Visintainer
2658ebaee2 release: urbit-os-v1.0.17 2020-05-20 17:02:48 -06:00
ixv
0092c68833
Merge pull request #2914 from urbit/ixv/migrate-groups
os1: migrate app data to new group
2020-05-20 14:27:45 -07:00
ixv
a79f73c091
Merge pull request #2913 from urbit/ixv/fix-chat
chat-view: don't forget to sync permissions
2020-05-20 13:25:16 -07:00
Isaac Visintainer
8e6cbbb1d6 migrate-channels: addressed review 2020-05-20 14:24:24 -06:00
Fang
8d787cf486
Merge pull request #2887 from urbit/m/smaller-safer-json
chat: virtualize message-to-json only where needed
2020-05-20 18:18:50 +02:00
Fang
973cb62d6c
Merge branch 'release/next-userspace' into m/smaller-safer-json 2020-05-20 17:29:12 +02:00
Isaac Visintainer
e931a473dd os1: migrate app data to new group 2020-05-19 20:08:35 -06:00
Isaac Visintainer
9b28855842 chat-view: don't forget to sync permissions 2020-05-19 19:48:06 -06:00
matildepark
91cf06b542
Merge pull request #2814 from urbit/lf/chat-type-namespacing
chat: improve namespacing of chat-* types
2020-05-19 19:54:22 -04:00
Liam Fitzgerald
98e65bbbbb Merge branch 'master' into lf/chat-type-namespacing 2020-05-20 09:19:33 +10:00
matildepark
74fb1ad68f
Merge pull request #2884 from urbit/lf/publish-namespacing
publish: abide by namespacing conventions
2020-05-19 19:14:55 -04:00
ixv
f18bd36c73
Merge pull request #2904 from urbit/ixv/publish-comment-fix
publish: fix bug in publish comment mark
2020-05-16 15:19:43 -07:00
Isaac Visintainer
ac9890c2a9 publish: fix bug in publish comment mark 2020-05-12 17:49:03 -06:00
Fang
3a8544583c
chat: virtualize message-to-json only where needed
Previously we were virtualizing all message rendering operations, but it's only
+tank:enjs:format that we're worried about here.

Doing this more narrowly also allows us to specify a slightly more specific
error message.
2020-05-11 16:56:40 +02:00
Liam Fitzgerald
782135fc97 publish: abide by namespacing conventions 2020-05-09 11:26:25 +10:00
Fang
00e1ba4d93
Merge pull request #2879 from urbit/m/safer-json
chat: virtualize message-to-json conversion
2020-05-08 22:40:55 +02:00
Philip Monk
64dee60150
Merge pull request #2871 from urbit/philip/branches
Branching scheme
2020-05-08 13:07:49 -07:00
Philip Monk
252a83e6b0
maintainers: mention hotfixes can be pr'd to master 2020-05-08 11:05:34 -07:00
Fang
7152cb74a9
chat: virtualize message-to-json conversion
Bad `@t` text might crash and fully halt the json conversion, preventing any
data from being delivered to the frontend.

Fixes #2878.
2020-05-08 19:50:31 +02: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
Liam Fitzgerald
d7d07b014b chat-store: remove redundant tiscom 2020-05-07 10:56:24 +10:00
Liam Fitzgerald
cf8e8f8dc4 Merge branch 'master' into lf/chat-type-namespacing 2020-05-07 10:39:11 +10: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