BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,410 Commits 13 Branches 260 Tags 1.1 GiB
09e907d2ba
Commit Graph

10410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
cf7d170df9 Merge pull request #645 from gthacoder/meteor-client-switching-slides 
HTML5 client: presenter switching slide with the new UI.
 2015-05-26 17:05:47 -04:00
Maxim Khlobystov
d9f8b95680 Corrected the size of the Logout dialog in portrait mode. 2015-05-26 13:38:00 -07:00
Maxim Khlobystov
db15a173bb Made the Logout dialog work in portrait orientation. 2015-05-26 13:27:41 -07:00
Maxim Khlobystov
60ad8ab631 Adjusted the size of the Settings modal window in mobile view. 2015-05-26 13:21:56 -07:00
Maxim Khlobystov
531ada09df Moved the inline CSS related to the Settings modal window to the LESS file. 2015-05-26 12:45:48 -07:00
Chad Pilkey
1b7b40763c Corrected the ChatWindow and View cleanup 2015-05-26 15:21:41 -04:00
Richard Alam
dd6d22ce94 Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/Util.java
 2015-05-26 19:04:03 +00:00
Richard Alam
1f5bce2228 - implement layout messages 2015-05-26 18:49:53 +00:00
Chad Pilkey
d765f3b65c The chat window functions in the new client 2015-05-26 14:31:48 -04:00
Chad Pilkey
c7cda3029f Removed an unneeded setter from private chat 2015-05-26 14:31:17 -04:00
Chad Pilkey
37060a87be Re-enabled the AIR chat send button after success 2015-05-26 14:30:56 -04:00
Maxim Khlobystov
06496b4835 Made the Settings button functional in portrait orientation. 2015-05-26 11:05:19 -07:00
Richard Alam
9a28cbc516 - remote chat application (cleanup) 2015-05-26 16:58:52 +00:00
Richard Alam
3c14827c27 - initialize permissions messages 2015-05-26 16:51:04 +00:00
Anton Georgiev
0982e28449 accommodate for drawing text shapes 2015-05-26 11:58:37 -04:00
Anton Georgiev
1a7c0076a0 -whiteboard events red5->redis 2015-05-26 11:35:21 -04:00
Richard Alam
f4cbc0ef13 - finish users messages 2015-05-26 15:29:15 +00:00
Richard Alam
79d48df4cf - implement user messages from red5 to bbb-apps 2015-05-26 15:20:10 +00:00
Maxim Khlobystov
934edd5a75 Made sure the presentation progress label never contains an undefined slide number, thus becoming too long and making the scrollbar appear. 2015-05-25 15:30:57 -07:00
Maxim Khlobystov
6ca9bb1465 Got back the label indicating the current slide's number. 2015-05-25 15:27:06 -07:00
Richard Alam
c603702259 Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetChatHistory.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetChatHistory.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetChatHistoryRequestMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
 2015-05-25 22:14:49 +00:00
Richard Alam
6a8dc89793 - determine if message is published or subscribed message type 2015-05-25 21:54:46 +00:00
Richard Alam
ee3280af44 - organize messages 2015-05-25 21:38:11 +00:00
Maxim Khlobystov
b8e32bf316 Added the presenter's slide navigation to the new UI. 2015-05-25 14:36:43 -07:00
Richard Alam
3619fd4bd9 - cleanup 2015-05-25 20:38:37 +00:00
Anton Georgiev
33f189c965 Merge branch 'upgrade-to-scala-2.11' of https://github.com/ritzalam/bigbluebutton into encode-decode-json 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Constants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Util.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/red5/ChatClientMessageSender.scala
 2015-05-25 16:32:53 -04:00
Anton Georgiev
bb415779cb -chat reply to redis 2015-05-25 16:16:12 -04:00
Richard Alam
55449282b6 - split out the client message senders 2015-05-25 20:06:59 +00:00
Richard Alam
81cde8c9ff - finish converting users messages 2015-05-25 19:36:49 +00:00
Richard Alam
22acfdada1 - fix listen only 2015-05-25 19:08:16 +00:00
Richard Alam
2570b704d5 - get users reply message 2015-05-25 18:52:25 +00:00
Richard Alam
d345517482 - convert recording messages 2015-05-25 17:37:28 +00:00
Richard Alam
163d2ec552 - convert meeting state and meeting muted messages 2015-05-25 16:14:48 +00:00
Richard Alam
8ad21545b8 - convert more voice messages 2015-05-25 15:04:13 +00:00
Richard Alam
d52795f66b - add voice messages 2015-05-25 14:44:19 +00:00
Richard Alam
96a7bff10e - convert webcam messages 2015-05-25 14:08:29 +00:00
Oleksandr Zhurbenko
933ffe102f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
 2015-05-24 20:32:13 -07:00
Oleksandr Zhurbenko
42515fd477 Private chat styling 2015-05-24 20:24:21 -07:00
Oleksandr Zhurbenko
0571237619 Search for a username to display on the private chat tab 2015-05-24 20:19:57 -07:00
Richard Alam
b100862087 - convert raise hand messages 2015-05-22 22:12:58 +00:00
Anton Georgiev
f1b5fdda73 package moved 2015-05-22 17:21:37 -04:00
Anton Georgiev
12b8ecf0ac cleaning up 2015-05-22 16:45:10 -04:00
Richard Alam
6018ff2290 Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/Red5BBBInGw.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2015-05-22 20:41:34 +00:00
Richard Alam
b542cd6382 - convert more messages 2015-05-22 20:17:57 +00:00
Anton Georgiev
a79c5f4122 lock settings to redis 2015-05-22 16:12:01 -04:00
Richard Alam
00866892c4 - make joining work 2015-05-22 18:30:37 +00:00
Maxim Khlobystov
a127b1e0d1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client 2015-05-22 11:30:17 -07:00
Richard Alam
97262f721f - restructure messages into package 2015-05-22 15:16:40 +00:00
Richard Alam
7ad9e64ec3 Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/Red5BBBInGw.java
 2015-05-21 16:17:47 -07:00
Anton Georgiev
40a45bb09d keep only red5BBBInGW 2015-05-21 18:51:31 -04:00