Commit Graph

1814 Commits

Author SHA1 Message Date
Leonardo Crauss Daronco
d2f09e916d Redraw shapes when resizing the HTML5 client
Only redrawing shapes that were loaded when the HTML5 started. Shapes
drawn before are not being saved in the arrays yet and so are not being
redraw when resizing (they disappear).
2013-04-27 11:58:20 -04:00
Leonardo Crauss Daronco
9589e7c7a1 Fix positioning of shapes in the whiteboard, not 100% yet 2013-04-25 19:54:26 -04:00
Leonardo Crauss Daronco
714cccc1f0 Fix the color of shapes drawn in the whiteboard 2013-04-25 17:12:55 -04:00
Leonardo Crauss Daronco
6c102519af Removing some class variables in WhiteboardPaperModel
They are variables that store the position and size of slides and now are
store with the slide they are associated with.
2013-04-25 16:57:20 -04:00
Leonardo Crauss Daronco
62739fa9fe Resize the slides to occupy 100% of the space 2013-04-25 10:05:38 -04:00
Dale Karp
0813595c61 fixed merges 2013-04-10 17:23:40 +00:00
Dale Karp
d721f762a8 fix merge conflicts 2013-04-10 16:44:42 +00:00
Markos Calderon
dfbf081409 added support for rect shape 2013-03-25 16:35:45 -05:00
Markos Calderon
c5a63cb1fb fix whiteboard shape doesn't appear when you change slide 2013-03-24 15:30:50 -05:00
Markos Calderon
2b95385c39 fixed whiteboard gap bug 2013-03-22 18:06:36 -05:00
Dale Karp
d239744c77 slides center in viewport when fitToPage is true 2013-03-20 16:46:29 +00:00
Dale Karp
f02751be0d #slide resizes on page load, fills up presentation area 2013-03-18 17:48:05 +00:00
Dale Karp
9bfbb0f754 pausing work on whiteboard issue for now 2013-03-07 20:32:14 +00:00
Dale Karp
0f19182ad6 removed css default width/height for whiteboard 2013-03-07 18:00:08 +00:00
Dale Karp
fef3c2e198 progress check in for resizing html5 whitebord 2013-03-01 21:36:46 +00:00
Dale Karp
80cf67ccff integrating ScaleRaphael into current project 2013-02-28 15:26:36 +00:00
Dale Karp
9129158ea1 adding scale.raphael.js 2013-02-26 18:40:25 +00:00
Dale Karp
ac38917977 bah 2013-02-22 18:48:28 +00:00
Dale Karp
ef1a8e9d86 now have ScaleRaphael building properly 2013-02-21 17:59:48 +00:00
Dale Karp
87a078e655 renamed scale.raphael.js to be less confusing 2013-02-21 17:32:25 +00:00
Dale Karp
e8964362ca adding new raphael scale library 2013-02-21 17:11:15 +00:00
Dale Karp
3be816f52a editing CSS for SVG area will scale to slides div 2013-02-15 18:28:13 +00:00
Markos Calderon
bdccc4eee7 html5 branch updated with the latest changes from the master 2013-01-29 20:24:36 -05:00
Fred Dixon
de47e2e65e Updated license header to LGPL 3.0 2013-01-27 09:44:40 -05:00
Markos Calderon
ba2da7004c Merge almost complete. Still red dot not working 2013-01-25 21:50:32 -05:00
Markos Calderon
5348a4892a check if the browser supports websockets 2013-01-23 11:40:12 -05:00
Markos Calderon
e104941d54 Changes for sync users 2013-01-22 17:56:17 -05:00
Fred Dixon
08bb37a6c3 Added sample voiceBridge parameter 12345 2013-01-18 15:41:43 -05:00
Fred Dixon
e075e65cbe Changed voiceBridge parameter from optional to required in PHP library in labs 2013-01-18 15:40:18 -05:00
Calvin Walton
07357ce15b Demonstration code for video view 2013-01-15 18:11:05 +00:00
Calvin Walton
9e6de065ad Merge branch 'html5-bridge' of git://github.com/kepstin/bigbluebutton into html5-bridge-ipad
This pulls in the icecast changes

Conflicts:
	labs/bbb-html5-client/README.md
