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

7828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perroned
65fa7b5ac0 Prototyping main page. Reflects users choices for navbar, etc. 2014-06-13 11:16:14 -07:00
Anton Georgiev
dfb95d6688 fixed the meetingID; we got valid=true for validate_auth-token_reply 2014-06-13 18:10:49 +00:00
Anton Georgiev
ebdda24f8a sending validate_auth_token message 2014-06-13 18:01:32 +00:00
perroned
d0747c9418 Added iron router 2014-06-13 09:22:30 -07:00
Anton Georgiev
8b82e03bda the :4000 landing page redirects to the meteor app. We extract the meeting_id, user_id, username, auth_token inside the Meteor app. Added router. 2014-06-12 23:22:58 +00:00
Anton Georgiev
46b8f8a923 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/smart.json
	labs/meteor-client/smart.lock
 2014-06-12 20:22:42 +00:00
Anton Georgiev
b6e534f287 adding .gitignore 2014-06-12 19:52:59 +00:00
Anton Georgiev
cde9a73c6a include deps 2014-06-12 19:51:20 +00:00
perroned
8cabd766dc Some prettying up a bit with bootstrap 2014-06-12 12:12:09 -07:00
perroned
a6fed17cb4 Some package files 2014-06-12 12:10:50 -07:00
Anton Georgiev
41f6c5c3d5 Merge branch 'meteor-rebuild-server' of github.com:antobinary/bigbluebutton into meteor-rebuild-server 2014-06-12 17:19:48 +00:00
perroned
ef0272f768 Fixing up users collection to use meteor's built in users collection, fixed up some meteor-coffeescript compatability issues 2014-06-12 08:12:25 -07:00
perroned
21d9c7799f Migrating to coffeescript 2014-06-12 07:08:55 -07:00
perroned
2978ba1eed Fixed a bug with presenters and deletion 2014-06-12 06:18:40 -07:00
Anton Georgiev
c9f8683e0b Merge remote-tracking branch 'perroned/prototype-metor-client' into meteor-rebuild-server 2014-06-11 19:45:02 +00:00
Anton Georgiev
0f680bd4d5 cleaning up 2014-06-11 19:38:47 +00:00
Anton Georgiev
fc9c2adf3e still have to connect bunyan 2014-06-11 19:26:46 +00:00
perroned
e609d2df9f Fixed up some permissions issues 2014-06-11 11:56:04 -07:00
perroned
740a3056e0 Implementing pseudo log in, to alter view based on user' 2014-06-11 11:52:58 -07:00
Anton Georgiev
22a31392f4 I think I resolved the coffeescript class structure problem 2014-06-11 17:56:07 +00:00
Anton Georgiev
1ccc24d71c subscribing and publishing (simple version) 2014-06-11 17:12:51 +00:00
Anton Georgiev
46a231c3c0 config is found, redis is found 2014-06-11 16:11:23 +00:00
perroned
b86c9c8cce Added user toggles. And made them only accessible to individual user (i.e. moderator should only be able to turn off a students webcam and mic, not on 2014-06-11 09:11:07 -07:00
perroned
26c7050283 Trying to implement css/less from html5, cleaned up code a bit, added functionality to buttons 2014-06-11 08:21:09 -07:00
perroned
4e30f69e81 Added a few buttons that would show up for moderators or presenters 2014-06-10 12:59:58 -07:00
perroned
19ba6f37e2 Just a few comments 2014-06-10 12:26:42 -07:00
perroned
cb8b0d0e11 basic functionality for users 2014-06-10 12:19:20 -07:00
perroned
4e19f83006 Merge branch 'prototype-meteor-client' of https://github.com/bigbluebutton/bigbluebutton into prototype-metor-client 2014-06-09 08:02:43 -07:00
Anton Georgiev
ebb0424856 Merge branch 'prototype-meteor-client' of https://github.com/bigbluebutton/bigbluebutton into prototype-meteor-client 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
 2014-06-09 14:51:59 +00:00
perroned
6dcf442f1b pushing changes to carry over work between computers 2014-06-09 06:29:12 -07:00
Richard Alam
b19053980a - set user id 2014-06-06 15:51:12 -07:00
Richard Alam
1f9fe5cac7 - meteor 2014-06-06 15:19:09 -07:00
Chad Pilkey
cbfcdc231c Merge pull request #333 from SenecaCDOT-BigBlueButton/fix-phonenumber-text 
Addendum to #332
 2014-06-05 17:06:46 -04:00
Chad Pilkey
893c977ec9 forgot to add the new config property to the template 2014-06-05 14:04:19 -07:00
Richard Alam
2a0afbc6cc Merge pull request #332 from SenecaCDOT-BigBlueButton/fix-phonenumber-text 
Fix phone number text in audio selection
 2014-06-05 16:56:45 -04:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07:00
Anton Georgiev
f80044f682 fix zoom + scale shape 2014-06-05 20:23:47 +00:00
Anton Georgiev
ef27d4424b at this stage we can make, update, draw a rectangle with a single send_whiteboard_shape_message 2014-06-05 19:27:42 +00:00
perroned
bcc1dcf34d Removing users functionality from view into models 2014-06-04 13:18:10 -07:00
Richard Alam
94405b8e35 Merge pull request #331 from SenecaCDOT-BigBlueButton/alternate-upload-dialog-spawn 
Cleaned up the FileUploadWindow
 2014-06-04 15:04:32 -04:00
Chad Pilkey
9b86798f21 cleaned up the file upload window and made it so that when you click the file name it will open the native file dialog 2014-06-04 11:47:24 -07:00
Anton Georgiev
852d7b1788 commenting out unused code 2014-06-04 18:31:35 +00:00
Anton Georgiev
4f4c0a57b9 commented out the messages that are not supported right now, so it is more clear what works and what does not 2014-06-04 18:12:24 +00:00
Anton Georgiev
d25ac63362 worked on dispatching a request for whiteboard shapes and waiting for reply 2014-06-04 15:14:23 +00:00
Anton Georgiev
3b9e50f2d0 adding a whiteboard listener 2014-06-04 15:12:49 +00:00
Richard Alam
8015eeeecd Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-06-03 19:20:44 -07:00
Richard Alam
3051bf9dd5 - change color of user talking icon glow 2014-06-03 19:19:47 -07:00
Richard Alam
d7b6918340 Merge pull request #330 from SenecaCDOT-BigBlueButton/fix-webrtc-dialogs 
add audio selection window
 2014-06-03 19:36:52 -04:00
Anton Georgiev
42832891d6 rearranging 2014-06-03 21:12:37 +00:00
perroned
f71031b3f8 Cleaned up how meeting name is passed around, removed duplicated code and functions 2014-06-03 13:54:24 -07:00