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

10867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
5fe15691e1 - cleanup 2015-05-28 15:51:03 +00:00
Richard Alam
d64e5a1a85 - rename packages 2015-05-28 15:48:18 +00:00
Richard Alam
994a1bb336 - rename old packages 2015-05-28 15:45:00 +00:00
Richard Alam
1f02d3ba06 - move messages into it's own package 2015-05-28 15:39:33 +00:00
Richard Alam
e05a7e4fcf - voice messages 2015-05-27 22:01:47 +00:00
Richard Alam
811f0e4537 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into upgrade-to-scala-2.11 2015-05-27 21:13:31 +00:00
Richard Alam
39bbcc2c9b Merge pull request #647 from kepstin/presentation-security-master 
web: check that meeting is running before allowing presentation upload
 2015-05-27 17:13:12 -04:00
Richard Alam
9d020b0e7d - start converting voice messages 2015-05-27 21:06:44 +00:00
Calvin Walton
9deb87d0b0 web: check that meeting is running before allowing presentation upload 2015-05-27 15:08:04 -04:00
Chad Pilkey
638c3f24a3 First pass at the UsersWindow 2015-05-27 14:56:42 -04:00
Chad Pilkey
13fc30a331 Using depth property for Window focus 2015-05-27 14:56:13 -04:00
Chad Pilkey
1b520060b4 Fixed listenOnly indicators in Flash 2015-05-27 14:55:26 -04:00
Maxim Khlobystov
cb140cce99 Repaired the styling of slide navigation buttons. 2015-05-27 10:48:25 -07:00
Maxim Khlobystov
1fa46ab6dd Made the whiteboard's height flexible depending on the presence of the slide navigation controllers. 2015-05-27 10:29:59 -07:00
Maxim Khlobystov
71fe855fa7 Prevented the slide from going beyond the whiteboard's top border. 2015-05-27 09:58:06 -07:00
Richard Alam
c083c14135 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/red5/client/PresentationClientMessageSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/Util.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
 2015-05-27 15:31:25 +00:00
Anton Georgiev
18c828cb41 -whiteboard redis->red5 2015-05-27 10:41:20 -04:00
Chad Pilkey
9ac0f24edf Made the whole User object Bindable 2015-05-27 10:24:14 -04:00
Richard Alam
b922fd3437 - start implementing presentation messages 2015-05-26 22:12:45 +00:00
Chad Pilkey
217b5c37d6 Merge pull request #646 from gthacoder/meteor-client-right-hand-menu 
HTML5 client: right-hand menu.
 2015-05-26 17:27:09 -04:00
Maxim Khlobystov
0b7749ec3c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-right-hand-menu 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-05-26 14:15:12 -07:00
Maxim Khlobystov
74b85b56fc Made the Toggle Chat button work. 2015-05-26 14:09:54 -07:00
Chad Pilkey
3ce0fcc0e5 Merge pull request #644 from OZhurbenko/meteor-ui 
Private chat
 2015-05-26 17:09:39 -04:00
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