2013-01-15 18:09:39 +00:00
Leonardo Crauss Daronco
ff3d00f579 Add video area and hide presenter tools in the html5 client 2013-01-06 17:46:25 -02:00
Leonardo Crauss Daronco
950c7bf8f5 First changes to make the html5 client look good in an iPad
Smaller presentation, chat always visible, user list on top of chat.
2013-01-05 21:40:29 -02:00
Leonardo Crauss Daronco
1ef17be130 Fix wrong cursor position when presenter
Container dimensions were not set when the first slide was added to the screen.
2012-12-19 16:54:11 -02:00
Leonardo Crauss Daronco
98d4cba3c8 Use r.js to optimize the html5 client
Development works as it was before. In production the js file loaded is the optimized one.

Had to wrap the colorwheel plugin in a define() call.
jQuery now is always loaded from googleapis, the local files were removed.
2012-12-19 16:42:58 -02:00
Leonardo Crauss Daronco
45a264a211 Fix the dimensions of the container at WhiteboardPaper
They were always 0x0 at startup until the page was resized.
2012-12-17 18:25:54 -02:00
Leonardo Crauss Daronco
423bbcf41e Fix selection of users in the user list 2012-12-17 17:51:12 -02:00
Leonardo Crauss Daronco
c42d6c29ae Fix the position of the cursor when the html5 clients is the presenter 2012-12-17 17:45:15 -02:00
Leonardo Crauss Daronco
5bb4075577 Small changes in the layout: whiteboard tools to bottom 2012-12-17 17:17:51 -02:00
Leonardo Crauss Daronco
27c8a7abde Increase requirejs's timeout to 60 secs (for iPads)
For some reason an iPad takes ~30 seconds to load the initial page.
2012-12-17 17:15:26 -02:00
Leonardo Crauss Daronco
036e77f559 Split the session template into smaller templates rendered by the subviews 2012-12-14 22:58:14 -02:00
Leonardo Crauss Daronco
f29b73c16c Prefix private methods with an underline and remove unecessary files 2012-12-14 22:41:30 -02:00
Leonardo Crauss Daronco
2577123726 Migrate the form validation on login to LoginView 2012-12-14 22:16:25 -02:00
Leonardo Crauss Daronco
d795a56c93 Allow page refreshes and redirect the user to the session when already logged in
User authentication now through /auth (GET|POST). /chat removed.
Increased the time limit for a user to be logged out from 1sec to 5secs (the pages take a bit longer to load now).
2012-12-14 22:03:38 -02:00
Leonardo Crauss Daronco
4b80352e8e Move the last methods to the new models/views, and remove the old js files
Also updated jQuery UI css to v1.9.2, using the theme ui-lightness
2012-12-13 23:54:10 -02:00
Leonardo Crauss Daronco
c562f5cd85 Methods to draw in the whiteboard migrated to views/models 😓
Almost everything migrated now, even though not everything's working 100% yet.
2012-12-13 17:35:57 -02:00
Leonardo Crauss Daronco
fdc12ccb6c Add a toolbar on top os slides with actions that are not yet in the main navbar
Such as the upload of slides.
2012-12-13 15:26:02 -02:00
Leonardo Crauss Daronco
a397e2be63 Color picker working
colorwheel.js code updated to jweir/colorwheel@be140fb2f8
This version allows the colorwheel to be inside a DOM element and has built-in integration with a text input.
2012-12-13 00:04:43 -02:00
Leonardo Crauss Daronco
9938e11662 Presentation zooming and fitting migrated to the new models/views 2012-12-12 23:02:35 -02:00
Leonardo Crauss Daronco
a0753ab4f3 Move a few more methods from the old js files to new models/views 2012-12-12 00:15:14 -02:00
Markos Calderon
7a3d22d74e Update labs/bbb-html5-client/README.md 2012-12-11 16:50:36 -05:00
Markos Calderon
5b73384994 Update labs/bbb-html5-client/README.md 2012-12-11 16:34:58 -05:00
Leonardo Crauss Daronco
152e601e54 Cursor movement and slide changes now working 2012-12-11 19:15:08 -02:00
Leonardo Crauss Daronco
2e2a37c6f8 Drawing functions now available in WhiteboardPaperModel
Actions (drawings) in the whiteboard are now shown in the html5 client.
2012-12-11 18:48:38 -02:00
Leonardo Crauss Daronco
bbe1c63c9f Basic whiteboard functionality in a new view and model
All it can do for now is initialize the Raphel objects and show the slide images in the screen.
2012-12-11 17:37:32 -02:00
Leonardo Crauss Daronco
79d88135ab More options in the authentication object stored in the client
Authentication object is stored during the session, with data (currently with meetingID and username) sent by the server.
2012-12-10 23:51:01 -02:00
Leonardo Crauss Daronco
b11f12eb16 User list with selection of users and set presenter working 2012-12-10 23:29:56 -02:00
Leonardo Crauss Daronco
308ddb691d Treat more socket.io events: login, logout and chat now working with backbone 2012-12-10 16:28:30 -02:00
Leonardo Crauss Daronco
8ca78dd83e Split SessionView in subviews and add treatment to basic events
Events that were in chat/behaviour.coffee are now in Backbone views.
2012-12-10 14:34:06 -02:00
Leonardo Crauss Daronco
5677bd4fb3 Add ConnectionModel that uses socket.io to connect to the server 2012-12-10 12:46:20 -02:00
Leonardo Crauss Daronco
5727fd9b07 Session view now is visually ok, but with javascripts still disabled
Only login and logout work by now.
Methods in the old chat javascripts are almost all commented until they are refactored to use backbone.
2012-12-09 18:34:32 -02:00
Leonardo Crauss Daronco
519ac9ce0e First version of a single page html5 client app
Very simple by now, but with login working and switching to a (not yet implemented) session view.
2012-12-09 16:39:29 -02:00
Leonardo Crauss Daronco
9561790dcb Use require.js and coffeescript in the index page 2012-12-08 23:24:23 -02:00
Leonardo Crauss Daronco
dcc6393c4c jQuery v1.8.3, jQuery UI v1.9.2, both from googleapis with local fallbacks 2012-12-08 22:44:03 -02:00
Leonardo Crauss Daronco
0dce4b1b25 Convert the cclient scripts in chat/ to coffeescript 2012-12-08 22:26:58 -02:00
Leonardo Crauss Daronco
f70a48ad81 Remove js triggers from the chat view and refactor it to be a bit more readable
Also refactored behaviour.js a bit.
2012-12-08 20:54:05 -02:00
Leonardo Crauss Daronco
27f4a00940 First version with require.js in the client side
Events trigger from the chat view are not working yet.
2012-12-08 20:27:27 -02:00
Richard Alam
3265e6c2a1 - add example in 3rd party html to lock unlock layout 2012-11-01 18:45:51 +00:00
Richard Alam
d5b14ccb39 - cleanup 2012-10-28 15:56:03 +00:00
Richard Alam
4b22fbbd3b - display users 2012-10-28 15:41:08 +00:00
Richard Alam
2b92bf0dd6 - still can't get users to display...to be continued. 2012-10-26 23:01:55 +00:00
Richard Alam
a894397999 - still trying to display users 2012-10-26 22:22:59 +00:00
Richard Alam
3f64313fff - try to display users when new user join...still trying to figure why it won't 2012-10-26 20:22:19 +00:00
Richard Alam
b8e8a2d069 - display flash client between users and chat 2012-10-26 18:07:43 +00:00
Richard Alam
cb722385ac - display flash client inside html 2012-10-26 15:11:06 +00:00
Richard Alam
1d2f818f25 - create embed html example 2012-10-25 21:12:21 +00:00
Richard Alam
1fda7a3af9 - demo html5 client embedding BigBlueButton Flash Client 2012-10-25 19:32:19 +00:00
Markos Calderon
4d76c61417 added a better quality for converting images 2012-10-24 14:37:25 -05:00
Markos Calderon
7e4381f362 removing upload button 2012-10-23 15:16:42 -05:00
Markos Calderon
faeac6a6e1 move and back slides 2012-10-23 13:32:59 -05:00
Markos Calderon
9e45420a4c load presentation in both sides html5 and flex 2012-10-20 14:18:39 -05:00
Richard Alam
89bf8f9972 ignore modules 2012-10-14 18:30:56 -07:00
Richard Alam
007c51eef0 ignore modules 2012-10-14 18:29:14 -07:00
Richard Alam
4427c86a7a playing around with node 2012-10-14 13:15:09 -07:00
Markos Calderon
48c0830efc setpresenter, mouse movement, and starting to send pencil drawings 2012-10-05 17:07:17 -05:00
Calvin Walton
4fea74251b Add additional buttons with some presentation controls.
For now, the buttons are just going into the bottom bar, and some are
missing icons.
2012-10-05 14:57:02 -04:00
Calvin Walton
18a74e3871 Update HTML5 client CSS to closer match the mockup style 2012-10-05 13:33:37 -04:00
Markos Calderon
9352e198ef setPresenter integrated 2012-09-25 18:29:58 -05:00
Markos Calderon
173211bdec integrating setPresenter call 2012-09-21 14:42:17 -05:00
Calvin Walton
a4331acb06 Add the new user interface
It's still partially incomplete - missing the presentation controls, but
it's a start :)
2012-09-16 14:06:12 -04:00
Markos Calderon
baa9eef486 chat almost complete... pending chat history in flex client 2012-09-15 03:15:14 -07:00
Markos Calderon
8053c15b9e participants module full working 2012-09-15 01:44:17 -07:00
Markos Calderon
ce9d7c1706 API stores meeting in redis, apps stores users in redis 2012-09-14 16:48:05 -07:00
Fred Dixon
abce700f11 Merge pull request #62 from ryanseys/master
Add bbb-html5-client to labs
2012-09-10 13:21:47 -07:00
Ryan Seys
69e27955b3 Add bbb-html5-client to labs not as submodule 2012-09-07 15:02:21 -04:00
Ryan Seys
1288b0b1cc Remove submodule 2012-09-07 15:00:13 -04:00
Ryan Seys
9a8283951f Add bbb-html5-client to labs 2012-09-07 14:48:07 -04:00
Vikrant1
c84d809ec4 Update labs/bbb-api-php/includes/bbb-api.php
Fixed function getCreateMeetingUrl() so that the duration parameter is passed properly when creating meeting. Minor change was required to the file:
Line 137 was changed to end with ";" instead of "."
2012-08-08 22:56:10 +02:00
Tiago Daniel Jacobs
65d1e4436f Initial commit of installer folder. 2012-08-07 12:07:11 -03:00
Tiago Daniel Jacobs
a794bb5319 Initial Commit 2012-08-06 17:16:47 -03:00
Tiago Daniel Jacobs
6a8e5cf5f8 Initial commit of applet-jni test. 2012-08-03 07:22:16 -03:00
Jesus Federico
485155bb96 Updated README on bbb-api-php and bbb-api-php-legacy placed in labs 2012-04-05 11:07:10 -04:00
Jesus Federico
d368aef0f6 Added petermentzer bbb-api-php contribution to labs 2012-04-05 10:47:53 -04:00
Fred Dixon
c431169bd7 Changed redis host for bigbluebutton.yml to 127.0.0.1 2011-07-10 08:38:12 -07:00
Richard Alam
491e2af437 - cleanup and move webminer into labs 2011-05-22 15:59:33 -04:00
Fred Dixon
acb45b34a7 - Added a labs area for creating test scripts; added bbb-test, a utility to launch multiple BigBlueButton clients within firefox for testing see (http://code.google.com/p/bigbluebutton/wiki/Testing) 2011-01-23 03:53:51 +00:00
Richard Alam
c1edb67290 - moved the record-and-playback folder from labs 2010-07-19 12:16:11 -04:00
Marco Calderon
50467d4f0f added playback client and web 2010-07-12 22:01:12 +00:00
root
666c745ee4 webminer update files references 2010-07-08 20:41:23 +00:00
Markos Calderon
e18759710c added message-producer and message-recorder 2010-06-05 14:58:45 +00:00
Markos Calderon
4727684a31 message generator - read lecture.xml and send to a queue 2010-06-05 09:25:35 +00:00
Richard Alam
01554b1266 - add README 2010-05-31 21:36:31 -04:00
Richard Alam
7ac6ff51d9 - adding .classpath and .project to .gitignore 2010-05-31 21:33:55 -04:00
Richard Alam
89d47f9da6 - initial commit of record-and-playback into labs folder 2010-05-31 20:45:13 -04:00