Commit Graph

6568 Commits

Author SHA1 Message Date
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
Richard Alam
21f851af1d Merge pull request #289 from daronco/html5-bridge-layout-setup
HTML5 layout with bootstrap
2013-10-31 10:51:10 -07: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
Richard Alam
0a85b0dc10 Merge pull request #288 from daronco/html5-bridge-server-refactor-2
HTML5 server refactoring 2
2013-10-31 07:11:09 -07: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
Richard Alam
46420a1240 Merge pull request #286 from tylercopeland/html5-new-layout
Html5 new layout
2013-10-30 13:27:30 -07:00
tylercopeland
3866a8e4b2 chat module style updates 2013-10-30 16:09:56 -04:00
Richard Alam
cec517e67a Merge pull request #285 from daronco/html5-bridge-server-refactor
HTML5 server refactoring
2013-10-30 05:23:27 -07: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
a4a806d254 lastest css updates 2013-10-29 19:38:52 -04:00
tylercopeland
499aba5f03 css style updates 2013-10-29 19:01:52 -04:00
Richard Alam
853044eae7 Merge pull request #284 from mohamed-ahmed/html5-bridge
Html5 bridge
2013-10-29 12:17:02 -07:00
mohamed-ahmed
3069d915ce merged html5-bridge with master 2013-10-29 19:06:38 +00:00
mohamed-ahmed
1c012aec32 merged html5-bridge with master 2013-10-29 18:33:25 +00:00
Richard Alam
e838eff936 Merge pull request #283 from SenecaCDOT-BigBlueButton/fix-annotation-scaling
fixed the annotation drawing so that the line thickness scales when you ...
2013-10-29 10:30:29 -07:00
Chad Pilkey
f77d795084 fixed the annotation drawing so that the line thickness scales when you zoom a presentation 2013-10-29 08:24:55 -07: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
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
Richard Alam
e220f120cc Merge pull request #280 from kepstin/firefox-audio-seek
Switch the order of the audio formats on firefox playback
2013-10-23 13:59:49 -07:00
Calvin Walton
4a45b3610b Switch the order of the audio formats on firefox playback
Firefox has a bug where it can't seek in the audio-only webm files with
no cues, and it seems like they have no intention of fixing this...
Serve up the ogg files first for them.

Adding cues to audio-only webm files is *hard*, there are no standard
tools that support doing this cleanly.
2013-10-23 16:35:21 -04:00
Richard Alam
a141928824 - Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1671
Remove the beginning . (dot) from uploaded presentation.
2013-10-23 16:21:49 +00:00
Richard Alam
f17d0d1b8b Merge pull request #279 from kepstin/recording-syntax-fix
Fix a logger method call in presentation script
2013-10-23 07:05:40 -07:00
Calvin Walton
e6fe43f9b6 Fix a logger method call in presentation script
This shouldn't normally be hit... but if it ever is, the processing will
fail with an error, since the Logger class doesn't have a method named
'warning'.
2013-10-23 10:01:02 -04:00
Richard Alam
49bf86d5aa Merge pull request #276 from SenecaCDOT-BigBlueButton/fix-switch-racecondition
fixed bug 1661, the tool now switches to pan/zoom when a new presentation is loaded
2013-10-22 14:31:37 -07:00
Richard Alam
dc8a603e41 Merge pull request #278 from speakserve/fix-deskshare-kickedout
Fixed issue when current user is kicked out and he is sharing his screen...
2013-10-22 14:28:50 -07:00
Richard Alam
e56a868c0e - update client with deskshare applet with latest fixes 2013-10-22 21:11:11 +00:00
Richard Alam
43588ab8a4 - when region is resized, take the capture region to init the shared region 2013-10-22 21:10:00 +00:00
Chad Pilkey
ccc828c76b the whiteboard toolbar is now disabled as soon as the client is notified of a new presentation. it better work for real this time 2013-10-22 14:03:06 -07:00