mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2184 commits 1 branch 92 tags 13 GiB
Commit graph

1514 commits

Author SHA1 Message Date
lilia
688b297050 Move window.chrome reference to chromium.js 
// FREEBIE
 2016-08-05 17:13:55 -07:00
lilia
fed8f62617 Remove untranslatable strings from locale file 
// FREEBIE
 2016-08-05 13:41:23 -07:00
lilia
6a3a724dc4 Add momentjs locales 
// FREEBIE
 2016-08-05 13:20:39 -07:00
Benedikt Radtke
e836bfd3f7 Added basic localization for timestamps 
This commit implements basic localization for the timestamps in conversations and the conversation list.

// FREEBIE
 2016-08-04 17:40:13 -07:00
lilia
e07616e2ef Only create notifications for unread messages 
In some cases, we have already received a read receipt for an incoming
message by the time we go to create a notification about it. In this
case, we should skip the notification.

// FREEBIE
 2016-08-04 15:34:27 -07:00
lilia
8939c61c7c Log on notification removal 
// FREEBIE
 2016-08-01 20:19:16 -07:00
lilia
4c0ed76909 Update libsignal-protocol v1.1.3 
// FREEBIE
 2016-08-01 20:19:09 -07:00
lilia
186c597e24 Use port 4433 on staging 
Now with over 9000% more CA-signed cert!

// FREEBIE
 2016-07-28 18:39:55 -07:00
lilia
3a50a892dc Don't sort if already sorted 
// FREEBIE
 2016-07-28 18:39:55 -07:00
lilia
2cea499736 Reduce log noise from prekey messages 
// FREEBIE
 2016-07-28 18:39:53 -07:00
lilia
7efdfc95ee Log when updating notifications 
// FREEBIE
 2016-07-28 18:39:14 -07:00
lilia
c39d6687e5 Reduce log noise from delivery receipts 
Stop logging envelope messages on receipts since we log the same info as
a receipt in background.js.

// FREEBIE
 2016-07-28 18:39:13 -07:00
lilia
748215e285 Fix style 
// FREEBIE
 2016-07-14 11:09:03 -07:00
Benedikt Constantin Radtke
2870c1fff2 Fixed fastforwarding closing videos' fullscreen mode 
This commit stops the MessageView from adding the attachment more than once. Previously an attachment was appended to the MessageView every time an update
event was emitted, which happens when forwarding.

// FREEBIE
 2016-07-14 11:03:14 -07:00
lilia
8a153e942e Fix lightbox 
// FREEBIE
 2016-06-30 16:56:51 -07:00
lilia
5bff1d2cab Scope media pausing to the open conversation 
// FREEBIE
 2016-06-30 12:54:00 -07:00
