Ghazi Triki
79d34c42d2
Fix redis storage issues.
2018-12-06 11:53:39 +01:00
Ghazi Triki
fd959f9e14
Remove rediscala library and replace it by a lettuce implementation.
2018-12-05 20:21:06 +01:00
Ghazi Triki
7e736d41f6
Re-added redis connection pooling and running subscribers and publishers inside executors.
2018-11-30 18:49:22 +01:00
Ghazi Triki
5b8a9a0ace
Add password to redis scala classes.
2018-11-23 11:38:28 -02:00
Ghazi Triki
d8588da28a
Add support for redis password.
2018-11-22 16:02:55 -02:00
Ghazi Triki
2614ba2cd0
Update deployment configuration.
2018-11-22 12:54:40 -02:00
Ghazi Triki
e768cbe3c5
Updated red5 applications configuration to accept redis parameters.
2018-11-21 19:31:01 -02:00
Ghazi Triki
dc5c98b8cf
Updated Red5 applications configuration.
2018-11-21 12:34:23 -02:00
Ghazi Triki
de0c992e51
Update redis commands implementation.
2018-11-21 12:01:10 -02:00
Ghazi Triki
fbd1d631d6
Move redis communication classes from red5 applications to bbb-apps-common project.
2018-11-21 10:55:06 -02:00
Ghazi Triki
6b4bbd6301
Updated bbb-apps-common project to use sbt 1.2.6 and scala 2.12.7
2018-11-14 12:25:52 +01:00
Ghazi Triki
5550d4464d
Updated bbb-screenshare project to use common redis classes from bbb-common-message.
2018-11-13 16:19:35 +01:00
Ghazi Triki
fc4028d6de
Redis refactoring : remove duplicate classes, factorisation and build configuration update.
2018-11-09 20:19:46 +01:00
Ghazi Triki
3c758cc9d1
Replace lettuce methods by custom commands.
2018-11-07 21:02:54 +01:00
Ghazi Triki
21cb59487c
Move RedisStorageService from bigbluebutton-web to bbb-common-message and replace jedis with lettuce-core.
2018-11-06 18:54:27 +01:00
Ghazi Triki
e812160ee9
Fix bbb-common-message unit tests.
2018-11-06 15:45:42 +01:00
Ghazi Triki
acd42835b4
Updated bbb-common-message project to use sby 1.2.6 and scala 2.12.7
2018-11-05 21:11:58 +01:00
Ghazi Triki
83025a9d5e
Merge remote-tracking branch 'bigbluebutton/master' into jvm-quality-improve
...
# Conflicts:
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
2018-09-12 18:49:25 +01:00
Richard Alam
cdaf447758
Merge pull request #5975 from riadvice/user-typing-feature
...
Implementation of user typing feature to chat
2018-09-12 13:43:43 -04:00
Richard Alam
5b03e0ef6c
Merge pull request #5581 from riadvice/recording-timer
...
Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml
2018-09-12 12:03:09 -04:00
Anton Georgiev
1462810b96
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0
2018-09-06 22:06:40 +00:00
Felipe Cecagno
62311387b8
more changes to configure redis using environment variables
2018-08-24 17:15:47 -03:00
Joao Siebel
11a139a2b8
add new SyncGetVoiceUsersRespMsg message in akka
2018-08-14 09:41:21 -03:00
Ghazi Triki
7d64eb69f9
Added user typing feature to chat.
2018-08-13 17:48:48 +01:00
Ghazi Triki
cb152bf864
Improved java classes code quality.
2018-08-05 22:41:15 +01:00
Ghazi Triki
2820178b83
Updated JVM projects dependencies and configuration.
2018-08-05 22:37:11 +01:00
Ghazi Triki
dffeeb8daf
Update user last activity time when he sends a message.
2018-07-30 11:43:19 +01:00
Ghazi Triki
c21f5aabad
Add new parameter userInactivityThresholdInMinutes
to bigbluebutton.properties and improve inactive user warning and eject from server.
2018-07-27 15:02:04 +01:00
Ghazi Triki
5472456e90
Refactor user inactivity messages naming to have two distinct names: UserInactivityInspectMsg
and UserActivitySignResponseMsg
.
2018-07-25 21:14:38 +01:00
Ghazi Triki
5b34f93daa
Move user inactivity configuration parameters to bigbluebutton-web application and rename them to userInactivityLogoutTimerInMinutes and userInactivityResponseDelayInMinutes.
2018-07-25 10:56:55 +01:00
Chad Pilkey
d1e649189e
add option to user gear menu to look up their directory data
2018-07-11 10:33:38 -07:00
Anton Georgiev
c1a739a883
Merge pull request #5298 from OZhurbenko/akka-create-default-pods-groupchats
...
Added missing messages for presentation pods and group chats
2018-07-04 14:28:16 -04:00
Richard Alam
d891a4e85f
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch
2018-06-28 08:30:17 -07:00
Anton Georgiev
e2e83e08df
plug clientType in UserJoin* messages, not separate ones
2018-06-26 19:27:42 +00:00
Anton Georgiev
a6c693c93d
add clientType in User and show it in api getMeeting*
2018-06-22 19:19:46 +00:00
Richard Alam
dc62b89691
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
2018-06-08 17:49:13 -07:00
Richard Alam
83ac942452
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
2018-06-08 17:23:49 -07:00
Richard Alam
5df4bef903
- toggle presentation downloads
2018-06-07 12:13:00 -07:00
Anton Georgiev
eb7a49f142
renamed noRedirect* to redirectToHtml5*
2018-06-07 15:59:06 +00:00
Richard Alam
a2eaa9babd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
...
- some conflicts have been fixed.
The following needs working on:
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
Chad Pilkey
f7a5f675b6
add a table showing individual votes in the PollResultsModal
2018-06-01 16:06:49 -07:00
Anton Georgiev
658b9d81b3
Merge pull request #5512 from lfzawacki/use-get-recording-status
...
Use GetRecordingStatus message to start recordings from the bbb-webrtc-sfu side
2018-05-28 13:55:30 -04:00
Ghazi Triki
8b85628549
Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml
2018-05-23 21:14:34 +01:00
Ghazi Triki
4eebdf00fa
Add a new message RecordAndClearPreviousMarkersCmd.
2018-05-23 16:09:15 +01:00
Ghazi Triki
634635c8cd
Update recording confirmation window and add recording timer (Work In Progress)
2018-05-18 15:58:08 +01:00
Lucas Fialho Zawacki
2d222b7b2e
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into use-get-recording-status
2018-05-09 19:02:31 +00:00
Lucas Fialho Zawacki
9149d0c597
Add recorded parameter to GetRecordingStatusRespMsg
2018-05-09 17:53:45 +00:00
Ghazi Triki
54ae79d533
Add new feature to breakout rooms that allows to freely join them.
2018-05-07 16:03:53 +01:00
Richard Alam
48de7625c9
- user inactivity audit message sending and receiving
2018-04-09 12:22:00 -07:00
Richard Alam
39284f1d18
- start implementing user inactivity timer
2018-04-06 14:52:21 -07:00
Oleksandr Zhurbenko
eef2d65d93
Sync message for the group chats and group chat messages
2018-04-01 20:10:28 -07:00
Anton Georgiev
3fec097faa
send presentation pods through redis on html5 server start
2018-02-16 15:00:53 -05:00
Richard Alam
1354b065be
Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master
2018-01-29 12:36:41 -08:00
Ghazi Triki
a2feb9bf5b
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
...
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
# bigbluebutton-client/branding/default/style/css/V2Theme.css
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
# bigbluebutton-html5/private/config/development/server/log.yaml
2018-01-23 12:27:42 +01:00
Richard Alam
672d3b5ef7
- try to prevent connecting to bbb-video with authz
2018-01-22 11:54:57 -08:00
Chad Pilkey
2717ef39da
removed unneeded properties from chat messages
2018-01-10 15:06:43 -05:00
Ghazi Triki
d1c765e614
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into webcams-only-for-moderator-on-off
2018-01-08 19:33:23 +01:00
Richard Alam
b93a95ca8e
Merge pull request #4896 from prlanzarin/flash-webcam-fix
...
Ghost flash webcams fix
2018-01-08 10:18:52 -08:00
Ghazi Triki
36f02e8528
Request webcamsOnlyForModerator value at user enter success.
2018-01-07 22:24:54 +01:00
Ghazi Triki
38ab186b53
Change webcamsOnlyForModerator property and handle saving it in server and client.
2018-01-07 16:45:24 +01:00
prlanzarin
dfb5170e5d
Finished filtering out HTML5 and Flash webcams using stream name patterns
2018-01-04 16:24:50 +00:00
prlanzarin
3f8e7c308c
Revert "Added checking for HTML5 webcams"
...
This reverts commit 51b62ed30d
.
2017-12-22 18:30:40 +00:00
Anton Georgiev
61c12298e2
Merge pull request #4661 from prlanzarin/bbb-webrtc-sfu
...
Add support for WebRTC screensharing into Flash/HTML5 and WebRTC video into HTML5
2017-12-22 14:43:38 -02:00
Richard Alam
7637cedd4b
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-12-21 12:48:20 -08:00
Richard Alam
78afb91562
- implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml
2017-12-21 10:40:44 -08:00
prlanzarin
51b62ed30d
Added checking for HTML5 webcams
...
This should prevent blank webcams on the flash client
2017-12-21 17:38:39 +00:00
prlanzarin
3a72afa350
Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection
2017-12-21 17:37:07 +00:00
Chad Pilkey
911c2b84fe
Merge pull request #4845 from capilkey/fix-presentationpod-reconnect
...
Change presentation pod reconnect to get all pods
2017-12-18 20:30:54 -05:00
Chad Pilkey
5bb13dedbf
change presentation pod reconnect to get all pods
2017-12-18 17:07:08 -05:00
Richard Alam
72fd493c23
- add reason on why client is disconnected
2017-12-15 19:16:37 -08:00
Ghazi Triki
89814bd613
Implement new feature: set presentation downloadable on and off. Work in progress.
2017-12-15 16:08:56 +01:00
Richard Alam
e0d0971070
Merge branch '2.1-whiteboard-improvements' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-whiteboard-improvements
2017-12-13 10:16:43 -08:00
Chad Pilkey
777fe53c39
rearrange WhiteboardMsgs so they are divided by direction
2017-12-13 12:14:39 -05:00
Chad Pilkey
4881fbbc0b
clean up spacing for WhiteboardMsgs so they're easier to read
2017-12-13 02:17:36 -05:00
Chad Pilkey
1551dcae15
move multiuser to be per-whiteboard
2017-12-13 02:14:43 -05:00
Richard Alam
7f51071f9e
- display specific eject reason to user
2017-12-11 14:03:14 -08:00
Richard Alam
9923704012
- eject user with duplicate external userid
2017-12-11 12:51:00 -08:00
Richard Alam
dda21b4a5e
Merge pull request #4793 from capilkey/disabled-moderator-unmute
...
Fix meeting mute and disable unmute of others
2017-12-11 11:00:41 -05:00
Chad Pilkey
860fd2a5df
fix meeting mute and disable unmute of others
2017-12-11 00:00:32 -05:00
Richard Alam
2574a18e7f
Merge branch 'synch-with-v2.0' into guest-and-authenticated-guest
2017-12-08 12:04:56 -08:00
Richard Alam
715a0177fd
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-12-08 11:26:09 -08:00
Richard Alam
68e452df6c
- add guest and authenticated info in client so we can display them separately
2017-12-07 10:47:07 -08:00
Chad Pilkey
4ce4204536
added poll record events, removed unused HidePoll message
2017-12-07 07:58:42 -08:00
Chad Pilkey
158fb6c7b2
cleanup of old java messages and other unused code
2017-12-04 12:31:16 -05:00
Richard Alam
e13a68377c
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-11-20 08:42:46 -08:00
Richard Alam
1466636d17
Merge branch '2.1-presentation-cleanup' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-presentation-cleanup
2017-11-20 07:24:21 -08:00
Chad Pilkey
3235f8423c
clean up of akka-app presentpod code (removed ownerId and other redundant date)
2017-11-19 14:34:19 -05:00
Richard Alam
6ff5d0db42
- pass mute param on message so we don't rely on toggling mute/unmute state for users
2017-11-17 08:46:18 -08:00
Richard Alam
9329e9316b
- determine guest status properly for moderators
2017-11-15 12:39:06 -08:00
Anton Georgiev
2276522c2e
Merge branch 'master' into remove-user-when-user-leaves
2017-11-14 14:57:19 -02:00
Richard Alam
420b6a9a14
- provide a way to skip whitelist filter in bbb-apps
...
- tell akka-apps to eject user for client that violates whitelist
- when validate token fails, disconnect client.
2017-11-13 14:25:31 -08:00
Richard Alam
b2aae3ab3c
- clear public chat (incomplete)
...
TODO: client doesn't clear yet
2017-11-13 05:56:14 -08:00
prlanzarin
f43b77c19f
Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
...
Conflicts:
bigbluebutton-html5/imports/startup/client/base.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
bigbluebutton-html5/imports/ui/components/app/container.jsx
bigbluebutton-html5/imports/ui/components/screenshare/service.js
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
Anton Georgiev
411307af3f
handle zoom and move event in presentation pods
2017-11-03 15:35:59 -04:00
Richard Alam
4e8f2abbb3
- pass token on video connect
2017-11-01 14:55:48 -07:00
Anton Georgiev
28f1809a70
independent control of presenter for modules Present and Whiteboard
2017-10-31 18:49:25 -04:00
Anton Georgiev
8450921362
separate cursor events depending on whiteboardId (pod)
2017-10-31 15:55:59 -04:00
Richard Alam
b128ba3fea
Merge pull request #4593 from antobinary/pods_vol4
...
Improvements to Presentation Pods
2017-10-29 16:11:00 -04:00
Anton Georgiev
ebdaedd3ae
work on remove presentation from pod. WIP
2017-10-29 13:12:27 -04:00
Richard Alam
5be0dec165
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
2017-10-28 17:32:29 -07:00
Anton Georgiev
8dddd206c3
send presenter group to late joiner
2017-10-28 20:08:54 -04:00
Richard Alam
c14a946041
- generate recording path in akka-apps for audio
2017-10-26 14:07:22 -07:00
Richard Alam
8497b9049d
Merge branch 'master' into implement-multi-chat
2017-10-25 07:33:26 -07:00
Anton Georgiev
8e06408a33
set current presenter in pod
2017-10-24 15:49:57 -04:00
Richard Alam
066ceea0f4
- generate record chapter break event
2017-10-23 12:16:26 -07:00
Anton Georgiev
6f8abff77c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
2017-10-21 08:50:25 -04:00
Anton Georgiev
030567368a
add/remove user from presenter groups
2017-10-20 17:01:57 -04:00
Richard Alam
afb217fe70
Merge branch 'remove-reconnect-handler' of https://github.com/ritzalam/bigbluebutton into ritzalam-remove-reconnect-handler
2017-10-20 08:11:49 -07:00
Richard Alam
11f0bdf0ac
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
2017-10-19 17:46:35 -07:00
Richard Alam
e01692c40b
- send voice conf started and destroyed message
2017-10-19 17:18:50 -07:00
Anton Georgiev
04cef71384
re-enable next/prev/goto slide
2017-10-19 14:47:59 -04:00
Richard Alam
cbd82ffa29
- simplify sending of message
2017-10-18 10:07:54 -07:00
Anton Georgiev
d521b19623
Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3
2017-10-03 11:13:48 -04:00
Richard Alam
398e6f7a02
- try opening windows
2017-10-01 17:29:44 -07:00
Anton Georgiev
60904989b3
work on set presentation (client + akka apps)
2017-10-01 09:50:12 -04:00
Anton Georgiev
23dadc5477
work on separating pods - client/conversion/apps
2017-09-29 18:20:33 -04:00
Richard Alam
e849e1b5ee
- approve guest user
2017-09-28 16:56:33 -07:00
Richard Alam
8e7670c81d
- handle guest policy
2017-09-27 11:16:14 -07:00
Richard Alam
4804d69a62
- reject user on enter api if guest has been denied
2017-09-25 14:29:02 -07:00
Richard Alam
e062e42cd0
- implement redirect of client to guest waiting
2017-09-25 14:12:54 -07:00
Anton Georgiev
6d4fa587c8
work on add and remove presentation pods
2017-09-25 14:58:11 -04:00
Richard Alam
5c2e12f04f
- display chat history
2017-09-21 14:13:42 -07:00
Anton Georgiev
9283c342b7
add a default presentation pod on present module load
2017-09-21 15:30:39 -04:00
Richard Alam
e651785a4e
- handle group chat created msg on client
2017-09-20 11:59:33 -07:00
Richard Alam
ff23e66220
- implement create group chat handler
2017-09-20 09:04:00 -07:00
Anton Georgiev
32398bc40e
Merge branch 'implement-group-chat' of github.com:ritzalam/bigbluebutton into pods_vol1
2017-09-19 11:41:52 -04:00
Augusto Bennemann
2067c50c55
HTML5 video for bbb2.0
2017-09-19 10:53:27 -03:00
Richard Alam
fea62db871
- handle get chat history
2017-09-15 13:04:22 -07:00
Richard Alam
1fae5d6b96
- send and receive public chat message
2017-09-15 11:17:19 -07:00
Richard Alam
9b0f074d6e
- modify chat to use models
2017-09-13 13:35:46 -07:00
Richard Alam
a790143d37
- create publish group chat
2017-09-13 10:55:08 -07:00
Anton Georgiev
f8087e0af3
store, check, exprire upload authz tokens in bbb-web
2017-09-13 10:39:28 -04:00
Richard Alam
6decd24480
- implement group chat handlers
2017-09-12 14:47:33 -07:00
Anton Georgiev
bba8300fbf
require token to upload presentation
2017-09-12 16:25:41 -04:00
Anton Georgiev
e9d7fe0468
reorganize presentation messages
2017-09-12 09:47:31 -04:00
Richard Alam
81acf00079
- change access type to string
2017-09-07 13:21:09 -07:00
Richard Alam
e0161b8da8
- implement group chat message handlers
2017-09-07 12:51:19 -07:00
Richard Alam
c7686b3a90
- implement group chat
2017-09-06 12:58:36 -07:00
Richard Alam
3a6690c335
- start implementing group chat
2017-09-05 17:08:40 -07:00
Pedro Beschorner Marin
4017d12fa1
Refactored shared notes cleaning to force sync
2017-09-01 19:36:15 +00:00
Richard Alam
5e1297e8f8
- trigger sending of rtt from server side
...
- send rtt of client to server so we can collect data
2017-08-16 14:05:22 -07:00
Richard Alam
ec314b8105
- add round trip trace message from client and back to tell us where the bottleneck
...
might be when using multi-user whiteboard.
2017-08-16 09:44:27 -07:00
Richard Alam
3879d48f17
Merge branch 'audio-state' of https://github.com/antobinary/bigbluebutton into antobinary-audio-state
2017-08-14 11:52:04 -07:00
Anton Georgiev
293c58ca42
distinguish fresh user join from reconnect. Recover audio state
2017-08-14 14:38:51 -04:00
Chad Pilkey
ac030e6254
fix meeting and client locking
2017-08-11 20:53:09 -04:00
Anton Georgiev
1e492dba73
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-webcam-state
2017-08-10 15:31:29 -04:00
Anton Georgiev
1dc5de1665
cleanup unused object
2017-08-10 15:30:29 -04:00
Richard Alam
1a698058e1
- implement check to see if akka-apps is alive from bbb-web so we can return an
...
error to API requests
2017-08-08 12:16:00 -07:00
Richard Alam
5ecf0c3651
- hook up end meeting from api
2017-08-02 13:06:16 -07:00
Richard Alam
b072b6e354
- log start voice recording message
2017-08-02 11:32:43 -07:00