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

273 Commits

Author SHA1 Message Date
Leonardo Crauss Daronco
a06331f00b HTML5: cleanup session whiteboard view, remove whiteboard controls 
Removed the controls that are not used anymore, are gonna be used only when
the html5 is allowed to be a presenter.
 2013-10-31 22:44:34 -02:00
Leonardo Crauss Daronco
6d8e6b9210 HTML5: pushing layout changes from @tylercopeland 2013-10-31 21:58:18 -02:00
Leonardo Crauss Daronco
3c447287f3 HTML5: remaking the html markup for the chat 
A lot of changes to make it easier to control the design from the css.
The actions in the chat now only add or remove classes from the elements instead
of changing their css, so the css is responsible for showing or hiding them
and controlling how they appear in the screen.
 2013-10-31 21:30:37 -02:00
Leonardo Crauss Daronco
e0d394896f HTML5: restructuring the client's html 
Removing all the styling from the javascript files, it should all be done
in the css. Not finished yet, the chat and login screens still need a lot
of work.
 2013-10-31 17:36:38 -02:00
Leonardo Crauss Daronco
c0a8fb7b57 HTML5: setup bootstrap and update font-awesome 
Versions:
- Bootstrap v3.0.1
- Font Awesome 4.0.1

Haven't added bootstrap-theme, can be add in the future if needed.
 2013-10-31 15:40:17 -02:00
Leonardo Crauss Daronco
a20f3f3f6d HTML5: use less instead of plain css 
Using connect-assets to automatically compile less files into css files and
serve them. All less files should be under assets/css/.
The current layout file is using less but it's a plain css, with its content
simply copied from the old layout.css file.
 2013-10-31 12:50:52 -02:00
Leonardo Crauss Daronco
d6158115f1 HTML5: comment out wrong method call in RedisPublisher 
Temporary, the method called doesn't exist anymore. Have to check it better,
but commented it for now so the app doesn't break.
 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
ab6c73ca92 HTML5: fixing undo and clearPaper events in the server 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
814b6172fa HTML5: update redis to 0.9.0, solves a few bugs 
Apparently solved errors on user joins, the error was:
Error: node_redis command queue state error. If you can reproduce this, please report it
 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
bd4cb88e16 HTML5: restructuring the classes in the node.js server 
Restructured the classes that read or write on redis to make more sense. Now
there's a single class that makes the bridge between redis and websockets,
and helper classes to publish to redis and to do any other actions on redis.
 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
45463acc91 HTML5: cleanup and fix errors when a new user joins the session 
Most changes on the method WebsocketConnection#_onUserConnected()
The server doesn't crash as much as before when a user joins.
 2013-10-31 12:04:24 -02:00
tylercopeland
3866a8e4b2 chat module style updates 2013-10-30 16:09:56 -04:00
tylercopeland
a4a806d254 lastest css updates 2013-10-29 19:38:52 -04:00
Leonardo Crauss Daronco
ed3975674e HTML5: removing lots of unused or unnecessary code from the server 
Cleanup the node.js server removing things that were not used or were related
to making the HTML5 client a presenter, which will not be necessary at this
first iteration.
The node.js server should also not change anything that's in redis, just read
it. Removed some of the code that changes redis.

Also updating the comments to match codo's format.
 2013-10-30 10:08:16 -02:00
Leonardo Crauss Daronco
d681eac13b HTML5: cleanup on RedisBridge 
Moved some methods that actually do things on redis to RedisAction.
 2013-10-30 10:08:15 -02:00
Leonardo Crauss Daronco
b1cdb2ea8c HTML5: setting up a logger class 
Prints logs with better formatting than simply calling console.log.
 2013-10-30 10:08:15 -02:00
Leonardo Crauss Daronco
10f9bd592b HTML5: Setting up the test environment for the node.js server 
Created tests for lib/modules.coffee and a few for routes/main_router.coffee
to be used as reference.
 2013-10-30 10:08:15 -02:00
Leonardo Crauss Daronco
01654424c9 HTML5: Cleaned and refactored some code used to join the session 2013-10-30 10:08:15 -02:00
Leonardo Crauss Daronco
e20e46a7a5 Replace docco by codo for docs in the HTML5 client 
Updated the documentation of lib/modules.coffee to be used as a reference.
 2013-10-30 10:08:14 -02:00
Leonardo Crauss Daronco
f42eb27049 HTML5: moving global objects into modules 
There's a new class Module to organize modules in the application. Prevents
errors from cyclic require's.
The number of modules can still be reduced by organizing them better.
 2013-10-30 10:08:14 -02:00
Leonardo Crauss Daronco
612b818f38 HTML5: setting up docco for documentation 
To be used
 2013-10-30 10:08:14 -02:00
Leonardo Crauss Daronco
65d876fd00 HTML5: Clean up app.coffee as much as possible 
Move methods to new classes RedisBridge and Utils.
Also made several other small fixes (typos mostly).
 2013-10-30 10:08:01 -02:00
Leonardo Crauss Daronco
64de058316 HTML5: Add class RedisKeys 
Contains methods to get the keys used on redis.
Reduced RedisAction a lot by having this new class.
 2013-10-30 10:08:01 -02:00
Leonardo Crauss Daronco
7aa6e9114d HTML5: Update redis to 0.8.4 (latest) and small fixes 
The node.js server is now working as it was before the refactoring was
started 🍻
 2013-10-30 10:08:00 -02:00
Leonardo Crauss Daronco
884147f6bc Refactor routes/socketio as a class WebsocketConnection 
Most of its methods are used only internally, so now the class is more isolated
than before. But still with some methods that should be refactored.
 2013-10-30 10:07:30 -02:00
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