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

8343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
22eaddc648 missed this during the merge from bigbluebutton:master 2014-08-21 18:48:58 +00:00
Anton Georgiev
f1055361c9 Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into merging-html5-with-master 2014-08-21 18:26:00 +00:00
Anton Georgiev
e93819e3af cleaning up 2014-08-21 18:24:01 +00:00
Anton Georgiev
078fbc938e minor fix 2014-08-21 18:06:34 +00:00
Anton Georgiev
9435b5ee7b (un)muting in Flash is displayed in HTML5 2014-08-21 18:06:08 +00:00
syeshchenko
85d3e5f72a properly resized upload presentation window, removed unnecessary text 2014-08-21 10:48:13 -07:00
Richard Alam
c30c709ac3 - add comment on why we lowercase meta param 2014-08-21 10:11:56 -07:00
Richard Alam
4dbf327567 - maintain backward compatibility with 0.8.1 where it converts meta params keys to lowercase 2014-08-21 08:13:50 -07:00
perroned
8a26a7b2a7 Hide settings icon 2014-08-21 08:11:31 -07:00
perroned
64ff5f1da2 Unified color conversion methods combining both to make it better, placed it in globals.coffee as a coffeescript function, and added a global handlebars helper that calls it too. 2014-08-21 07:40:19 -07:00
perroned
f0738dda62 Fixed up issue where closing tags for anchor links were not properly ended causing all following text to be swallowed up in the link text. 2014-08-21 07:12:38 -07:00
perroned
dd9267fab0 Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates 2014-08-21 06:49:20 -07:00
Maxim Khlobystov
75d9c03b48 Tags and line breaks inside the chat messages have been replaced with the ASCII equivalents (keeping links clickable). 2014-08-20 22:14:15 -07:00
Fred Dixon
a7b074df98 Merge pull request #370 from SenecaCDOT-BigBlueButton/mac-chrome-allow-audio-window 
when on Mac - move chrome audio image to the right
 2014-08-20 17:34:11 -04:00
syeshchenko
d564292cd8 when on Mac - move chrome audio image to the right 2014-08-20 14:19:18 -07:00
Anton Georgiev
d59e3366dc fixed the auto display of shapes 2014-08-20 21:17:52 +00:00
Anton Georgiev
f9261d9696 fix indentation 2014-08-20 21:17:18 +00:00
Anton Georgiev
c746cd30f5 fix typo 2014-08-20 20:43:29 +00:00
Richard Alam
29ac6397ef Merge pull request #369 from SenecaCDOT-BigBlueButton/enable-raisehand-for-all 
fixed raise hand, and fixed an issue with the users grid roll over
 2014-08-20 15:13:57 -04:00
Anton Georgiev
e9113f3d9f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2014-08-20 18:59:50 +00:00
Anton Georgiev
c9ad7035b1 Merge branch 'merging-html5-with-master' of https://github.com/antobinary/bigbluebutton 2014-08-20 18:57:55 +00:00
Chad Pilkey
0b22dc8008 fixed raise hand for non-viewers, and fixed a long standing issue with the users grid roll over 2014-08-20 11:45:52 -07:00
Richard Alam
0ff3deb673 - add support for pre-built config xml 2014-08-20 11:43:12 -07:00
Richard Alam
11b8fa711e - provide a way to support pre-built config.xml 2014-08-20 11:42:31 -07:00
Richard Alam
d6aac8f24b - minor reorg 2014-08-20 11:41:54 -07:00
Richard Alam
8c67505a69 - minor reorg 2014-08-20 11:41:40 -07:00
Anton Georgiev
adf20cca7d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-08-20 15:24:25 +00:00
perroned
3caebfc1f4 Fixed error message when there are 0 messages in chat, and prevented unsafe data from being inserted into the DOM. 2014-08-20 08:02:48 -07:00
Richard Alam
de2abebe87 Merge branch 'add-mod-only-welcom-message' 2014-08-20 07:39:24 -07:00
Richard Alam
9f63ddd1f7 - add new param (moderatorOnlyMessage) on CREATE API 2014-08-20 07:37:31 -07:00
Richard Alam
8cf1c8cc94 Merge pull request #368 from speakserve/better-chat-url-regex 
Improved chat URL regex to match more urls
 2014-08-20 09:37:41 -04:00
Fred Dixon
f704a2f3e6 Correctly stop libreoffice when doing sudo bbb-conf --clean 2014-08-20 07:08:39 -04:00
Ghazi Triki
bb57d17c84 Improved chat URL regex to match more urls 2014-08-20 11:31:09 +01:00
Fred Dixon
31b04303f9 Update start/stop logic for BigBlueButton to also stop monit (thanks Calvin) 2014-08-19 17:53:32 -04:00
Anton Georgiev
a63ea5875e increased the size of the cursor to make it more visible 2014-08-19 21:20:11 +00:00
Anton Georgiev
de15efbc74 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-19 20:28:12 +00:00
Anton Georgiev
0cb9dc4668 cleaning up 2014-08-19 20:27:44 +00:00
Richard Alam
6f0bf00675 Merge pull request #367 from SenecaCDOT-BigBlueButton/webrtc-connection-window-questionmark-button 
'?' button on the WebRTC Audio Connection dialog will open default help ...
 2014-08-19 16:23:35 -04:00
perroned
47bbfad399 Working on whiteboard sizing 2014-08-19 13:22:29 -07:00
syeshchenko
39c7581d46 '?' button on the WebRTC Audio Connection dialog will open default help page 2014-08-19 13:10:06 -07:00
Anton Georgiev
6fcaf6537b cleaning up 2014-08-19 19:53:27 +00:00
Anton Georgiev
24fb6c55bb Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-19 19:40:54 +00:00
Anton Georgiev
3edc80bc63 improve the calculation for the relative location of the shape 2014-08-19 19:39:17 +00:00
Anton Georgiev
35086951e5 cleaning up 2014-08-19 19:36:45 +00:00
Anton Georgiev
639f672e29 fixed an issue where textShapes would disappear after page refresh 2014-08-19 19:09:37 +00:00
Anton Georgiev
6acc236cc8 cleaning up 2014-08-19 19:09:04 +00:00
Anton Georgiev
a976cd7c2e use the helper code within whiteboard_text 2014-08-19 18:46:50 +00:00
Anton Georgiev
a27bd5cd91 attempting to avoid the passing of a dom node as an argument 2014-08-19 18:45:45 +00:00
Chad Pilkey
84c5197097 Merge remote-tracking branch 'upstream/master' into enable-raisehand-for-all 2014-08-19 10:57:10 -07:00
Chad Pilkey
1689a86113 the raise hand button is now visible for all users 2014-08-19 10:56:03 -07:00