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

298 Commits

Author SHA1 Message Date
Leonardo Crauss Daronco
3fc84c775b Refactor routes/index as a class MainRouter 
Also removed some methods/routes that were not being used and will have to
be refactored anyway if they are needed in the future. They are: get_join,
to join the session getting the username and password from the url, and
post_upload, to upload presentations from the html5 client (this was a
specially big method).
 2013-10-30 10:07:30 -02:00
Leonardo Crauss Daronco
15df4de206 HTML5: Move methods from redis/index to a class RedisAction 
Not working 100% yet and a lot more can be improved in this class.
The rest of the code should also be moved into classes like this one.
 2013-10-30 10:06:58 -02:00
Leonardo Crauss Daronco
75769a27f0 HTML5: fix requires and global variables in the server 
Now there's a 'config' module to store global configurations.
The requires have to be made locally for the modules needed, can't just
require everything on app.js as it was before.
 2013-10-30 10:06:58 -02:00
Leonardo Crauss Daronco
ea13a399dc HTML5: basic conversion of the server to coffeescript 
Simply converted from js to coffee, a lot is still not working and a lot
more has still to be improved.
 2013-10-30 10:06:58 -02:00
tylercopeland
499aba5f03 css style updates 2013-10-29 19:01:52 -04:00
Richard Alam
c23ca787a4 Merge pull request #282 from mohamed-ahmed/html5-bridge 
fixed it so that shapes won't be erased when changing slides
 2013-10-29 07:56:52 -07:00
mohamed-ahmed
129ab9f5ca fixed it so that shapes won't be erased when changing slides 2013-10-29 14:47:26 +00:00
Richard Alam
8e9acfdf75 - add version for request module 2013-10-28 12:01:48 -07:00
Richard Alam
8e04927ea2 Merge pull request #281 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-10-28 09:57:57 -07:00
mohamed-ahmed
a470e27614 fixed merge conflicts 2013-10-28 15:01:15 +00:00
mohamed-ahmed
b94fa93c1b added photo to repo and handles if it can't load 2013-10-06 17:30:52 +00:00
mohamed-ahmed
6e8dff75d2 adding styling and logo to login page 2013-10-06 17:29:14 +00:00
mohamed-ahmed
6d1f711ab6 removed 'switch users' element 2013-10-06 16:59:52 +00:00
mohamed-ahmed
c20f5be445 fixed button sizing on page resize 2013-10-04 22:33:41 +00:00
mohamed-ahmed
597a383aa1 fixed icon sizing 2013-10-04 20:57:26 +00:00
mohamed-ahmed
66398d4e15 fixed icon sizing 2013-10-04 20:20:09 +00:00
mohamed-ahmed
b9a700c2c5 fixing right button group on navbar 2013-10-04 19:01:50 +00:00
mohamed-ahmed
45b4b68d44 progress on fixng navbar 2013-10-04 18:57:11 +00:00
mohamed-ahmed
4d66f0273c fixed some UI changes for freds demo 2013-10-03 21:16:42 +00:00
mohamed-ahmed
825dcd110a progess on changing layout 2013-10-03 16:05:23 +00:00
Richard Alam
f14bf93d26 Merge pull request #265 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-09-30 11:29:52 -07:00
mohamed-ahmed
8213272485 fixed drawing reversed square in both flash client and html5 client 2013-09-30 18:23:29 +00:00
mohamed-ahmed
3e8a592934 can now draw circles in reverse like the bug i fixed in the flash client 2013-09-30 16:02:32 +00:00
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
300287e71d - just rename the directory 2013-09-13 15:37:25 +00:00
Richard Alam
817a86637f - add init.d script for bbb-callback 2013-09-13 15:34:51 +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
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
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
Richard Alam
997ecb15cb Merge pull request #210 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-07-15 14:15:27 -07:00
mohamed-ahmed
5014f68379 added jquery as depency, fixed bugs 2013-07-15 20:39:44 +00:00
mohamed-ahmed
48f108469f added jquery as depency, fixed bugs 2013-07-15 20:38:23 +00:00
Richard Alam
5c6585736b Merge pull request #196 from SenecaCDOT-BigBlueButton/html5-bridge 
Rewrite layout.css file in LESS template
 2013-07-13 18:16:43 -07:00
