11058 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chad Pilkey	9f277583c2	the client responds to the first two caption messages	2015-10-15 15:42:01 -07:00
Chad Pilkey	ad3ba6677c	first two initial caption module messages finished	2015-10-15 15:40:23 -07:00
Chad Pilkey	0fa6660ed9	removed a doubled debug line	2015-10-15 15:32:26 -07:00
Chad Pilkey	65176f3cc1	initial captioning client commit	2015-09-29 13:16:45 -07:00
Chad Pilkey	993ac4df1a	initial red5 caption message handlers and common messages	2015-09-29 13:15:13 -07:00
Richard Alam	1179e85b1c	Merge pull request #2807 from capilkey/add-messageLength-default ... Add a default message length to avoid issues of missing property	2015-09-25 10:21:27 -04:00
Chad Pilkey	0627afa2e5	Add a default message length to avoid issues of missing property	2015-09-24 14:17:07 -07:00
Chad Pilkey	4c4d35a760	Merge pull request #2787 from riadvice/chat-message-limit ... The use is able to write a multi-line chat message.	2015-09-24 17:15:43 -04:00
Richard Alam	a8ceb4648c	Merge pull request #2806 from ritzalam/add-more-info-on-logs ... - add more info on logs	2015-09-24 16:07:27 -04:00
Richard Alam	43c8f9b5ec	- add more info on logs	2015-09-24 20:05:48 +00:00
Chad Pilkey	ad03486971	Merge pull request #2804 from OZhurbenko/whiteboard-modifications ... Polling shape correction	2015-09-24 13:37:34 -04:00
Richard Alam	31a99c6b96	Merge pull request #2805 from antobinary/master ... Simplify html5 redirect #2801	2015-09-24 13:29:37 -04:00
Anton Georgiev	4253faa426	remove extra condiction	2015-09-24 16:05:41 +00:00
Anton Georgiev	2bd601cc08	simplify html5 redirect #2801	2015-09-24 15:58:17 +00:00
Richard Alam	49014d4b12	Merge pull request #2803 from ritzalam/expire-redis-key ... - expire redis keys for events that are stored even if meeting is no…	2015-09-23 18:33:08 -04:00
Richard Alam	4d27b460ae	- expire redis keys for events that are stored even if meeting is not recorded	2015-09-23 22:31:15 +00:00
Fred Dixon	fa361deff5	Merge pull request #2802 from ffdixon/bump-version ... bump from 1.0.0-dev to 1.0.0-beta	2015-09-23 18:01:27 -04:00
Richard Alam	54e1452b14	Merge pull request #2801 from antobinary/master ... Only show "OR launch the html5 client" when bbb-html5 is running(or ./start.sh)	2015-09-23 18:00:18 -04:00
Fred Dixon	536cf68bd6	bump from 1.0.0-dev to 1.0.0-beta	2015-09-23 18:00:16 -04:00
Anton Georgiev	07dfd89dd7	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton	2015-09-23 21:24:34 +00:00
Anton Georgiev	6cfc16cde5	offer redirect to HTML5 only if available	2015-09-23 21:24:19 +00:00
Richard Alam	281270ec6b	Merge pull request #2799 from ritzalam/clean-up-logging ... Clean up logging	2015-09-23 17:13:28 -04:00
Richard Alam	2f4eae512f	- cleanup more logs	2015-09-23 21:01:53 +00:00
Fred Dixon	150e6560b1	Merge pull request #2800 from ffdixon/update-index ... Added Chat, Emoji, and Polling to index page	2015-09-23 17:01:51 -04:00
Fred Dixon	2051913359	Added Chat, Emoji, and Polling to index page	2015-09-23 17:00:26 -04:00
Richard Alam	a1a82f96d0	- remove printlns to cleanup logs	2015-09-23 20:11:06 +00:00
Richard Alam	ee7ef24397	- change fielname to be the same as on server	2015-09-23 20:04:39 +00:00
Richard Alam	57c8f21eb4	- clean up logging ... - add remote address into log	2015-09-23 20:04:09 +00:00
Fred Dixon	0f99dfe603	Merge pull request #2798 from bigbluebutton/ffdixon-patch-3 ... Update bbb-conf	2015-09-22 14:51:34 -04:00
Fred Dixon	ddc473105d	Update bbb-conf ... Remove reference to rtmps	2015-09-22 14:51:23 -04:00
Fred Dixon	3c7236b909	Merge pull request #2797 from capilkey/investigate-locking-more ... Force MediaItemRenderer to update	2015-09-21 17:51:10 -04:00
Chad Pilkey	77c9c660d2	Merge pull request #2796 from ritzalam/fix-lock-settings ... - make lock settings behave like in 0.9	2015-09-21 17:25:46 -04:00
Chad Pilkey	e9c0eb23cd	rename bbb-client in .project file for better importing	2015-09-21 14:13:32 -07:00
Chad Pilkey	15a2ade0aa	Merge remote-tracking branch 'ritzalam/fix-lock-settings' into investigate-locking-more	2015-09-21 13:50:44 -07:00
Chad Pilkey	d0366b2fba	Make sure PhoneOptions are initialized before using	2015-09-21 13:46:16 -07:00
Chad Pilkey	6377f86ca1	make sure the user item renderers update when locking changes	2015-09-21 13:45:18 -07:00
Chad Pilkey	a736008046	fix locking being reversed	2015-09-21 13:44:23 -07:00
Richard Alam	11fbefb5ef	- make lock settings behave like in 0.9	2015-09-21 20:42:04 +00:00
Richard Alam	1f5a7f5fc7	Merge pull request #2794 from ritzalam/fix-issue-where-users-hang-around ... Fix issue where users hang around	2015-09-21 10:45:23 -04:00
Richard Alam	8ede5983ea	- do not re-inject message into the actor but instead process the message inline to prevent ... race condition where a message gets processed before the injected message	2015-09-21 14:42:07 +00:00
Richard Alam	878684b919	Merge branch 'change-logging-format' into fix-issue-where-users-hang-around	2015-09-21 13:56:06 +00:00
Richard Alam	5a986f5bc6	- change logging format	2015-09-21 13:55:23 +00:00
Richard Alam	1b8cb41152	- initialize voice user properly when disconnected from global audio	2015-09-17 20:26:00 -04:00
Ghazi Triki	57d94bd5e4	The use is able to write a multi-line chat message.	2015-09-17 10:37:56 +01:00
Ghazi Triki	920fc97532	Merge branch 'master' into client-logging-to-server	2015-09-16 21:11:33 +01:00
Richard Alam	c13e17a7d4	Merge pull request #2770 from riadvice/chat-message-limit ... Add a maximum allowed length to chat message	2015-09-16 15:04:26 -04:00
Ghazi Triki	07d7f389c1	Logging format can be configured in flex client application.	2015-09-16 18:55:09 +01:00
Richard Alam	cc5c26b0bc	Merge pull request #2785 from ritzalam/log-flash-capabilities ... Log flash capabilities	2015-09-16 10:39:52 -04:00
Richard Alam	899b98f81b	Merge pull request #2780 from riadvice/puffin-browser ... Enable video and audio sharing for Puffin browser 4.6 and above.	2015-09-15 16:12:25 -04:00
Richard Alam	2bea0c778c	- clean-up by removing some debug logs	2015-09-15 20:04:06 +00:00