Commit Graph

280 Commits

Author SHA1 Message Date
ixv
42f9fa4f8b
Merge pull request #2642 from urbit/mp/new-borders
os1: skeleton uses b--gray4, not b--gray2
2020-04-02 07:17:50 -07:00
Logan
0ce28806a9
Merge branch 'master' into matilde/interface-prod 2020-04-01 22:24:33 -04:00
Matilde Park
922318e072 os1: skeleton uses b--gray4, not b--gray2 2020-04-01 12:06:36 -04:00
ixv
e76fe83ea1
Merge pull request #2615 from urbit/mp/grouping-take-2
os1: reintegrating groups into all Landscape applications
2020-03-31 15:17:57 -07:00
ixv
5791f8b86d
Merge pull request #2630 from urbit/mp/chat/fix-settings-invitesearch
chat: settings pass 'groups' prop from permissions
2020-03-31 14:18:25 -07:00
édouard
d40ce1a233 Merge branch 'mp/grouping-take-2' of https://github.com/urbit/urbit into mp/grouping-take-2 2020-03-31 17:18:22 -04:00
ixv
e5c06f2549
Merge pull request #2632 from liam-fitzgerald/lf/patp-validate
various: bump urbit-ob version
2020-03-31 14:18:10 -07:00
édouard
9851b58d1c os1: numerous cross-module padding changes
Across every OS1 module (including the launch/home screen context) I edited some padding/margin/sizing for navigational elements for consistency across paging.
2020-03-31 17:18:09 -04:00
Matilde Park
25e279ed82 chat, launch: style fixes post-#2615 code review 2020-03-31 14:03:12 -04:00
Liam Fitzgerald
81efbd1357 various: bump urbit-ob version
The new version of urbit-ob includes stricter isValidPatp checks.