Benedikt Radtke
d5b003a15e Fixed media pausing behaviour when clicking the conversation list 
This commit changes the inbox to stop video and audio elements when selecting a new conversation, and to not stop such elements when the same
conversation was selected (fixes #391).

// FREEBIE
 2016-06-30 12:47:06 -07:00
lilia
005444d09a Update libsignal-protocol v1.1.2 
// FREEBIE
 2016-06-30 12:45:27 -07:00
lilia
f670061669 Pressing escape closes the lightbox 
// FREEBIE
 2016-06-30 12:28:36 -07:00
lilia
a069939f65 Refactor attachment saving for DRYness 
// FREEBIE
 2016-06-30 12:28:36 -07:00
Benedikt Radtke
a1345c52b4 Added Save-As dialog for unsupported filetypes 
Despite the "click to save"-description of unsupported file types, clicking them did not save them.
This commit implements a Save-As dialog instead of opening the file in chrome.

// FREEBIE
 2016-06-30 00:18:36 -07:00
lilia
0a7f203565 Log on session save failure 
// FREEBIE
 2016-06-29 18:22:27 -07:00
lilia
5059fd237a Disable keepalive logging 
// FREEBIE
 2016-06-29 18:22:27 -07:00
lilia
80c6a2802f Handle sync request where no groups are sent 
If a user has no groups, no group sync message is sent. This is a normal
result that should result in a success event rather than a timeout.

// FREEBIE
 2016-06-26 15:52:57 -07:00
lilia
5fcf2ea66f Update libsignal-protocol v1.1.1 
// FREEBIE
 2016-06-23 14:17:01 -07:00
lilia
9091233950 Open images in a lightbox 
Adds file-write permission for saving to disk from lightbox.

Fixes #810

// FREEBIE
 2016-06-20 11:55:23 -07:00
lilia
8e1d884a10 Add button for re-importing contacts from phone 
Add a section under settings for performing a contact sync from your
mobile device. This just re-runs the same import operation that occurs
at install/link time.

// FREEBIE
 2016-06-16 16:43:07 -07:00
lilia
167f19153c Update libsignal-protocol v1.1.0 
Moves padding operations to the service library.

// FREEBIE
 2016-06-14 19:30:26 -07:00
lilia
b8fddfbbdd Update libsignal-protocol v1.0.0 
// FREEBIE
 2016-06-14 16:27:34 -07:00
lilia
d89c3e8e86 Remove devices with no keys 
// FREEBIE
 2016-06-06 17:59:44 -07:00
lilia
7caecc564d Process all incoming conflicts before outgoing ones 
Fixes a session management problem where, after resolving a conflict
with some contact, that contact would get bad mac as a result of us
sending them a new prekey message before processing a pending conflicted
prekey message received from them earlier.

Fixes #806

// FREEBIE
 2016-05-26 18:11:17 -07:00
lilia
3cd80d3f1e Remove tool tip from unregistered user errors 
// FREEBIE
 2016-05-26 10:59:43 -07:00
lilia
58c3fe047e Make error messages clickable 
// FREEBIE
 2016-05-25 20:39:43 -07:00
lilia
b2f07984df i18n unregistered user errors 
// FREEBIE
 2016-05-25 20:33:14 -07:00
lilia
b6f785737c Restyle error icons, move them outside the bubble 2016-05-25 20:32:00 -07:00
lilia
89d3b772d5 Define UnregisteredUserError class 
// FREEBIE
 2016-05-25 20:20:10 -07:00
lilia
81dfdd959f Don't allow retry on unregistered user errors 
// FREEBIE
 2016-05-24 11:36:04 -07:00
lilia
292260d973 Remove timestamp logging 
// FREEBIE
 2016-05-23 18:25:03 -07:00
lilia
331ca46d75 Fix websocket event name 
Fixes #798

// FREEBIE
 2016-05-23 16:04:06 -07:00
lilia
15e964de81 Update libsignal-protocol v0.13.0 
* libsignal.Curve is now a synchronous interface.
* libsignal.Curve.async is now the asynchronous interface.
* Fixes bugs in session management.

// FREEBIE
 2016-05-18 14:29:30 -07:00
lilia
f216262298 Update libsignal-protocol v0.12.0 
Moves version byte check to protocol lib.

// FREEBIE
 2016-05-18 13:15:58 -07:00
lilia
055c0c323e Remove unneeded property from device object 
// FREEBIE
 2016-05-18 13:15:57 -07:00
lilia
f8e176fd40 Dedupe methods 
Define textsecure.crypto in terms of libsignal.crypto.

// FREEBIE
 2016-05-18 13:15:57 -07:00
lilia
58452066aa Move device storage methods to outgoing message 
This is the only place they are called.

// FREEBIE
 2016-05-18 13:15:56 -07:00
lilia
daae664965 Remove unused function 
// FREEBIE
 2016-05-18 13:15:56 -07:00
lilia
d32a352d8a Use deviceIds/addresses instead of encodedNumbers 
The getDeviceObjectsForNumber method returns device objects that contain
nothing but the encodedNumber property. Instead, just deal in deviceIds
until a SignalProtocolAddress is constructed to manage both the number
and deviceId.

// FREEBIE
 2016-05-18 13:15:55 -07:00
lilia
95935f70ee Remove relay check from sendmessage 
We don't currently store any relay information about devices,
and

// FREEBIE
 2016-05-18 13:15:55 -07:00
lilia
f16803018c Update libsignal-protocol v0.11.0 
* Changes return type from decryption functions
* Update components

// FREEBIE
 2016-05-18 13:15:44 -07:00
lilia
148bd32671 Update libsignal-protocol v0.10.0 
* Changes policy for old session deletion
* Renames putIdentityKey to saveIdentity
* Remove device messages

// FREEBIE
 2016-05-18 11:11:11 -07:00
lilia
ffa702c934 Update libsignal-protocol v0.9.0 
* Exposes crypto APIs.
* Move worker methods to libsigna.worker.
* Move ProvisioningCipher to libtextsecure.
 2016-05-17 12:03:37 -07:00
lilia
cd2218ada7 Move hard-coded worker url out of libtextsecure 
// FREEBIE
 2016-05-15 17:04:13 -07:00
lilia
d5f4665fa4 MessageReceiver uses SessionCipher to retry conflicts 
// FREEBIE
 2016-05-15 17:02:45 -07:00
lilia
9ecfe6acb0 Use SignalProtocolAddress in MessageReceiver constructor 
// FREEBIE
 2016-05-15 17:02:45 -07:00
lilia
213b44935d Update libsignal-protocol v0.8.0 
Reorder identity key check
 2016-05-15 17:02:21 -07:00
lilia
eee93987f8 Update libsignal-protocol v0.7.0 
Remove unused methods.

// FREEBIE
 2016-05-14 23:39:59 -07:00
lilia
6266050a67 Remove unused jobqueue 
// FREEBIE
 2016-05-14 23:26:34 -07:00
lilia
050ea87aaf Get device ids instead of objects 
// FREEBIE
 2016-05-14 23:26:33 -07:00
lilia
7939b6ae98 Remove hasOpenSession from protocol_wrapper 
// FREEBIE
 2016-05-14 23:26:33 -07:00
lilia
0483fa2f97 Remove closeOpenSessionForDevice from protocol_wrapper 
// FREEBIE
 2016-05-14 23:26:33 -07:00
lilia
0d5ec60a7a Remove handlePreKeyWhisperMessage from protocol_wrapper 
// FREEBIE
 2016-05-14 23:26:32 -07:00
lilia
8010a09045 Remove decryptWhisperMessage from protocol_wrapper 
// FREEBIE
 2016-05-14 23:26:32 -07:00
lilia
891ddacd35 Remove processPreKey from protocol_wrapper 
Use SessionBuilder directly instead of protocol_wrapper

// FREEBIE
 2016-05-14 23:26:32 -07:00
lilia
843036f0ce Remove getRegistrationId and encryptMessageFor from protocol_wrapper 
We can now use protocol classes like SessionCipher directly because it
supports per-device read/write serialization internally.

// FREEBIE
 2016-05-14 23:26:31 -07:00
lilia
284cf5be3a Update libsignal-protocol v0.6.0 
Adds session accessors on SessionCipher and an internal session lock to
replace the same implemented in protocol_wrapper.js

// FREEBIE
 2016-05-14 23:24:34 -07:00
lilia
92293f9da9 Update libsignal-protocol v0.5.0 
Renames libsignal.util to libsignal.KeyHelper.

// FREEBIE
 2016-05-13 19:47:39 -07:00
lilia
e68031019b Integrate libsignal.SessionCipher 
Bypass the old protocolInstance wrapper methods and use the shiny new
SessionCipher class directly.

// FREEBIE
 2016-05-12 13:13:15 -07:00
lilia
9e6ad27fc5 Update libsignal-protocol v0.4.0 
// FREEBIE
 2016-05-11 15:30:30 -07:00
lilia
56238136ca Remove trivial wrapper method 
// FREEBIE
 2016-05-10 19:38:44 -07:00
lilia
78cdc0cb52 Remove tempKeys 
Now that we simply establish and save a session via SessionBuilder
rather than saving the keys to pass in during encrypt, we can stop
caching them in memory in between the identity key check and the
encryption step.

// FREEBIE
 2016-05-10 19:38:42 -07:00
lilia
519d3ec31b Update libsignal-protocol 
// FREEBIE
 2016-05-10 19:24:33 -07:00
2-4601
d861797d66 i18n 'Permanently delete this conversation?' 
// FREEBIE
 2016-05-05 12:54:15 -07:00
2-4601
b9ecdbf402 i18n 'Error handling incoming message' 
// FREEBIE
 2016-05-05 12:54:15 -07:00
2-4601
60fe1e2cea i18n 'Received message with unknown identity key' 
// FREEBIE
 2016-05-05 12:54:14 -07:00
2-4601
52992a8f12 i18n 'Secure session ended' 
// FREEBIE
 2016-05-05 12:54:14 -07:00
lilia
9f871db48a Update libsignal-protocol / Update prekey format 
Integrates change in prekey object formatting, which now matches more
conveniently with the representation rendered by the server.

// FREEBIE
 2016-05-04 00:33:05 -07:00
lilia
b385b6e48e Update libsignal-protocol 
SessionBuilder / SessionRecord refactor.

// FREEBIE
 2016-05-04 00:05:37 -07:00
lilia
e659104cbf Add isTrustedIdentity to SignalProtocolStore 
Adds a new required storage method for the protocol library.

// FREEBIE
 2016-05-03 23:58:57 -07:00
lilia
7dcaf721ca Add keepalive logging 
// FREEBIE
 2016-04-28 11:27:15 -07:00
lilia
70fe14e91b Fix reference errors in isStringable 
// FREEBIE
 2016-04-26 15:15:28 -07:00
lilia
9a1a3bdf64 Rename axolotl to libsignal 
// FREEBIE
 2016-04-22 13:43:30 -07:00
lilia
1d60dc38fb Rename axolotl storage 
// FREEBIE
 2016-04-22 13:43:30 -07:00
lilia
ee3bc11e3c Rename axolotlInstance 
// FREEBIE
 2016-04-22 13:32:19 -07:00
lilia
0fe3497d0e Update libsignal-protocol 
Remove remaining refs to axolotl from lsp.

// FREEBIE
 2016-04-22 13:29:31 -07:00
lilia
4169336776 Update libsignal protobuf package name 
// FREEBIE
 2016-04-21 19:30:34 -07:00
lilia
c1e1dd97ba Change libsignal-protocol filenames 
// FREEBIE
 2016-04-21 18:42:43 -07:00
lilia
b1d370755a Rename AxolotlStore 
// FREEBIE
 2016-04-21 18:36:17 -07:00
lilia
1fe5d63015 Update protocol libs 
Rename storage functions

// FREEBIE
 2016-04-21 18:36:16 -07:00
lilia
d5dfffd9da Darken the scrollbar on hover 
// FREEBIE
 2016-04-21 12:06:40 -07:00
lilia
7b29a567b5 More consistent timestamps 
* Apply the same rounding to in message bubbles and conversation list.
  Also make them consistent with Android's relative times. Fixes #682
* Show full timestamps when hovering on relative time
* Compute timestamp update delays more precisely:
  Set timestamps to self-update as soon as they are able to change
  rather than a fixed time since the last update.
* Refactor for customizable/localizable relative times
* Update timestamp tests
* Log timestamp update intervals to help debug #460
 2016-04-21 12:06:39 -07:00
lilia
dd7d72a77d i18n 'Media message' 
Fixes #736

// FREEBIE
 2016-04-18 19:15:36 -07:00
lilia
21bfb61b7a Maintain scroll position when textarea resizes 
Fixes #770

// FREEBIE
 2016-04-18 19:15:36 -07:00
lilia
3ac7552d2f Fix errant change event handler from firing 
A change in the text field was firing the previewImages handler.

// FREEBIE
 2016-04-18 19:15:36 -07:00
lilia
172d843368 Always update lastMessage on incoming messages 
Fixes #742

// FREEBIE
 2016-04-18 19:15:35 -07:00
lilia
6a928e3377 Fix reference error in MessageReceiver from fe82e4 
Fix a reference error when resolving a key conflict on an incoming end
session message. See Signal-Android/5438.

// FREEBIE
 2016-04-18 16:01:46 -07:00
lilia
47320fbbc5 Fix file input bug introduced in 28c602a 
Fix bug where clicking the attachment button to select a file would
immediately send any text already entered into the message input.

// FREEBIE
 2016-04-15 14:40:40 -07:00
lilia
72dd93aa02 Clear window attention if all messages are marked read 
Fixes #758

// FREEBIE
 2016-04-14 11:57:56 -07:00
lilia
0cd7f84a05 Refactor read state tracking 
Adds support for handling early arriving read receipts.

// FREEBIE
 2016-04-14 11:57:52 -07:00
lilia
d1e9534542 Refactor delivery receipt tracking 
Move code for matching receipts to messages (and vice versa) to its own
file.

// FREEBIE
 2016-04-13 13:57:56 -07:00
lilia
18012688ea Log unread message timestamps 
// FREEBIE
 2016-04-13 13:57:55 -07:00
lilia
bb2868f1ec Debounce updates to notifications and other events 
Wait for one second of silence before displaying new notifications,
updating the unread count and conversation list previews.

Fixes #470
 2016-04-11 14:55:38 -07:00
lilia
1f4587795e Add link to github on debug log 
// FREEBIE
 2016-04-09 20:55:21 -07:00
lilia
f3de290f7c Make debug log link focusable/selectable 
Add button to open in a new tab. Stye as input group.

// FREEBIE
 2016-04-09 20:53:39 -07:00
2-4601
e874b61839 Fix typo of quality argument in image compression 
The quality value should be a float in the range 0.0 to 1.0.
Other values (e.g. 50) are discarded silently and a default is used.

Fixes #713

// FREEBIE
 2016-04-09 14:17:47 -07:00
lilia
a5ec2321fd Use helper function 
// FREEBIE
 2016-04-09 00:16:44 -07:00
lilia
2f90645142 Break up long line 
// FREEBIE
 2016-04-09 00:16:21 -07:00
lilia
2506b2115d Log when fetching messages 
// FREEBIE
 2016-04-08 15:41:46 -07:00
lilia
2d6d2a92b9 Update libaxolotl 
// FREEBIE
 2016-04-06 17:33:06 -07:00
lilia
0f4f00ff4e Fix read sync on duplicate messages 
In the case of a double send (same message encrypted and sent twice due
to key conflict bug), we would mark the first instance read twice rather
than marking both instances read. Fix by searching for matching messages
that have not yet been marked read.

// FREEBIE
 2016-04-04 16:14:15 -07:00
lilia
9aa429e18a Add frontend support for expiring releases 
When a release expires, it gets a persistent banner notification to
upgrade, and an ephemeral toast warning when trying to send a message.

// FREEBIE
 2016-04-03 21:11:50 -07:00
lilia
c442a02cb6 Add build support for expiring old releases 
Builds expire after 90 days.
 2016-04-03 20:55:53 -07:00
lilia
af392c077d Update libaxolotl 
// FREEBIE
 2016-04-03 14:25:30 -07:00
lilia
7e2c6fd6bc Remove unused argument 
// FREEBIE
 2016-04-01 18:12:38 -07:00
lilia
d8d34e7afc Icon upgrade 
Also remove unused images.

// FREEBIE
 2016-04-01 13:59:57 -07:00
lilia
1aa975e199 Differentiate active vs selected conversation states 
// FREEBIE
 2016-04-01 11:37:25 -07:00
lilia
ddcdc9e2ff Log on prekey messages 
// FREEBIE
 2016-03-30 17:18:15 -07:00
lilia
960519d296 Add debug logging 
// FREEBIE
 2016-03-29 12:35:37 -07:00
lilia
8c03d3e088 Fix sorting of the last element 
// FREEBIE
 2016-03-27 15:29:53 -07:00
lilia
8fe00f79b2 Fix sorting on incoming key conflicts 
// FREEBIE
 2016-03-25 14:32:58 -07:00
lilia
07a0463b65 Fix conversation list self-resorting 
When deleting all messages in a conversation, the entry in the left pane
should be inserted into the alphabetical portion of the list. To keep it
in this collection, do not nullify active_at.

To ensure the list view is keeping itself correctly sorted, make sure
that resorting behavior is triggered any time a relevant attribute is
changed.

This fixes deleted conversations jumping to the top of the list, and
conversation order scrambling when getting a group or contact sync
message from our master device.

Fixes #734

// FREEBIE
 2016-03-25 14:32:57 -07:00
lilia
76652c2622 Update style and copy on key changes 
// FREEBIE
 2016-03-24 13:20:50 -07:00
lilia
512c5bf739 Incoming bubbles have sender's color background 
// FREEBIE
 2016-03-23 17:41:24 -07:00
lilia
5a9358efc9 Reorder object members 
Group click events together, put custom events at the bottom.

// FREEBIE
 2016-03-23 15:09:05 -07:00
lilia
198cc70cef Remove unusued event handlers 
The conversation view now handles displaying and listening to the back
button.

// FREEBIE
 2016-03-23 15:06:23 -07:00
lilia
6fe9c3f964 Nest key verification inside conflict dialogs 
// FREEBIE
 2016-03-23 15:04:42 -07:00
lilia
c4fcbd8cbe Fix i18n in tests 
// FREEBIE
 2016-03-23 14:04:42 -07:00
lilia
3901bcb8df Style resend button as an inline link 
For messages that failed to send due to network errors, this change
allows retrying them directly from the main conversation view rather
than only from the message detail view.

// FREEBIE
 2016-03-22 15:38:22 -07:00
lilia
08da29969c Fix menu behavior 
Opening the global menu should close the conversation menu and vice
versa.

// FREEBIE
 2016-03-22 11:01:37 -07:00
lilia
d24eaa655a Tweak styles on key verification view 
// FREEBIE
 2016-03-21 18:42:05 -07:00
lilia
b57f26bac4 Ignore clicks on the placeholder and its contents 
// FREEBIE
 2016-03-21 17:46:09 -07:00
lilia
d3b035121d Clean up bottom bar styles 
// FREEBIE
 2016-03-21 17:17:39 -07:00
lilia
234f937bc7 Conversation subscreens share a header 
// FREEBIE
 2016-03-21 15:37:53 -07:00
lilia
c8aa2246dc Let groups have blue headers 
// FREEBIE
 2016-03-21 13:02:34 -07:00
lilia
d391f07c1e Change right header color 
// FREEBIE
 2016-03-21 11:03:50 -07:00
lilia
a925657c45 Fix global menu close handler 
Previously, clicking on a conversation menu would not close the global
menu.

// FREEBIE
 2016-03-20 23:34:56 -07:00
lilia
b094607e0d Highlight bottom bar when focused 
// FREEBIE
 2016-03-20 23:15:21 -07:00
lilia
8bb8ed8151 Change left pane header color 
// FREEBIE
 2016-03-20 21:01:45 -07:00
lilia
7310afd1b4 Replace message list loading spinner with bar 
// FREEBIE
 2016-03-18 17:59:54 -07:00
lilia
d39a19d889 Fix crash on read receipt event if no listeners 
// FREEBIE
 2016-03-18 17:06:38 -07:00
lilia
647c2761e0 Move restart button into global menu 
// FREEBIE
 2016-03-18 16:21:55 -07:00
lilia
18a5ce8e54 Restyle conversation panel 
// FREEBIE
 2016-03-18 13:09:45 -07:00
lilia
760bfffb50 Show all contacts all the time 
Contacts without conversation identity appear in alphabetical order at
the end of the inbox.

// FREEBIE
 2016-03-18 11:21:11 -07:00
lilia
b4960b29d8 Remove newContact attribute 
This was used as a flag by a UI that no longer exists. Now it
erroneously gets saved when creating a conversation from a bare phone
number.

// FREEBIE
 2016-03-18 11:21:11 -07:00
lilia
8b3596b956 Delete last timestamp on a convo when deleting messages 
// FREEBIE
 2016-03-18 11:21:11 -07:00
lilia
6f3f33657a Don't mark read on sync messages 
There's no longer a need for this since we have read-state syncing.

// FREEBIE
 2016-03-18 11:20:52 -07:00
lilia
d84400777f Tweak storage logging statement 
// FREEBIE
 2016-03-17 21:04:12 -07:00
lilia
7fb4d3d8aa Load all inbox convos before rendering 
This is a better alternative to the fix in 0434c4b, which causes
problems when creating a new conversation from entering a phone number.

// FREEBIE
 2016-03-17 20:58:56 -07:00
lilia
762cb68721 Serialize sending and adding messages to a convo 
Previously, if a message was sent in between the receive time of an
incoming message and the time it is actually added to the conversation's
message collection (which only occurs later after several async
callbacks), the incoming message would be inserted not-at-the-end of the
collection since it is ordered by receive time. This tricked the front
end into assuming the message was an older message instead of a new one.

Fixes #490

// FREEBIE
 2016-03-17 15:41:01 -07:00
lilia
f9a3c7817e DRY up early receipt processing 
// FREEBIE
 2016-03-17 15:39:28 -07:00
lilia
67900753d1 Log sending read receipts 
// FREEBIE
 2016-03-14 16:26:22 -07:00
lilia
50731439a9 Turn off session logging 
// FREEBIE
 2016-03-14 11:33:20 -07:00