ayumi-signal
62cdc613b9
Call Controls: Enhance width for viewport sizes
2023-11-02 13:28:03 -07:00
ayumi-signal
b2d4e8cd56
Fix Lightbox video controls in small viewports
2023-11-02 00:04:14 -07:00
ayumi-signal
2a5127b103
Settings: Improve left pane size at high zoom
2023-11-01 16:40:12 -07:00
Fedor Indutny
0ce593bf0d
Remove support for E164-based numbers
2023-11-01 15:55:30 -07:00
ayumi-signal
6d216a3eca
Calling: Add local video/mute to local preview; button order
2023-11-01 10:56:38 -07:00
ayumi-signal
a33e7d7622
Restyle CallLobby and ringing screens
2023-10-31 15:32:56 -04:00
ayumi-signal
953a1dd2a0
Fix calling participant appearance
2023-10-30 13:31:54 -07:00
ayumi-signal
063a1d9df3
Fix call top button z-index in speaker mode
2023-10-30 11:30:29 -07:00
Scott Nonnenberg
99b2bc304e
Use streams to download attachments directly to disk
...
Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
2023-10-30 09:24:28 -07:00
ayumi-signal
286e724682
Calling css adjustments
2023-10-27 09:17:13 -04:00
trevor-signal
00d96888e7
Add new toast region for calling button toasts
2023-10-26 11:26:25 -07:00
ayumi-signal
8bb355f971
New call UI and controls
2023-10-25 09:40:22 -04:00
trevor-signal
33c5c683c7
Fix handling of pointer events for calling toasts
2023-10-24 13:28:42 -07:00
Scott Nonnenberg
a1e7efee12
ConverationView.onPaste: Better handling of clipboard contents
2023-10-24 10:18:58 -07:00
trevor-signal
0c896ca1f2
Centralize calling toasts and add imperative API
2023-10-19 11:59:21 -07:00
trevor-signal
777b9d52e9
Blur participant videos when calls are reconnecting
2023-10-16 13:58:51 -04:00
Jamie Kyle
21564171d2
Fix StoryListItem dark-theme focus style
2023-10-16 10:07:59 -07:00
ayumi-signal
24f17f2cf9
Fix group typing bubble less x animation
2023-10-06 14:30:36 -07:00
trevor-signal
363142569b
Disable selecting existing group members in add members modal
2023-10-06 11:45:43 -04:00
ayumi-signal
69c0cad14c
Only animate typing when viewing conversation
2023-10-02 13:18:28 -07:00
ayumi-signal
72d1695612
Fix avatar from name to support lowercase
2023-09-28 16:31:58 -04:00
ayumi-signal
da113c1fa1
Fix typing bubble timeline scroll jumping
2023-09-28 09:54:56 -07:00
ayumi-signal
283ef57779
Group Typing Bubble Animations
2023-09-27 17:23:52 -04:00
Jamie Kyle
3b687ee68d
Fix composer expand to be on top of message reactions
2023-09-27 16:35:15 -04:00
Jamie Kyle
20ddca9684
Fix tall video gifs not filling message bubble
2023-09-27 20:42:36 +02:00
Josh Perez
1d0157877a
Fix: media editor nits
2023-09-27 08:39:54 -07:00
Jamie Kyle
15e9bb3d12
Fix themed styles for LeftPaneDialog, add stories
2023-09-26 09:13:57 -07:00
Josh Perez
1cfc396d65
Media editor polish
2023-09-21 09:54:28 -07:00
Jamie Kyle
f115ba5873
Fix timeline scrolling automatically while emoji picker is open
2023-09-19 12:01:04 -07:00
ayumi-signal
e4238de4db
Multiple person typing indicators in groups
2023-09-18 14:17:26 -07:00
Jamie Kyle
17ea2b58de
Fix hover/focus bg overriding active bg in ConversationList
...
Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
2023-09-18 14:00:26 -07:00
Josh Perez
d0296ececa
Improvements to the media editor
2023-09-14 10:04:48 -07:00
Jamie Kyle
34740bdaff
Fix NavSidebar buttons hover/focus background colors
2023-09-14 09:53:14 -07:00
Jamie Kyle
6ae0edcc1e
Fix sidebar notices in collapsed mode
2023-09-11 22:55:51 +02:00
Jamie Kyle
26e44165b6
Fix non-missed calls having red text
2023-08-30 15:04:34 -07:00
Jamie Kyle
930b2145be
Fix dark theme missed call text in red
2023-08-29 16:58:58 -07:00
Jamie Kyle
bc74a696f4
Use keyboard-mode instead of :focus-visible
2023-08-29 15:45:10 -07:00
ayumi-signal
7b11804cda
Fix Toast action text color to be lighter blue
2023-08-24 14:09:23 -07:00
trevor-signal
6e36aa7a8b
Improve reliability of click events for IncomingCallBar
2023-08-22 10:22:04 -04:00
Poren Chiang
672bd723d5
Make default font stack generic
...
The current font fallback stack imposes Simplified Chinese (China GB standard) fonts regardless of users’ system and interface language.
This commit will make the default fallback stack more generic and specify language-specific variants later.
Note: Source Han Sans (@adobe-fonts/source-han-sans) automatically chooses the correct CJK glyph variant base on document language, hence it is retained in the stack.
2023-08-22 14:07:04 +08:00
Jamie Kyle
2e9483c364
Fix MyStories add button themed unnecessarily
2023-08-22 00:10:35 +02:00
Jamie Kyle
c26cb0a3e4
Fix several call tabs UI issues
2023-08-21 22:36:28 +02:00
trevor-signal
1d03b8e478
Prevent long system contact names from wrapping in group call participant list
2023-08-21 12:24:22 -07:00
Fedor Indutny
b7b725f74c
Add done button to UsernameLinkModalBody
2023-08-21 09:30:33 -07:00
Jamie Kyle
3114cd497b
Fix formatting
2023-08-21 09:30:32 -07:00
Jamie Kyle
9c7dc22a23
Update nav tab badges, fix several call tabs issues
2023-08-21 09:30:32 -07:00
Jamie Kyle
3268d3e6eb
Update call tab design based on feedback
2023-08-21 09:30:32 -07:00
Jamie Kyle
ce28993c78
Fix sticker pack preview modal scrollbars and modal scroll dividers
2023-08-21 09:30:32 -07:00
hackerbirds
9b0ff4320c
Modernize chat session refreshed modal
...
* Hard-coded background colors were removed
* Buttons were moved to Modal's footer
* Use <Button> instead of HTML <button>, removed the old buttons CSS
2023-08-17 17:12:59 +02:00
Jamie Kyle
1eaabb6734
Calls Tab & Group Call Disposition
2023-08-08 17:53:06 -07:00
Jamie Kyle
7b6cd00b3f
fix layout of story views/replies modal
2023-08-04 17:54:05 -07:00
Scott Nonnenberg
f597f15faf
Formatting menu: Show popup guide faster, fade in/out
2023-08-04 09:25:52 -07:00
Josh Perez
48e210c9b2
Aligns edit buttons with emoji picker
2023-07-27 19:36:14 -07:00
Josh Perez
4ec94367c9
Adds transitions to panels
...
Co-authored-by: Jamie Kyle <jamie@signal.org>
2023-07-26 15:23:32 -07:00
Josh Perez
7267391de4
Fixes calling participants list popup
2023-07-21 15:12:23 -07:00
Fedor Indutny
7340ea64b9
Update group notification icons
2023-07-21 12:58:49 -07:00
Fedor Indutny
e1d2dbd8ff
Username Link QR Code
2023-07-20 05:14:08 +02:00
Fedor Indutny
ec94cc182a
Always visible arrows, new remote config
2023-07-19 16:21:32 -07:00
Josh Perez
381e53297b
Fixes click events on the incoming call bar
2023-07-19 16:21:31 -07:00
Fedor Indutny
c1580a5eb3
Add support for ACI safety numbers behind a feature flag
2023-07-19 16:21:30 -07:00
Josh Perez
7d0f94c654
Moves panel header into the panel component
2023-07-10 15:44:32 -07:00
trevor-signal
dda3bbc5b3
Ensure calling header is draggable
2023-06-30 10:12:01 -04:00
Josh Perez
2e7cdfdb70
UI Improvements to the edit history modal
2023-06-30 10:11:27 -04:00
Josh Perez
a2a6f207e3
Moves shortcut guide to its own css component
2023-06-15 19:20:44 -04:00
Scott Nonnenberg
71a32399af
Merge signalapp/Signal-Desktop#6452
2023-06-15 15:36:46 -07:00
hackerbirds
4ff36f46c4
Modernize forward message modal
...
* ModalHost is replaced with Modal.
* The CSS is simplified down to unify the theme palette
2023-06-15 22:52:29 +02:00
Josh Perez
94cd764107
Adds an edit message entry point in message details screen
2023-06-15 11:34:20 -07:00
Jamie Kyle
abdad8f491
left align toasts by default
2023-06-13 09:40:48 -07:00
Fedor Indutny
a41745ec23
Fix number blocks alignment in Safety Number UI
2023-06-08 15:37:38 -04:00
trevor-signal
b2f5febbf9
Ensure story buttons are clickable despite being in a no-drag region
2023-06-06 09:53:10 -04:00
trevor-signal
6f3b56c6fa
Adjust conversation header context menu styling
2023-06-05 17:08:52 -07:00
trevor-signal
cfabf8f533
Update missing quote reference styles
2023-05-31 12:01:08 -07:00
trevor-signal
c4ddd3977d
Update marked unread conversation indicator
2023-05-30 11:29:29 -07:00
Scott Nonnenberg
2dc24540ac
Restore indicator when conversation is manually marked unread
2023-05-24 14:33:11 -07:00
Scott Nonnenberg
a31cf5645e
Better handling of formatting in pasted text
2023-05-23 15:00:05 -07:00
trevor-signal
d012779e87
Show mentioned badges & enable scrolling to mentions in conversations
2023-05-23 14:59:07 -07:00
Fedor Indutny
caaeda8abe
Update more icons to v3
2023-05-23 23:14:47 +02:00
trevor-signal
73757052a6
Update Stories pane back button clickable region
2023-05-23 13:58:21 -04:00
Fedor Indutny
d84f74ec99
drop-shadow for lightbox arrows
2023-05-23 19:09:48 +02:00
trevor-signal
39e6d74b3e
Update clickable regions for context menus
2023-05-23 12:39:34 -04:00
Fedor Indutny
718832a47c
Minor adjustments to "Join" button
2023-05-22 16:20:24 -07:00
Fedor Indutny
99011b0a56
Fix position of lightbox arrows for a video
2023-05-22 22:24:33 +02:00
Fedor Indutny
77223b9a3d
Update call button icon states
2023-05-17 10:51:21 -07:00
trevor-signal
a0d98ab312
Update screen-sharing window styling
2023-05-16 15:19:04 -04:00
trevor-signal
401362f1d4
Ensure back button in conversation header remains clickable
2023-05-12 13:50:19 -07:00
Fedor Indutnyy
22a540f066
Merge https://github.com/signalapp/Signal-Desktop/pull/6410
2023-05-11 16:50:08 +02:00
Josh Perez
b34ea60d34
Show error state when QR code times out loading
2023-05-10 17:36:45 -04:00
Josh Perez
1ec9bce79d
Splits up current message from edited messages in modal
2023-05-10 15:01:03 -04:00
sha-265
daaaebff38
Fix padding in compositor for RTL langauges
2023-05-10 21:17:10 +03:00
Scott Nonnenberg
2177a79080
Formatting: A few more changes
2023-05-09 18:23:56 -07:00
Scott Nonnenberg
b4caf67bf9
Allow copy/paste of formatting and mentions
2023-05-09 17:40:19 -07:00
trevor-signal
7b039fa526
Update contact spoofing banner & dialog
2023-05-09 11:33:39 -04:00
Fedor Indutny
863a441dd4
Some other minor UI fixes
2023-05-09 10:52:42 -04:00
Josh Perez
f69c533d23
Use standard Tabs component for PendingInvites
2023-05-09 10:52:42 -04:00
Josh Perez
593ae82c7f
Fix contrast between placeholder text and background for search input
2023-05-09 10:52:42 -04:00
Josh Perez
6ede68153e
Improves contrast within chips
2023-05-09 10:52:42 -04:00
Fedor Indutny
7e1209e6cb
Fix highlighting of nested context menus
2023-05-09 10:52:42 -04:00
Fedor Indutny
1090a9c3e6
Update delivery status icons
2023-05-09 10:52:42 -04:00
Fedor Indutny
d7bd4eb156
Fix chat color icon in convo details
2023-05-09 10:52:42 -04:00
Fedor Indutny
51d1a62f70
Update icons to v3
2023-05-09 10:52:39 -04:00
Josh Perez
f8ff0becfa
Adds fieldset/legend to preferences
2023-05-09 10:52:33 -04:00
Josh Perez
7c651e8773
Better contrast ratio for modal close button and tabs
2023-05-09 10:52:29 -04:00
Fedor Indutny
a02fdc9049
Make lightbox buttons smaller
2023-05-09 10:52:26 -04:00
Josh Perez
6154b83720
Fix custom gradient keyboard mode
2023-05-01 15:05:39 -04:00
trevor-signal
bedfbbca5f
Fix light mode on SignalConnectionsModal
2023-04-25 10:48:29 -07:00
Josh Perez
dc6e6e4f00
Moves calling device settings to use Select component
2023-04-24 11:02:11 -07:00
Josh Perez
4394ec53fc
Adds keyboard-mode outline to Checkbox
2023-04-21 17:37:48 -07:00
Jamie Kyle
0e490542a7
RTL
2023-04-20 10:03:43 -07:00
Josh Perez
1f2cde6d04
Send edited messages support
...
Co-authored-by: Fedor Indutnyy <indutny@signal.org>
2023-04-20 09:31:59 -07:00
Scott Nonnenberg
5395741f11
Several text formatting fixes
2023-04-17 18:16:41 -07:00
Scott Nonnenberg
9bfbee464b
Support for sending formatting messages
2023-04-14 11:16:28 -07:00
Jamie Kyle
822b162136
Merge delete for me/everyone into one modal
2023-04-10 14:38:34 -07:00
Scott Nonnenberg
d9d820e72a
Support for receiving formatted messages
...
Co-authored-by: Alvaro Carrasco <alvaro@signal.org>
2023-04-10 09:31:45 -07:00
Fedor Indutny
f61d8f38b0
Context menu for left pane list items
2023-04-05 13:48:00 -07:00
Fedor Indutny
aba8882d0a
Loading screen progressbar improvements
2023-03-31 16:10:11 -07:00
Josh Perez
6dab8c70a1
Merge signalapp/Signal-Desktop#6345
2023-03-28 17:53:35 -04:00
Fedor Indutny
3264c3d509
Display "days ago" in loading screen
2023-03-28 13:31:24 -07:00
Pavel
2a899c1994
Make checkboxes dark in dark theme
2023-03-28 13:57:59 +03:00
Josh Perez
36e21c0134
Receive support for editing messages
2023-03-27 19:48:57 -04:00
Scott Nonnenberg
379cd3e0ed
Remove outline from message container
2023-03-21 14:00:03 -07:00
Jamie Kyle
1d549a9991
Multi-select forwarding and deleting
2023-03-20 15:23:53 -07:00
Fedor Indutny
1d1b124a92
UpdateDialog on InstallScreen
2023-03-20 13:42:00 -07:00
Scott Nonnenberg
75d5e81013
Voice Notes mini-player: Show with no conversation, fix spacing
2023-03-20 11:03:21 -07:00
Fedor Indutny
a1ab62f878
New state for Update Dialog
2023-03-15 09:57:27 -07:00
Fedor Indutny
0d37396339
Make lightbox buttons smaller
2023-03-14 09:53:24 -07:00
hackerbirds
c4fc2d7208
Adjust official badge height
2023-03-10 10:18:02 -08:00
hackerbirds
c571305d8a
Add verified badge to Notes to Self
2023-03-10 10:18:02 -08:00
Fedor Indutny
613d893f45
Fix adding to group by username
2023-03-09 13:46:01 -08:00
Fedor Indutny
74097a0efa
Use spring to animate lightbox thumbnails
2023-03-08 17:32:18 -08:00
Fedor Indutny
f46b93d806
Remove padding from nested modal footer
2023-03-08 16:35:40 -08:00
Fedor Indutny
88bc146f0d
Fix min-height of PNP settings row
2023-03-08 16:35:25 -08:00
Jamie Kyle
7b1b1584f1
set speaking indicator to fade in instantly
2023-03-07 14:10:54 -08:00
Fedor Indutny
cd5ac544bb
Minor UI fixes for updated Lightbox
2023-03-07 09:32:00 -08:00
Jamie Kyle
9dc9808420
speaking indicator design tweaks
2023-03-06 14:47:22 -08:00
Josh Perez
e3a1f81885
Merge signalapp/Signal-Desktop#6321
2023-03-06 16:01:40 -05:00
Fedor Indutny
4d8b0f17fe
Unflip forward icon in Lightbox
2023-03-06 11:58:23 -08:00
Fedor Indutny
fa68964510
Update Lightbox UI
2023-03-03 13:41:42 -05:00
norstbox
2b954e72c9
Fix conversation pill alignment in search input
2023-03-03 20:35:18 +03:00
Alvaro
99015d7b96
Voice notes drafts
2023-03-02 13:55:40 -07:00
Fedor Indutny
c85bbb3b20
Fix window-height css variable
2023-03-01 15:45:29 -08:00
Josh Perez
4d357f6f06
Adds time stickers to MediaEditor
2023-03-01 14:00:50 -05:00
Alvaro
23cbd2c8b3
Highlight speaker on group calls
2023-02-28 15:01:52 -05:00
Fedor Indutny
fad0529080
New sticker creator button
2023-02-27 14:34:43 -08:00
Alvaro
0e655ceeed
Voice notes mini-player
2023-02-24 15:18:57 -08:00
Fedor Indutny
5d110964b9
PNP Settings
2023-02-23 13:32:19 -08:00
Alvaro
164f64fec0
Adjusted the border-radius and border of quotes to better match the container
2023-02-17 14:43:16 -07:00
Fedor Indutnyy
f1bd83bb04
Merge https://github.com/signalapp/Signal-Desktop/pull/6219
2023-02-16 10:39:14 -08:00
HACKERBIRDS
e51fe499d3
Use suggested padding fix
...
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
2023-02-16 07:10:25 +00:00
Fedor Indutny
f9aaf30a32
Username onboarding
2023-02-13 10:51:41 -08:00
HACKERBIRDS
1a5fc45237
Merge branch 'signalapp:main' into pr-2-sendbutton
2023-02-11 15:08:46 +00:00
Josh Perez
9a21d77637
Fixes css for link previews
2023-02-07 14:50:35 -05:00
Josh Perez
fd6834588c
Link preview UI improvements
2023-02-03 14:21:07 -08:00
Josh Perez
1fbc1079c9
Fixes link preview UI
2023-02-01 09:19:02 -08:00
Josh Perez
de1564fd37
Moves link previews into the composer
2023-01-30 12:16:09 -08:00
Josh Perez
a88778b536
Adds quick reactions to stories
2023-01-27 10:34:15 -07:00
Alvaro
d64e0b65c4
Switched ForwardMessageModal to use ListTile
2023-01-25 16:51:08 -07:00
Alvaro
f751687af3
Drop unread indicator limit and fix overflow issue
2023-01-25 10:27:59 -07:00
Alvaro
2d9cbf4795
Adding ListTile and CircleCheckbox components
2023-01-25 09:54:32 -07:00
Jamie Kyle
da0a741a36
Use preferred system locales and add Farsi font stack
2023-01-24 16:54:46 -08:00
Fedor Indutny
ac50af52d2
Unsupported OS Dialog
2023-01-18 15:31:10 -08:00
Josh Perez
4bbf5eb5d4
Make stories accessible with collapsed left pane
2023-01-12 19:04:49 -05:00
Jamie Kyle
77e196279c
Add new kind of system message with red text
2023-01-12 15:33:22 -08:00
Fedor Indutny
d7b09b9703
Deprecate phone number discovery notification
2023-01-12 14:18:08 -08:00
Dimitris Apostolou
3c80272673
Fix typos
2023-01-03 13:02:01 -08:00
Jamie Kyle
3705b959d6
Remove end year from licenses
2023-01-03 11:55:46 -08:00
Josh Perez
26d689982a
Merge signalapp/Signal-Desktop#5961
2023-01-02 13:32:23 -05:00
jojomatik
fdb75a1e77
fix: reduce zoom button size to image dimensions
...
Reduce the size of the zoom button to the dimensions of the image. Change `flex-direction` of the zoomable container to `column` and align its items `center`. Set `max-width` and `max-height` of the zoom button to `100%` to prevent overflows.
Fixes #5586
2023-01-01 11:54:59 +01:00
Scott Nonnenberg
1a68c3db62
conversation_view: Move the last of the small functions to redux
2022-12-20 22:25:10 -05:00
Josh Perez
d8ea9856ec
Moves show all media to react pane
2022-12-20 09:50:23 -08:00
HACKERBIRDS
a27472c07c
Fix margin of the send button object
2022-12-18 23:46:30 +00:00
Josh Perez
94875efaf6
Refresh the sticker pack manager
2022-12-13 19:06:15 -05:00
jojomatik
35772fbe89
fix: use correct case for CallingButton label
...
Use the case specified in the respective language files instead of forcing `text-transform: lowercase` for all labels.
Fixes #5959
2022-12-12 14:46:26 -05:00
Alvaro
3a246656e3
Narrowed down avatar sizes
2022-12-09 13:37:45 -07:00
Scott Nonnenberg
e9b7a74b32
GroupV2: Show summary of change details on re-join of group
2022-12-06 13:12:57 -08:00
Scott Nonnenberg
a49a6f2057
Notifications for a few merge-related scenarios
2022-12-05 14:46:54 -08:00
Evan Hahn
38b921fad7
Blocked/unapproved convos: no clickable link preview images
2022-11-30 20:24:38 -05:00
Jamie Kyle
6198b02640
Init payments message types
2022-11-30 13:47:54 -08:00
Alvaro
704107a256
Added a max-height to story link preview
2022-11-29 17:12:12 -07:00
Fedor Indutny
b98836d0b3
Fix extra padding in ConversationHeader
2022-11-28 14:35:20 -08:00
Josh Perez
77f92b6cc3
Add emoji button to text story creation
2022-11-28 13:52:16 -05:00
Fedor Indutny
e3299b0445
Prevent layout recalculations in some animations
2022-11-23 12:13:13 -08:00
Fedor Indutny
1bff385805
Add more debug tools for stories
2022-11-22 15:33:15 -07:00
Josh Perez
220963c789
Sending/Failed state for stories
2022-11-16 14:10:11 -08:00
Alvaro
6b42a69947
Extract ListView controller from ConversationList
2022-11-14 10:48:51 -08:00
Alvaro
79757f22aa
Fixed scrollbars on replies modal
2022-11-11 10:17:30 -07:00
Scott Nonnenberg
5100d17ed2
SafetyNumberChangeDialog: Introduce awareness of stories
2022-11-10 23:10:30 -05:00
Fedor Indutny
709588a874
Use translateX instead of changing width
2022-11-10 21:45:52 -05:00
Alvaro
2278bf2994
Design tweaks to add-story-button hover
2022-11-10 14:01:40 -07:00
Josh Perez
19a42ed719
Onboarding story
2022-11-08 21:38:19 -05:00
Alvaro
d0fb25f758
Show and sort active groups when sending a story
2022-11-08 13:01:59 -07:00
Alvaro
4445ef80eb
Implement group story reply deletion
2022-11-04 07:22:07 -06:00
Josh Perez
3a6ab6a5aa
Link preview design for stories
2022-11-02 15:04:50 -06:00
Scott Nonnenberg
4fc1b6388c
Improvements to SafetyNumberChangeDialog
2022-11-01 17:10:27 -07:00
Jamie Kyle
97b7f3dbc1
Update story settings modal design, add group details page
2022-11-01 10:34:23 -07:00
Josh Perez
fd40322002
Open ContextMenu at correct location via keyboard
2022-10-28 09:41:50 -07:00
Jamie Kyle
5ccfabeb0c
Story settings modal copy and design changes
2022-10-26 16:17:39 -07:00
Scott Nonnenberg
08f2a966a1
Update strings and design around custom stories
2022-10-25 16:57:16 -07:00
Fedor Indutny
203cc995a3
Fix scrolling of long group story reply
2022-10-20 18:16:25 -06:00
Fedor Indutny
cb3a73c099
Fix positioning of calling modal
2022-10-19 15:57:12 -07:00
Fedor Indutny
00f82a6d39
Discriminator in username
2022-10-18 10:12:02 -07:00