Fixes #2556
2020-04-01 03:32:57 +10:00
Matilde Park
23ca02dd38 chat: settings pass 'groups' prop from permissions 2020-03-31 11:50:37 -04:00
Logan Allen
49476aac66 chat-js: refactored subscriptions to auto-resubscribe 2020-03-30 18:07:33 -04:00
Logan Allen
c2070dbcc6 chat-js: pass in groups property, convert from permissions 2020-03-30 17:59:52 -04:00
Matilde Park
57d3f5327d os1: store.selected -> store.selectedGroups 2020-03-30 16:45:34 -04:00
Matilde Park
952ea831d9 chat: handle 'no chats' case 2020-03-27 16:42:29 -04:00
Matilde Park
612a88272f chat: incorporate group filter component 2020-03-27 14:26:23 -04:00
Matilde Park
afa38b1d2d chat: sidebar redesign, sorted by group 2020-03-27 12:45:27 -04:00
Logan Allen
221238c0fa chat-js: improve subscription speed by doing two rounds of subscriptions and no longer subscribing to groups 2020-03-26 17:41:11 -04:00
ixv
b8a222ea75
Merge pull request #2606 from urbit/la-scrollback
Scrollback fixed and tested in Brave, Safari, and Chrome
2020-03-26 09:02:24 -07:00
Logan Allen
2719a24dcc chat: decreased message limit to 20, now asking for more messages upon navigating to a chat channel when we have < 100 messages for that channel 2020-03-25 19:48:35 -04:00
ixv
755fbb7d14
Merge pull request #2583 from urbit/mp/os1/welcome
os1: add startup content
2020-03-25 16:26:01 -07:00
Logan Allen
a787eceae9 chat-js: turned off perf testing 2020-03-25 17:36:51 -04:00
Logan Allen
eb51ff693c chat: changed initial scrollback to 50 because 25 short messages wouldn't trigger any scrollbar at all, and fixed scrollback condition 2020-03-25 17:35:51 -04:00
Logan Allen
8d64d9d253 chat: fixed indentation
logging for scrollback
2020-03-25 17:34:59 -04:00
Matilde Park
cdc4fb5da0 various: graphic tweaks to welcome as per design 2020-03-24 19:27:34 -04:00
Matilde Park
4c26419ff2 various: post-review adjustments for #2583
This commit introduces some refactoring of localStorage logic, copy
changes and a rearrangement of the launch welcome message to the top
of the screen.
2020-03-24 15:34:40 -04:00
Jared Tobin
cd9f23d6db
Merge branch 'liam-fitzgerald/lf/chat-patp-autocomplete' (#2571)
* liam-fitzgerald/lf/chat-patp-autocomplete:
  chat-fe: fix incorrect property in css
  chat-fe: improve name legibility in autocomplete
  chat-fe: match autocomplete to designs
  chat-fe: autocomplete nicknames in message input
  chat-fe: ignore comets in autocomplete
  chat-fe: correct light mode autocomplete styling
  chat-fe: add patp autocomplete to message input

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-03-24 17:37:51 +04:00
Liam Fitzgerald
ca8f436fd0 chat-fe: fix incorrect property in css 2020-03-24 11:01:46 +10:00
Liam Fitzgerald
302c3dc4cc chat-fe: improve name legibility in autocomplete 2020-03-24 10:50:53 +10:00
Liam Fitzgerald
6c403f5135 chat-fe: match autocomplete to designs 2020-03-21 13:52:41 +10:00
Liam Fitzgerald
9c759a7e68 chat-fe: autocomplete nicknames in message input 2020-03-21 13:49:57 +10:00
Matilde Park
0d9a604ecd chat: add startup content 2020-03-20 17:05:15 -04:00
Fang
2db5f7bb59
Revert "chat fe: disable advanced groupify" 2020-03-20 18:45:22 +01:00
Liam Fitzgerald
14399777e0 chat-fe: ignore comets in autocomplete 2020-03-20 15:30:04 +10:00
Liam Fitzgerald
2f97099e94 chat-fe: correct light mode autocomplete styling 2020-03-20 15:28:46 +10:00
Liam Fitzgerald
19b97040f2 chat-fe: add patp autocomplete to message input 2020-03-20 15:28:46 +10:00
Fang
3bf402bc6e
chat fe: update copy to match lesser functionality
Co-Authored-By: ixv <isaacv@tlon.io>
2020-03-20 00:25:43 +01:00
Fang
6182d61420
chat fe: disable advanced groupify
Introduced in #2546, the new functionality seems able to induce weird
behavior causing messages to be processed twice. Disabling this
functionality on the frontend until that has been fixed.
2020-03-20 00:13:16 +01:00
Matilde Park
c5d790410e chat: sidebar pulls nickname from associated group
We were looking for the box in our contacts object, not the associated
group, so if you had a group and chat with the same name,
you'd see nicknames, but in no other situations. This commit rectifies
that by safely polling for the associated group of the chat.
2020-03-19 11:46:47 -04:00
Fang
143bae6190
chat fe: clarify copy
Also clarifies a comment, and removes unnecessary console.log calls.
2020-03-18 23:28:35 +01:00
Fang
1ea4277988
chat fe: support adding chat to existing group
Using the updated chat-view %groupify action. Groupifying without
selecting a group creates a new group based off the chat. Selecting a
group first makes that the target of the group, and allows you to
specify whether to merge ships from the chat into the group.
2020-03-18 22:06:16 +01:00
Fang
ec6c2ed69a
chat fe: invite search with/out ships
This lets you specify whether or not you want to include ships in search
results for the InviteSearch component, as is already possible for
groups. This enables group-only searching, as will be used by the next
commit.

Also modifies the placeholder text based on what is included in the
search results.
2020-03-18 22:02:37 +01:00
Isaac Visintainer
9c495aa38a release: urbit-os-v1.0.2 2020-03-16 17:55:56 -07:00
Fang
4b5a02fac8
Merge pull request #2480 from urbit/m/chat-groupify
chat: groupify
2020-03-16 18:37:29 +01:00
Jared Tobin
1dd2b77222
release: urbit-os-v1.0.1 2020-03-16 15:10:58 +04:00
Jared Tobin
7af1048224
Merge branch 'mp/os1/chat-simple-sigil' (#2500)
* origin/mp/os1/chat-simple-sigil:
  chat: remove "#" from fallback sigil color

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-03-16 12:43:42 +04:00
Matilde Park
eff3c85973 chat: remove "#" from fallback sigil color
In the chat input we fall back to #000000 and blend it; but we also
prefix any color we send to the sigil component with a # for
uxToHex values, so we end up passing ##000000. This results
in simplified sigils -- when in doubt, ensure the hex formatting
is correct...
2020-03-13 22:51:20 -04:00
Matilde Park
f4610ba4a9 chat: use more precise regex 2020-03-13 20:55:54 -04:00
ixv
144f7f3cba
Merge pull request #2455 from urbit/mp/color-picker-alignment
chat, link: preview for channel colour picker
2020-03-13 13:00:59 -07:00
Fang
acdf511f23
chat fe: improve groupify copy 2020-03-13 19:02:29 +01:00