Richard Alam
34a9875766 - enable webhooks 2013-07-11 19:20:11 +00:00
Gary
d4d2d49814 modify previous commit 2013-07-11 09:25:41 -07:00
Gary
03e7883660 To show the current slide to new user,send 'changeslide' event when user join 2013-07-11 09:12:45 -07:00
Richard Alam
79f35087e8 Merge pull request #197 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-07-05 11:49:08 -07:00
Mohamed Ahmed
da179b03df modified Utils.PostToUrl to to use jquery for DOM manipulation 2013-07-05 14:13:12 -04:00
Gary
c576070282 Rewrite layout.css file in LESS template 2013-06-30 15:55:05 -07:00
Gary
18159f1db4 manage UserModel in UserCollection 2013-06-26 08:15:01 -07:00
Markos Calderon
6dd72a3951 Finish webhook API callback and remove unneeded demo app 2013-06-13 19:25:00 -05:00
Markos Calderon
2597d47bba listen to events in bbb-callbacks 2013-06-12 18:49:32 -05:00
Markos Calderon
689dde4318 initial changes for api callbacks 2013-06-07 15:47:18 -05:00
Richard Alam
584d0ae97f Merge pull request #161 from daronco/html5-event-bus 
HTML5 client - events
 2013-05-22 19:24:08 -07:00
Leonardo Crauss Daronco
21c79844c5 HTML5: remove events emitted on Connection, now emitted on the event bus 
And removed duplicated events for 'connected' and 'disconnected'.
 2013-05-20 17:41:29 -03:00
Leonardo Crauss Daronco
1f0c53a151 HTML5: last view, chat, migrated to use the event bus 2013-05-20 15:47:18 -03:00
Richard Alam
e1e600dfa1 Merge branch 'html5-bridge' of github.com:bigbluebutton/bigbluebutton into html5-bridge 2013-05-09 17:26:00 +00:00
Richard Alam
be8befb243 Merge branch 'master' into html5-bridge 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
 2013-05-09 17:25:25 +00:00
Leonardo Crauss Daronco
b80a0dc89e HTML5: create event bus, not finished yet 
A global event bus to improve the structure of events in the
HTML5 client.
 2013-04-29 17:26:09 -04:00
Leonardo Crauss Daronco
bc513c72f6 HTML5: cleanup/refactor whiteboard paper a bit more 
PRESENTATION_SERVER was moved to a better place. It was kind of
hardcoded in the client, now it is passed to the client by the
server, so it can be easily configured in the server if needed in
the future.
 2013-04-28 19:41:10 -04:00
Leonardo Crauss Daronco
bec08b559f HTML5: add WhiteboardSlideModel 
It stores the slides that are shown in the whiteboard.
 2013-04-28 18:01:23 -04:00
Leonardo Crauss Daronco
961d15828b HTML5: standard method to create tools in the whiteboard 
Shrink the code a bit more.
 2013-04-28 17:47:18 -04:00
Leonardo Crauss Daronco
7a9cbaecfb HTML5: add WhiteboardCursorModel, simplify whiteboard paper 2013-04-28 17:34:38 -04:00
Leonardo Crauss Daronco
d5a51ce6ec HTML5: more small fixes in the whiteboard drawings 2013-04-28 16:58:37 -04:00
Leonardo Crauss Daronco
c62533139f HTML5: add text tool to whiteboard 2013-04-28 16:24:43 -04:00
Leonardo Crauss Daronco
a3f286947e HTML5: small fixes in the whiteboard drawings 2013-04-28 13:21:08 -04:00
Leonardo Crauss Daronco
4792698ca4 HTML5: rects and ellipses work when drawn backwards 
Rects and ellipses would not work if drawn from right to left and/or from
bottom to top, but now they work.
 2013-04-27 22:19:25 -04:00
Leonardo Crauss Daronco
0b031558e9 HTML5: WhiteboardLineModel working for line and pencil tools 2013-04-27 20:28:08 -04:00
Leonardo Crauss Daronco
0c577090e5 HTML5: add ellipse and triangle to whiteboard 2013-04-27 20:00:52 -04:00
Leonardo Crauss Daronco
98a8d05bc1 Add WhiteboardToolModel as a base for whiteboard tools in HTML5 
WhiteboardLineModel and WhiteboardRectModel already inherit from it.
 2013-04-27 16:54:22 -04:00
Leonardo Crauss Daronco
76f06c9e80 Add WhiteboardLineModel to clean up WhiteboardPaperModel 
First version, there are still things that should be moved from
WhiteboardPaperModel to it.
 2013-04-27 16:06:38 -04:00
Leonardo Crauss Daronco
482debd9fe Round borders for rects and pencil in the HTML5 whiteboard 
Makes the drawings more similar to the drawings in the flash client.
 2013-04-27 14:58:20 -04:00
Leonardo Crauss Daronco
f44a1bb4ad Add WhiteboardRectModel to clean up WhiteboardPaperModel 
First version, there are still things that should be moved from
WhiteboardPaperModel to it.
 2013-04-27 14:37:42 -04:00
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