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

6331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
0ddadd25eb Merge branch 'html5-bridge' of github.com:mohamed-ahmed/bigbluebutton into mohamed-ahmed-html5-bridge 
Conflicts:
	labs/bbb-html5-client/package.json
 2013-09-27 17:48:15 +00:00
mohamed-ahmed
f208ca8a2d update cursor to appear the same size even when page is zoomed in 2013-09-27 17:09:24 +00:00
mohamed-ahmed
ad86f142d4 merged Gary's newUI and fixed conflicts 2013-09-27 16:07:38 +00:00
mohamed-ahmed
521dd3aa33 boarder now appears infront of ever other element (i.e. shapes_ 2013-09-24 18:27:26 +00:00
mohamed-ahmed
b6dd5eae5e added better styling to landing page 2013-09-24 18:05:28 +00:00
Gary Deng
fb8af3bdf7 implement html5 new interface 2013-09-24 06:13:09 -07:00
mohamed-ahmed
8a28dc9df5 added comment explaining cursor calculations 2013-09-23 20:45:01 +00:00
mohamed-ahmed
3764cc4ae1 cursor now moves to correct location 2013-09-23 20:43:38 +00:00
mohamed-ahmed
2695586f8c page resize now alsop handles fit to width 2013-09-23 20:11:32 +00:00
mohamed-ahmed
ca8dfa7e21 fixed zooming to handle fit to width 2013-09-23 18:29:16 +00:00
mohamed-ahmed
2a1d2f7525 simplified a function 2013-09-20 19:15:15 +00:00
Richard Alam
2b9f6b747e Merge pull request #257 from mohamed-ahmed/html5-bridge 
fixed ellipse tool
 2013-09-17 10:18:06 -07:00
mohamed-ahmed
f359337e6c fixed page resize 2013-09-17 16:54:29 +00:00
mohamed-ahmed
ad297e8079 fixed ellipse tool 2013-09-17 15:34:17 +00:00
Gustavo Salazar
173f8b7f18 Merge pull request #256 from mohamed-ahmed/html5-bridge 
now the zooming will still be correct when the window is resized
 2013-09-16 13:53:51 -07:00
mohamed-ahmed
20c9118b68 now the zooming will still be correct when the window is resized 2013-09-16 18:36:16 +00:00
Gustavo Salazar
59159ee216 Merge pull request #255 from mohamed-ahmed/html5-bridge 
html5 client now handles the zoom event I created
 2013-09-16 08:58:27 -07:00
mohamed-ahmed
58ab406e12 html5 client now handles the zoom event I created 2013-09-16 15:45:58 +00:00
Richard Alam
b9b4049c52 Merge pull request #252 from mohamed-ahmed/html5-bridge 
added 'move_and_zoom' event to pubsub
 2013-09-11 12:01:37 -07:00
mohamed-ahmed
7a50b35873 added 'move_and_zoom' event to pubsub 2013-09-10 20:54:49 +00:00
Gustavo Salazar
3932b879e3 Merge pull request #239 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-08-28 09:32:39 -07:00
mohamed-ahmed
df5721ecae ellipse tool can now draw prefect circle in html5 client 2013-08-27 21:30:54 +00:00
mohamed-ahmed
2951a3bbd8 slide size hotfix 2013-08-26 14:32:19 +00:00
Chad Pilkey
cac0008d32 Merge pull request #232 from daronco/html5-bridge-packages 
Set specific versions for the HTML5 client's dependencies
 2013-08-23 06:47:30 -07:00
Leonardo Crauss Daronco
fc00a8639d HTML5: Update jade to 0.34.1 and remove warnings 
Removed the warnings:
"Implicit textOnly for `script` and `style` is deprecated.  Use `script.` or `style.` instead."
 2013-08-16 19:00:15 -03:00
Leonardo Crauss Daronco
13ff0b0d19 HTML5: Set specific versions for the dependencies 
It's always better to have specific version to force all instances to
use exactly the same dependencies and avoid errors that will naturally
happen when libs are updated.
Also restricted the version of node to 0.10.x.
 2013-08-16 18:42:21 -03:00
mohamed-ahmed
995359a9d4 merged latest with my local changes 2013-08-14 16:48:54 +00:00
Fred Dixon
f9af393c9f Merge pull request #225 from jent46/html5-bridge 
Update Html5 Branch with BBB 0.81
 2013-08-14 09:08:31 -07:00
jent46
614fad9aae Merge remote branch 'downstream/html5-bridge' into html5-bridge 2013-08-13 16:12:41 -07:00
mohamed-ahmed
2df93fa993 modified local settings to be able to run on my system 2013-08-02 20:48:31 +00:00
Richard Alam
d24a90b487 Merge pull request #224 from SenecaCDOT-BigBlueButton/Activate-Undo-ClrPaper-Events 
Activate "undo" and  "clrpaper" events
 2013-08-01 15:44:41 -07:00
Gary Deng
f04c048526 After clearShape,currentshape should not be null 2013-08-01 08:57:17 -07:00
Gary Deng
17881b19ee remove unnecessary changes 2013-08-01 08:27:22 -07:00
Gary Deng
ebe17628f5 send undo and clrPaper events to html5-client, and enable html5-client to see square while Ctrl keypressed 2013-08-01 08:10:59 -07:00
Jorge Nunez
5b1d62f5d2 Merge remote branch 'upstream/master' into html5-bridge 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2013-07-31 17:27:33 -07:00
Chad Pilkey
3b758bb0b1 Merge pull request #221 from SenecaCDOT-BigBlueButton/fix-whiteboard-text-create 
you can now create a whiteboard text box from any draw direction
 2013-07-31 15:13:26 -07:00
Chad Pilkey
7b3e278232 you can now create a whiteboard text box from any draw direction 2013-07-31 13:58:54 -07:00
Chad Pilkey
5aba2b7c5d Merge pull request #220 from SenecaCDOT-BigBlueButton/fix-whiteboard-pagechange 
fixed the annotations disappearing on page change
 2013-07-30 17:36:16 -07:00
Chad Pilkey
b7cbe197f9 fixed the annotations disappearing on page change 2013-07-30 17:30:37 -07:00
Chad Pilkey
397994cdb9 Merge pull request #219 from SenecaCDOT-BigBlueButton/better-logout 
Better logout
 2013-07-30 17:29:07 -07:00
jtrobinson
674195ea71 Config Template contains boolean flag to activate/deactivate logout confirmation (default is true). Also cleaned up remnants of old custom Confirm component. 2013-07-30 08:52:07 -07:00
jtrobinson
5ab068d201 Removed custom ConfirmLogoutWindow.mxml. Committing mx:Alert-based logout confirmation. 2013-07-30 07:25:48 -07:00
Richard Alam
5cf7a60cf7 - do not show eject button when allowKickUser is false 2013-07-29 12:43:07 -07:00
Richard Alam
05490b130b - do not show unlocked layout icon to viewers 2013-07-29 11:35:09 -07:00
Richard Alam
e80e368a1e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-07-27 12:32:14 -07:00
Fred Dixon
a306eac7cf Modified test Java link in default.pdf 2013-07-27 19:34:25 -07:00
Fred Dixon
c60d739584 Updated defaut.pdf to have a link to test running a Java applet (for testing desktop sharing) 2013-07-27 19:16:15 -07:00
Richard Alam
d8cae838d7 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1587 where 
webcam cannot be started again when window is closed while previewing video
 2013-07-27 12:17:23 -07:00
Richard Alam
7752f49e03 - move commons-io jar into red5/lib as we get a class not found error when 
desktop sharing is tunneling
 2013-07-27 02:07:43 -07:00
Fred Dixon
63309b30ab Merge pull request #218 from tylercopeland/updated-upload-icon 
Updated upload document icon
 2013-07-26 12:51:34 -07:00