BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,470 Commits 13 Branches 260 Tags 1.1 GiB
2317d2f98f
Commit Graph

1826 Commits

Author SHA1 Message Date
Anton Georgiev
759ee46ca4 removing html-reporter 2014-11-18 15:49:47 +00:00
Anton Georgiev
51f070bccf shortened the message 
(not sure why but we were getting an error with the previous version of the message)
 2014-11-18 15:47:43 +00:00
Anton Georgiev
4bfc8d4d41 Merge branch 'master' of github.com:antobinary/bigbluebutton into testing-version-006 2014-11-17 22:48:00 +00:00
Anton Georgiev
df45df31ab Tyler:work in progress on user items 2014-11-17 22:44:47 +00:00
Anton Georgiev
a9ebc858c1 the sip library was renamed 2014-11-17 22:02:17 +00:00
Maxim Khlobystov
f1bbcb2a49 Cleaning up. 2014-11-17 13:49:46 -08:00
Maxim Khlobystov
c4b352d87b Made all the Jasmine suites disabled by default. 2014-11-17 13:40:19 -08:00
Maxim Khlobystov
fb1bc92ada Removed a file containing a sample server-side unit test. 2014-11-17 13:31:32 -08:00
Maxim Khlobystov
b5a8fdd172 Removed Velocity HTML reporter. 2014-11-17 13:26:31 -08:00
damaren
7a004601b8 the two files that should have been in the last commit 2014-11-14 18:18:47 -02:00
damaren
690f1a291b added a button in the logout page to redirect the user to the login page 2014-11-14 18:03:45 -02:00
Leonardo Crauss Daronco
feaf75901e Webhooks: add a post catcher application for testing 2014-11-14 17:55:44 -02:00
Leonardo Crauss Daronco
7efb3a18ab Webhooks: trigger callbacks for recording events too 2014-11-14 16:53:46 -02:00
Lucas Zawacki
7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2014-11-14 15:33:17 -02:00
Lucas Zawacki
92584c1cad Merge branch 'merge-with-tests' of https://github.com/antobinary/bigbluebutton into merge-with-tests 2014-11-14 14:31:53 -02:00
Leonardo Crauss Daronco
81f5a109b6 Merge remote-tracking branch 'upstream/master' into webhooks-2.0 2014-11-14 14:28:35 -02:00
Leonardo Crauss Daronco
8fc251c55b Webhooks: follow redirects on callback calls, up to 10 times 2014-11-14 14:26:29 -02:00
Leonardo Crauss Daronco
536decff7c Webhooks: use winston for logging and rotate log files 2014-11-14 14:12:37 -02:00
Anton Georgiev
9ef7ad5edc using roles and predefined permissions per role for raising/lowering hand 2014-11-14 11:00:55 -05:00
Leonardo Crauss Daronco
6260f26101 Webhooks: adjustments for the app when running in production 2014-11-14 11:58:12 -02:00
Leonardo Crauss Daronco
31666bc7fb Webhooks: add config files for upstart and monit 2014-11-14 11:23:04 -02:00
Leonardo Crauss Daronco
592a2f92dd Webhooks: add an extra app to print events from a meeting 
Utility app to help a user find out the events that happen in a meeting.
 2014-11-14 11:07:16 -02:00
Leonardo Crauss Daronco
329a1ff959 Webhooks: local config, docs and improve how the checksum is calculated 
The way the checksum is calculated now is more similar to the other API calls,
specially setConfigXML. It uses the content type 'application/x-www-form-urlencoded'
so the information in the post body doesn't have to be converted from/to
js/string, preventing possible checksum errors in different programming
languages.
 2014-11-14 11:05:20 -02:00
Lucas Zawacki
0a92c0e138 Merge branch 'merge-with-tests' of https://github.com/antobinary/bigbluebutton into merge-with-tests 2014-11-13 18:54:46 -02:00
Lucas Zawacki
6721e3395f Add velocity:core and velocity:html-report back and mock logging 2014-11-13 18:53:54 -02:00
Anton Georgiev
826b6658a7 remove moderator condition 2014-11-13 15:52:42 -05:00
Anton Georgiev
c275778b19 using the userSecret to control the permissions for raise/lower hand 2014-11-13 15:04:51 -05:00
Maxim Khlobystov
bbbb51a8a5 Added the first set of integration tests for the whiteboard template. 2014-11-13 16:06:45 -02:00
Maxim Khlobystov
367b6eb3f5 Improved the quality of usersList rendering specs and added some new test cases. 
Conflicts:
	labs/meteor-client/app/tests/jasmine/client/integration/templates/usersList/usersListSpec.js
 2014-11-13 16:06:24 -02:00
Anton Georgiev
65d858e737 added an alphanumeric userSecret with length 10 symbols 2014-11-13 12:54:50 -05:00
Lucas Zawacki
2bb32218fa Merge branch 'meteor-client-tests' of https://github.com/gthacoder/bigbluebutton into merge-with-tests 
Conflicts:
	labs/meteor-client/app/tests/jasmine/server/unit/CollectionMethodsSpec.js
 2014-11-13 15:28:51 -02:00
Lucas Zawacki
0b3e1e570e Using iron-router params.query syntax in router.coffee 2014-11-13 12:29:27 -02:00
Leonardo Crauss Daronco
6dbcf1bab2 Webhooks: rename MeetingIDMap to IDMapping 2014-11-13 12:15:20 -02:00
Leonardo Crauss Daronco
14641d1a3b Webhooks: expire mappings for inactive meetings 
If a meeting has no events for too long (24 hours), remove the meeting
mapping to prevent too much data from being stored forever on redis.
 2014-11-13 12:03:42 -02:00
Anton Georgiev
0f3a877402 modified the url for routing to the sign in page 2014-11-13 08:46:39 -05:00
Maxim Khlobystov
425c2b533b Added unit tests for the server side private methods used to add/remove slides. 2014-11-12 19:42:17 -08:00
Maxim Khlobystov
b9462e4f2a Got rid of the spec related to deletePrivateChatMessages() (the method didn't exist anymore). 2014-11-12 18:50:21 -08:00
Anton Georgiev
f9ed2a23b5 (not complete) on meteor 1.0 2014-11-12 16:04:03 -05:00
Anton Georgiev
623136670a Merge branch 'merge-with-tests' of github.com:lfzawacki/bigbluebutton into merge-with-tests 
Conflicts:
	labs/meteor-client/app/.meteor/packages
 2014-11-12 16:00:44 -05:00
Leonardo Crauss Daronco
66bfbeb1bc Webhooks: use external meeting ID as key in the mappings 
It changes less than the internal meeting ID. An application can subscribe
to an external ID and use the hook for several different meetings that will
have the same external ID but different internal IDs.
 2014-11-12 18:27:21 -02:00
Leonardo Crauss Daronco
5e141d324c Webhooks: better intervals for retying failed callbacks 
Will try again a number of times for about 5min and then give up. On giving
up, the hook is removed.
And a few fixes for saving and loading data on redis.
 2014-11-12 18:07:29 -02:00
Lucas Zawacki
81f0665738 Merge with testing and update to meteor only packages 2014-11-12 17:34:12 -02:00
Lucas Zawacki
87421be943 Merge branch 'meteor-client-tests' of https://github.com/gthacoder/bigbluebutton into testing-version-005 
Conflicts:
	labs/demos/views/index.html
	labs/meteor-client/app/server/collection_methods/meetings.coffee
 2014-11-12 16:38:18 -02:00
Leonardo Crauss Daronco
6d63f2f299 Webhooks: persist data to redis 
Save hooks and meetingID mappings to redis and get them back when the
application starts.
Still missing a way to remove old data in case the app loses events (e.g.
a hook for a specific meeting might stay on redis forever if the app
lost the meeting_destroyed event).
 2014-11-12 16:35:25 -02:00
Anton Georgiev
2b819c2499 Merge branch 'testing-version-005' of github.com:lfzawacki/bigbluebutton into testing-version-005 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
 2014-11-12 13:14:21 -05:00
Lucas Zawacki
7e763b7219 Remove unused js files and move api_bridge to the client/lib 2014-11-12 15:17:23 -02:00
Anton Georgiev
b18b8a2d0e install external-file-loader via mrt 2014-11-12 12:01:19 -05:00
Maxim Khlobystov
ae48d72dc3 Merge branch 'meteor-client-viewer' into meteor-client-tests 
Conflicts:
	labs/meteor-client/app/.meteor/packages
 2014-11-12 08:51:14 -08:00
Lucas Zawacki
284ce6bbaf Add winston client and correct logging path 
Conflicts:
	labs/meteor-client/app/client/main.coffee
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
 2014-11-12 14:37:55 -02:00
Lucas Zawacki
3f6cc062a9 Merge winston logging 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/lib/router.coffee
	labs/meteor-client/app/server/collection_methods/chat.coffee
	labs/meteor-client/app/server/collection_methods/users.coffee
	labs/meteor-client/app/server/redispubsub.coffee
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
 2014-11-12 13:18:09 -02:00
Leonardo Crauss Daronco
bfdae8f204 Webhooks: store meeting ID mappings in a global model 2014-11-12 13:07:54 -02:00
Anton Georgiev
ffab06751c we have the .coffee now 2014-11-12 09:58:24 -05:00
Fred Dixon
e84a65d986 Moved from labs; reformatted check.nginx 2014-11-12 09:22:50 -05:00
Anton Georgiev
6efde7e2aa Merge branch 'meteor-improving-login' into testing-version-005 2014-11-12 09:15:36 -05:00
Anton Georgiev
7b2ea01b30 Merge branch 'meteor-sip' of github.com:lfzawacki/bigbluebutton into testing-version-005 
Conflicts:
	labs/meteor-client/app/client/globals.coffee
 2014-11-12 08:57:59 -05:00
Leonardo Crauss Daronco
fd90a46563 Webhooks: implement the API method to list available hooks 2014-11-12 11:38:00 -02:00
Lucas Zawacki
ca8133070b Write parts of the client using the BBB api bridge methods 2014-11-12 11:30:34 -02:00
Leonardo Crauss Daronco
79609fadb2 Webhooks: use more "hook" and less "subscription" for consistency 
It now creates and destroys hooks instead of creating and removing
subscriptions.
 2014-11-12 11:28:49 -02:00
Anton Georgiev
4727737691 moved the re-subscription to users to be at the end because on / it was stopping the subscription to the other collections. As a result we were not able to send a chat message immediately after login. We had to refresh first 2014-11-12 08:15:13 -05:00
Felipe Cecagno
739287bce0 added a nginx config file so anybody can run the client check from a dev environment 2014-11-12 10:54:38 -02:00
Felipe Cecagno
9a8e299648 changed the client check output dir from bin-release/ to check/ 2014-11-12 10:54:13 -02:00
Leonardo Crauss Daronco
c25082bafa Wehbooks: hooks can now subscribe to a single meeting 
Hooks can be global, to receive events from all meetings, or can receive
events for a single meeting. Depends on whether the meetingID parameter is
informed or not in the hooks/subscribe API call.

Also improved the log messages a bit.
 2014-11-12 10:53:49 -02:00
Felipe Cecagno
740d61f205 fixed the build.xml so ant works in a clean environment 2014-11-12 10:53:38 -02:00
Anton Georgiev
0fe03afa28 on / updates the dbid 2014-11-12 07:53:36 -05:00
Felipe Cecagno
21f0ea139a renamed BBBClientCheck.html to index.html; moved the locale to outside the src directory (mxml warning) 2014-11-12 10:53:02 -02:00
Felipe Cecagno
535604b8b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into improving-client-checks 2014-11-12 10:38:00 -02:00
Maxim Khlobystov
68d1f4aea6 Added more unit tests to cover shapes.coffee. 2014-11-11 18:28:13 -08:00
Fred Dixon
1ef484ba95 Aligned URL path for config.xml with install directory 2014-11-11 17:00:05 -05:00
Leonardo Crauss Daronco
31fe86c19d Webhooks: keep a mapping of internal and external meeting IDs 2014-11-11 18:48:23 -02:00
Anton Georgiev
201de6e202 (not complete)on login the user is allowed to proceed towards the client only if added to the collection (i.e. if validation succeeded). 2014-11-11 14:54:28 -05:00
Leonardo Crauss Daronco
e884643ac0 Webhooks: fix callbacks being called multiple times 2014-11-11 17:54:00 -02:00
Leonardo Crauss Daronco
4e72d53b94 Webhooks: sign callback calls with a checksum 
Simple signature done initially in a way similar to how bbb-web does it.
 2014-11-11 17:36:01 -02:00
Pedro Beschorner Marin
d2cda28761 Merge branch 'improving-client-checks' of https://github.com/mconf/bigbluebutton into improving-client-checks 2014-11-11 17:31:54 -02:00
Pedro Beschorner Marin
3c4b980ace Bugfix: removing event listeners and closing netconnections 2014-11-11 17:16:16 -02:00
Lucas Zawacki
da1558c100 Include sipjs libraries from bbb client 2014-11-11 16:56:39 -02:00
Leonardo Crauss Daronco
e070f3c5c5 Webhooks: block multiple subscriptions to the same callback URL 
Will allow only one subscription to a given callback URL. If trying to
subscribe again to the same URL, will return success but with a message
saying the callback URL is duplicated, very similar to the response of
create when called multiple times.
 2014-11-11 16:56:15 -02:00
Leonardo Crauss Daronco
6fc50f0a7e Webhooks: use hooks in memory when generating callback calls 2014-11-11 16:43:41 -02:00
Anton Georgiev
a1e0c62336 switched JSSIP for SIP for WebRTC audio calling. BBB summit - Lucas, Anton 2014-11-11 16:41:33 -02:00
Felipe Cecagno
ca1fbb136d cleanup; using a config.xml template, and added some logic in the build.xml to set config.xml with the proper host IP 2014-11-11 16:33:25 -02:00
Leonardo Crauss Daronco
dae00ac668 Webhooks: implement subscribe and unsubscribe API calls 
Saving subscriptions to a local database for now.
 2014-11-11 15:48:36 -02:00
Leonardo Crauss Daronco
cbc144b5cc Webhooks: add config file for nginx 
To proxy API calls to the webhooks app.
 2014-11-11 15:07:43 -02:00
Leonardo Crauss Daronco
21d9d8ae96 Webhooks: basic routes and checksum calculation 2014-11-11 15:07:05 -02:00
Fernando Bottin
7719fa2002 Added specs to test addPresentationToCollection() and remotePresentationToCollection(). 2014-11-11 12:16:13 -02:00
Leonardo Crauss Daronco
7f8eb12f77 Webhooks app will now have a web server, reorganizing it 
It will receive API calls to deal with web hooks to make it independent from
other components such as bbb-web.
 2014-11-11 11:58:28 -02:00
Anton Georgiev
f561ba0eb8 this is where we should handle validate_auth_token_reply 2014-11-11 08:38:39 -05:00
Leonardo Crauss Daronco
8c8c93beb7 Webhooks: overall improvements in comments and prints 2014-11-11 11:20:55 -02:00
Anton Georgiev
fc2f560b7a simplified version to work with (no disconnection handling code) 2014-11-11 07:18:07 -05:00
Felipe Cecagno
7667abc106 a few tweaks on the client check page: build.xml downloads the image for the download speed test, config doesn't have someone's IP address (just like a config.xml.template), securityError on port check doesn't throw an exception anymore 2014-11-11 09:25:56 -02:00
Maxim Khlobystov
9106fe3b7c Added specs to test addShapeToCollection(). 2014-11-10 19:54:00 -08:00
Anton Georgiev
c68fc184d3 Merge branch 'meteor-style-changes' of github.com:antobinary/bigbluebutton into testing-version-005 2014-11-10 20:36:50 -05:00
Maxim Khlobystov
4cee6c3242 Cleaned up a bit. 2014-11-10 15:25:11 -08:00
Anton Georgiev
bcced810c7 Tyler's changes:demos page is now friendly, additional changes to style 2014-11-10 21:52:15 +00:00
Leonardo Crauss Daronco
6f72a4e5e3 Webhooks: first version of a queue to retry callbacks 
Simple queue that retries to emit the callbacks in case they fail. A lot to
improve yet, but the basic is working.
 2014-11-10 19:12:37 -02:00
Anton Georgiev
6ba5a4d7c1 switched JSSIP for SIP for WebRTC audio calling. BBB summit - Lucas, Anton 2014-11-10 16:04:38 -05:00
Maxim Khlobystov
7faa393d1e Beginning work on covering Meteor.Meetings-related private methods from the server side. 2014-11-10 12:46:36 -08:00
Leonardo Crauss Daronco
9b94688f93 Webhooks: filter the events we want to generate callback calls for 2014-11-10 18:11:09 -02:00
Leonardo Crauss Daronco
1a6799a833 Webhooks posting all events to all callbacks registered 
First step toward allowing callbacks to be called for all meetings in a
server, not for only a single meeting. Will need to change the way data
is stored on redis to improve the webhooks app, but it already works the
way it is now.
 2014-11-10 17:32:51 -02:00
Leonardo Crauss Daronco
04e678f171 First version of webhooks subscribing to all channels and organized repo 
Started using coffee-script, updated the libraries, and now it subscribes
to all channels under 'bigbluebutton:*' so we can receive all events that
happened and select the ones we want.
 2014-11-10 15:51:41 -02:00
Maxim Khlobystov
10aec1dd44 Added unit tests for the server side private methods related to the Meteor.Chat collection. 2014-11-10 08:53:41 -08:00
Maxim Khlobystov
6a8eabad66 Made the username field automatically focused when the landing page loads. 2014-11-06 08:56:23 -08:00
perroned
e4eae36c38 Cleaned code. Fixed extra conversation positioning. 2014-11-06 07:27:43 -08:00
Maxim Khlobystov
39f3848ce8 Prevented the chat bar from losing private message threads. 2014-11-05 20:51:01 -08:00
Anton Georgiev
4070e9f380 tried to redo Tyler's styling from vol.2 into what we have now 2014-11-04 21:34:35 +00:00
Anton Georgiev
7b9de8041f Merge branch 'meteor-new-auth' of github.com:antobinary/bigbluebutton into testing-version-004 
Conflicts:
	labs/meteor-client/app/client/stylesheets/chat.less
	labs/meteor-client/app/client/stylesheets/style.css
 2014-11-04 20:51:45 +00:00
Anton Georgiev
cfd44a1d78 Tyler - style changes vol.2 2014-11-04 17:19:49 +00:00
perroned
48794ef36b Switch to private conversations. 2014-11-04 07:38:18 -08:00
perroned
b5e75ee816 I don't think this is needed. Causes paper to escape whiteboard template. 2014-11-04 07:38:04 -08:00
perroned
213eb65ea3 Merge remote-tracking branch 'anton/meteor-disconnection-02' into meteor-new-auth 
Conflicts:
	labs/meteor-client/app/client/globals.coffee
 2014-11-04 06:20:55 -08:00
perroned
1b33cb2f0e Merge remote-tracking branch 'maxim/meteor-client-viewer' into meteor-new-auth 2014-11-04 06:00:10 -08:00
perroned
ab173e43ef Worked on sorting extra conversations. 2014-11-04 05:45:23 -08:00
perroned
e2e56a7afd Fixed up CSS and code. 2014-11-04 05:34:15 -08:00
Maxim Khlobystov
0f65959bc5 Made the stroke width adjustable to a whiteboard size on scaling. 2014-11-03 14:26:11 -08:00
Maxim Khlobystov
3bae5b2313 Made the cursor size consistent between zoom levels. 2014-11-02 17:53:25 -08:00
Maxim Khlobystov
9c8a71746d Made cursor position adjustable to the coordinate system shift caused by zooming. 2014-11-02 14:14:16 -08:00
Maxim Khlobystov
9c006bc2e8 Fixed the issue with A4 slide (or any slide having width < height) rendering after refreshing a page. 2014-11-01 18:59:56 -07:00
Maxim Khlobystov
3478d1de68 Fixed the issue with sticky tooltips bound to the header buttons (made an old tooltip disappear on clicking a button). 2014-11-01 16:11:06 -07:00
Maxim Khlobystov
04ccd594ca Encapsulated some duplicate code. 2014-10-31 15:27:27 -07:00
Maxim Khlobystov
fe31d6e091 Removed unnecessary code. 2014-10-31 14:48:10 -07:00
Maxim Khlobystov
48cea9b861 Prevented the footer from covering the slide in a small window. 2014-10-31 11:56:14 -07:00
Anton Georgiev
1a43a4dfed made sendMeetingInfoToClient to be a normal function; cleaning up 2014-10-31 15:25:32 +00:00
Anton Georgiev
c6cf01edcb cleaning up 2014-10-30 23:46:31 +00:00
Anton Georgiev
ca605e2e8c cleaning up 2014-10-30 23:16:47 +00:00
Anton Georgiev
5554a0d6b1 user reconnects successfully even if offline for more than x seconds. (needs further verification) 2014-10-30 23:05:28 +00:00
Maxim Khlobystov
5786ce347d Put the default meeting name inside the text box on the landing page. 2014-10-30 14:43:13 -07:00
Maxim Khlobystov
4d1bcf70da Reverted the changes related to a disabled button. 2014-10-30 14:27:14 -07:00
Maxim Khlobystov
38d7b76a99 Prevented users from joining a meeting with an undefined name and disabled the submit button until the username field is not blank. 2014-10-30 13:48:48 -07:00
Maxim Khlobystov
ebe8f0d851 Binded the Enter key to a form submission on the landing page. 2014-10-30 13:24:08 -07:00
perroned
dad45e9363 Fixed issue where unread messages wouldn't alert properly. 2014-10-30 11:19:08 -04:00
Anton Georgiev
bc812c88e3 client side notification when disconnected/reconnecting 2014-10-30 15:00:45 +00:00
Anton Georgiev
5939bb2ed4 cleaned up publish.coffee; still trying to update the dbid on the client after a reconnect 2014-10-30 00:21:03 +00:00
Anton Georgiev
a0a9321b5d cleaning up 2014-10-29 23:30:30 +00:00
Anton Georgiev
32debc5544 publish to the client only after the particular user was added to the collection. still need to propagate the new _id 2014-10-29 23:12:04 +00:00
Anton Georgiev
b1f444f0c3 need to return the Users cursor only after the user was added to the collection 2014-10-29 21:58:57 +00:00
Anton Georgiev
e827efbbbc add user_is_online field in Users, pass userid when subscribing for Users, only subscribe after the user has joined (must verify) 2014-10-29 20:40:39 +00:00
Anton Georgiev
22ac2f7bb4 cleaning up 2014-10-29 19:39:13 +00:00
Anton Georgiev
d6db3ce1ea Merge branch 'meteor-client-viewer' of github.com:gthacoder/bigbluebutton into testing-version-004 2014-10-29 18:39:29 +00:00
Maxim Khlobystov
b46432ad5b Added the first set of integration tests for the whiteboard template. 2014-10-28 19:03:05 -07:00
Maxim Khlobystov
91ad8d560b Prevented the whiteboard from redrawing another identical image every time some shape is destroyed, fixed the issue with an auto-resized slide happening when undoing/clearing the whiteboard. 2014-10-28 18:10:51 -07:00
perroned
e7f4d76b95 Removed useless code. 2014-10-28 08:02:41 -07:00
perroned
0a698e4697 Made footer easier to read. 2014-10-28 08:02:25 -07:00
perroned
5c7f8a8379 Removing deleting private conversations. 2014-10-28 07:35:54 -07:00
perroned
6b1ca58328 Adding UI for viewing extra conversations. 2014-10-28 07:30:07 -07:00
perroned
5cc4eb8210 Organizing code, added handlers for viewing extra conversations. 2014-10-28 07:29:11 -07:00
perroned
d020e77e04 Adding button to let you scroll through extra private conversations. 2014-10-28 07:25:32 -07:00
perroned
524918ffcc Organized code, added a safe string helper. 2014-10-28 07:24:56 -07:00
perroned
c1fa10e3bf Fix CSS/LESS conflicts, simplified, and organized code. 2014-10-28 06:06:38 -07:00
Maxim Khlobystov
461ae08280 Added the ability to distinguish between moderator and attendee. 2014-10-27 19:19:56 -07:00
Maxim Khlobystov
493659dd24 Set HTML5 users' initial status so that they are attendees by default. 2014-10-27 16:58:05 -07:00
Fred Dixon
6603820eef Merge pull request #410 from SenecaCDOT-BigBlueButton/bigbluebutton-client-system-check-app 
modifying build.xml to copy custom BBBClientCheck.html file, adding addi...
 2014-10-25 00:49:20 -04:00
Anton Georgiev
09ab585bcc fix indent, lint 2014-10-24 15:09:58 +00:00
Anton Georgiev
afa5485b4e Merge branch 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-client-tests 
Conflicts:
	labs/meteor-client/app/.meteor/packages
 2014-10-23 17:46:43 +00:00
Anton Georgiev
0d3fceae18 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into testing-version-004 2014-10-23 17:37:21 +00:00
Anton Georgiev
89617ffe1b Merge branch 'testing-version-004' of github.com:antobinary/bigbluebutton into testing-version-04 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/client/lib/custom.bootstrap.json
 2014-10-23 17:35:17 +00:00
Anton Georgiev
f73ee5e6bd new bootstrap 2014-10-23 17:32:17 +00:00
Anton Georgiev
60171511e0 add user fix condition 2014-10-23 17:26:08 +00:00
Maxim Khlobystov
276f04b8d3 Improved the quality of usersList rendering specs and added some new test cases. 2014-10-22 20:04:32 -07:00
syeshchenko
0d54cfad2c modifying build.xml to copy custom BBBClientCheck.html file, adding additional value to gitignore 2014-10-22 17:13:49 -04:00
syeshchenko
5c93bddb48 clearing more files that are not required and additional paramaters to gitignore 2014-10-22 13:52:07 -04:00
syeshchenko
2d0faf7922 adding gitignore, removing files that are not required 2014-10-22 13:46:29 -04:00
syeshchenko
353dffb237 initial commit for client check app 2014-10-22 13:23:03 -04:00
perroned
6c31b25fad By default allow chat notifications. 2014-10-22 12:16:09 -04:00
perroned
fb0e74f337 Only notify users when they allow notifications. 2014-10-22 12:15:22 -04:00
perroned
4ea3a388f0 Added click handlers for changing chat notification settings. 2014-10-22 12:13:25 -04:00
perroned
3ec9e30f5d Added UI for chat notification settings. 2014-10-22 12:12:05 -04:00
Fred Dixon
917b7cafe5 Merge pull request #409 from SenecaCDOT-BigBlueButton/bigbluebutton-client-system-check-app 
initial commit for client check app
 2014-10-22 16:31:37 -04:00
Anton Georgiev
e66ba89cd2 switch to nemo64:bootstrap 2014-10-21 19:15:35 +00:00
perroned
9c6a94dea9 Fixing problems while switching tabs. 2014-10-21 11:37:31 -07:00
perroned
142d78ffb4 Working on deleting conversations. 2014-10-21 11:11:22 -07:00
perroned
3d059e833d Cleaned up CSS file a bit. Allow tabs to make full use of space given. 2014-10-21 08:41:48 -07:00
Anton Georgiev
e3089c0644 fix for the whiteboard 2014-10-21 15:36:53 +00:00
perroned
975314c3ee Tidying up chat tabs. 2014-10-21 08:10:27 -07:00
perroned
f405bbbab5 Fixing issue with chat tabs descending vertically instead of shrinking on the same line. 2014-10-21 07:36:47 -07:00
perroned
059e8ae945 Removed gradient because its useless now, and was not needed. 2014-10-21 07:35:24 -07:00
perroned
b322d747fa Merge remote-tracking branch 'anton/testing-version-04' into meteor-new-auth 2014-10-21 05:24:12 -07:00
perroned
12cd22e805 Fixing up deleting conversations. 2014-10-21 05:22:54 -07:00
Anton Georgiev
21906c7b2c error - was not finding whiteboardPaperModel 2014-10-20 21:43:57 +00:00
Anton Georgiev
e65300e88a Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into testing-version-04 2014-10-20 21:38:57 +00:00
Anton Georgiev
4813df62bf Merge branch 'testing-version-003' of github.com:antobinary/bigbluebutton into testing-version-04 2014-10-20 21:35:28 +00:00
Maxim Khlobystov
6da3b013db Beginning work on integration tests for template rendering. 2014-10-20 12:27:09 -07:00
perroned
beac12dca8 Nearly done fixing the chat tabs. 2014-10-20 12:08:40 -07:00
Anton Georgiev
c174994589 Tyler improved the view 2014-10-20 18:38:19 +00:00
perroned
9557117392 fixing up chat tabs. Implementing auto sizing for several tabs. 2014-10-20 11:24:49 -07:00
perroned
f1ac183e77 Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth 2014-10-20 06:05:04 -07:00
Richard Alam
ce723718a1 - cleanup 2014-10-19 23:00:10 -07:00
Maxim Khlobystov
52870e76d2 Set up a Jasmine testing environment via Velocity, added sample Jasmine unit test on the server side. 2014-10-16 18:50:17 -07:00
Maxim Khlobystov
d08f553ac1 Fixed reactivity of whiteboard (cursor, shapes). 2014-10-16 13:45:42 -07:00
Anton Georgiev
baa40e441b temporarily reduce the amount of logging 2014-10-16 20:31:15 +00:00
Anton Georgiev
435a7435a5 check if the user exists first 2014-10-16 20:22:37 +00:00
Maxim Khlobystov
d9c60a4ad3 Fixed slide size adjustment and whiteboard scaling crushed after modifying template helpers. 2014-10-16 11:18:46 -07:00
Maxim Khlobystov
a31f64e476 Fixed the scoping issue caused by changing the way we declare template helpers. 2014-10-16 11:13:13 -07:00
Anton Georgiev
7b11ece002 remove extra raphael module 2014-10-16 18:07:11 +00:00
Anton Georgiev
9a8244a433 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth 2014-10-16 16:54:12 +00:00
Anton Georgiev
d78de9b4b5 update with 0.9.4 reqs 2014-10-16 16:43:38 +00:00
perroned
5ecea65489 Fixed greeting. 2014-10-16 08:18:26 -07:00
perroned
c6be20e5df Simplified code, made it faster by reducing required checks. 2014-10-16 08:11:09 -07:00
perroned
4362417eb5 Fixed greeting. 2014-10-16 07:47:32 -07:00
perroned
0c89f0dd19 Supressed a lot of exceptions and errors. 2014-10-16 07:38:50 -07:00
perroned
e68c4a64d5 Fixed issue with function in wrong spot. 2014-10-16 06:24:31 -07:00
perroned
ce41c6798d Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth 
Conflicts:
	labs/meteor-client/app/client/views/whiteboard/slide.coffee
	labs/meteor-client/app/server/collection_methods/users.coffee
 2014-10-16 06:15:13 -07:00
perroned
7fa6be0d06 Merge remote-tracking branch 'maxim/meteor-client-whiteboard' into meteor-new-auth 2014-10-16 06:10:08 -07:00
Anton Georgiev
0b061f4f2f cleaning up 2014-10-15 22:28:54 +00:00
Anton Georgiev
ef67843d66 fixes for not supporting Template.xxx.yyy = ... inside templates 2014-10-15 22:26:27 +00:00
Anton Georgiev
06f13ea7cb update Meteor from 0.8.x to 0.9.4 2014-10-15 22:24:30 +00:00
Maxim Khlobystov
fc9d07bddd Removed some unnecessary WhiteboardPaperModel code given that we now use different method to handle non-standard slide dimensions on the whiteboard. 2014-10-15 11:06:02 -07:00
Maxim Khlobystov
4f722d608a Made the slide borders adjustable to the size of its container. 2014-10-15 10:26:05 -07:00
Maxim Khlobystov
b64e73759b Made cursor redrawn every time it is destroyed on undoing or clearing shapes. 2014-10-14 18:50:41 -07:00
Maxim Khlobystov
0dd833d412 Fixed the undo/clear functionality on the whiteboard and made it work smoothly without blinking. 2014-10-14 18:36:30 -07:00
Anton Georgiev
b1f361a1ed cleaning up 2014-10-14 22:40:39 +00:00
Anton Georgiev
61da2885a9 fixes for isCurrentUserTalking 2014-10-14 22:38:15 +00:00
Anton Georgiev
d1f5bcab2f joining and leaving audio is working fine now 2014-10-14 21:59:49 +00:00
Anton Georgiev
531b141e7c mute/unmute is working now 2014-10-14 21:20:27 +00:00
Anton Georgiev
97bc187bfc fixed a bug where joining audio on the html5 side would add a user + a few minor changes for isTalking 2014-10-14 20:25:45 +00:00
Anton Georgiev
b1818b9258 update for ListenOnly 2014-10-14 20:23:06 +00:00
Maxim Khlobystov
e3ff7478f2 Fixed the gap between the slide and its container. 2014-10-14 11:35:25 -07:00
Anton Georgiev
e0ac793255 update the talking check 2014-10-14 16:55:39 +00:00
perroned
c5bc0bface Removing more presenter functionality from viewer branch. 2014-10-14 09:15:01 -07:00
perroned
b043b194b1 Removing presenter functionality from this viewer branch. 2014-10-14 08:51:08 -07:00
perroned
c03f2fd4a1 Merge remote-tracking branch 'maxim/meteor-client-whiteboard' into meteor-new-auth 2014-10-14 06:44:41 -07:00
perroned
f493ac733b Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth 2014-10-14 06:43:49 -07:00
Maxim Khlobystov
de01ede378 Fixed the issue with whiteboard positioning in the browser window that is not full size. 2014-10-13 14:54:42 -07:00
Anton Georgiev
d65bfa8f55 recovered some functionality for audio (resulting in icons displaying in the html userlist). still have work to do 2014-10-10 21:35:51 +00:00
Anton Georgiev
0594828779 Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into meteor-client-whiteboard 2014-10-10 18:51:21 +00:00
Anton Georgiev
939ea5d09f switching slides is back to normal 2014-10-10 18:45:12 +00:00
perroned
5209f8b9e3 Fixed new line character when joining messages. 2014-10-10 10:49:17 -07:00
Anton Georgiev
725583335b Merge branch 'meteor-disconnection-handling' into meteor-new-auth 2014-10-09 20:08:27 +00:00
Anton Georgiev
c7d3d9b9db minor fix for public chat messages 2014-10-09 20:05:29 +00:00
Anton Georgiev
79c40f3c31 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-disconnection-handling 2014-10-09 19:56:30 +00:00
perroned
5beacad9f0 Fixed up some methods that weren't updated to use new id method. 2014-10-09 10:43:22 -07:00
perroned
dbd3478605 Cleaned up a bit. 2014-10-09 10:38:06 -07:00
perroned
9247921b1c Fixed muting and unmuting of users. 2014-10-09 10:27:44 -07:00
perroned
7d1afee614 Fixed joining and leaving audio. Muting remaining. 2014-10-09 09:48:27 -07:00
perroned
bc3e0f0ab3 Now use DBID for webrtc calls, and call server methods with updated params. 2014-10-09 09:39:58 -07:00
perroned
f010decbe9 Changed webrtc call to use nginx websocket. 2014-10-09 09:35:39 -07:00
perroned
17b468bc05 Made some code faster in places where we only need the size of the records returned. Take the count directly from the cursor returned instead of turning the cursor into an array first and taking the length. 2014-10-09 06:58:48 -07:00
perroned
dde59de62c Cleaned up UI with a message when you cannot chat with anyone. 2014-10-09 06:45:49 -07:00
Anton Georgiev
add73d17e2 identify disconnection 2014-10-08 22:05:57 +00:00
Anton Georgiev
631435e57e reduce clutter in js console 2014-10-08 21:57:33 +00:00
perroned
ab81ad8440 Removed backslash making a non standard escape character 2014-10-08 13:09:28 -07:00
Anton Georgiev
1a91092c82 cleaning up 2014-10-07 23:22:28 +00:00
Anton Georgiev
76a7e34357 fixed starting a private chat via clicking on the name in Options 2014-10-07 23:16:47 +00:00
Anton Georgiev
da846ac2d5 now the private chat messages are displayed 2014-10-07 23:09:33 +00:00
Anton Georgiev
4a93388c4d private chat using dbid 2014-10-07 23:08:48 +00:00
Anton Georgiev
9a901d56d7 version and date already set here: https://github.com/antobinary/bigbluebutton/blob/exploring-grunt/labs/meteor-client/app/client/main.coffee#L81-L82 2014-10-07 21:47:13 +00:00
Anton Georgiev
7ce7b96acf remove user after bbb-app's acknowledgement 2014-10-07 20:53:25 +00:00
Anton Georgiev
9261898476 fixed logging out 2014-10-07 20:34:03 +00:00
Anton Georgiev
7dccc09608 handle user_left_message 2014-10-07 20:08:36 +00:00
Anton Georgiev
846a59d4c8 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth 2014-10-07 19:52:51 +00:00
Anton Georgiev
866bd4e539 minor things 2014-10-07 19:52:30 +00:00
perroned
2bca7df34d Fixed lowering and raising hands to use database id. 2014-10-07 12:28:54 -07:00
Anton Georgiev
aa270da0d2 fix footer version, date 2014-10-07 18:05:37 +00:00
Anton Georgiev
319a1247a1 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth 
Conflicts:
	labs/meteor-client/app/client/globals.coffee
	labs/meteor-client/app/client/views/chat/chat_bar.coffee
	labs/meteor-client/app/collections/chat.coffee
	labs/meteor-client/app/collections/meetings.coffee
	labs/meteor-client/app/collections/presentations.coffee
	labs/meteor-client/app/collections/shapes.coffee
	labs/meteor-client/app/collections/slides.coffee
	labs/meteor-client/app/collections/users.coffee
 2014-10-07 17:45:47 +00:00
perroned
9ede339463 Fixed bug so now your name is highlighted and displayed to you in the participants window. 2014-10-07 09:37:37 -07:00
perroned
6d7c3bd72a Exclude yourself from list of participants you can chat with. 2014-10-07 09:36:10 -07:00
perroned
b1100641e5 Fixed function for identifying the current user. 2014-10-07 09:35:45 -07:00
perroned
ea60cef89b Added comment for something we need to fix later. 2014-10-07 09:30:04 -07:00
perroned
b4e6ec2e5d More appropriate message when error in retrieving meeting name. 2014-10-07 09:12:53 -07:00
perroned
fb8cabc445 Fixed login procedure, with help from Anton. 2014-10-07 08:47:46 -07:00
perroned
25cb1b80a0 fixed typo. 2014-10-07 08:44:30 -07:00
perroned
20c7ac5d17 Added a comment explaining a confusing bit of code. 2014-10-07 08:41:18 -07:00
perroned
e65cfb4fba Fixed issue when selecting public chat because it has no unique identifier. 2014-10-07 08:12:53 -07:00
perroned
f745320ece small changes 2014-10-07 06:27:17 -07:00
perroned
5e6981b2ad Exclude another field. 2014-10-07 06:26:38 -07:00
perroned
47b2c8314c removed useless security check. 2014-10-03 11:09:44 -07:00
perroned
06b09e744f Remove sample data. 2014-10-03 10:34:52 -07:00
perroned
d813870f52 Temporary function to retrieve user info. 2014-10-03 10:32:44 -07:00
perroned
9baeb15927 Extra check on incoming messages. 2014-10-03 10:32:14 -07:00
perroned
f66b2e8f26 Now translates chat messages between html5 and flash, adding case for public messages. 2014-10-03 10:31:45 -07:00
perroned
f56a7159db Temporary spot to get user credentials. 2014-10-03 10:30:39 -07:00
perroned
4cc36eeed8 Send message proper args 2014-10-03 10:27:24 -07:00
perroned
63744a1857 Fixed issue where we couldn't return the time for the user. 2014-10-03 10:26:01 -07:00
Anton Georgiev
ea2dd0ff5a fix path to files 2014-10-02 18:23:10 +00:00
Anton Georgiev
c0cd044937 remove old file 2014-10-02 17:15:04 +00:00
Anton Georgiev
7656bd6ba2 grunt materials 2014-10-02 17:14:41 +00:00
Anton Georgiev
c18bc6bf87 missed 2014-10-02 16:18:33 +00:00
Anton Georgiev
3905e45de7 moving the meteor files into an app folder so that grunt can reside in the root without breaking meteor 2014-10-02 16:16:34 +00:00
perroned
50f4a48727 Prevent redis class from performing lots of un-needed and wasteful checks. 2014-10-02 07:44:53 -07:00
Anton Georgiev
82b3813e93 devDependencies for grunt 2014-10-02 14:42:28 +00:00
Anton Georgiev
519c15a431 apply lint recommendations 2014-10-02 14:41:25 +00:00
Anton Georgiev
735ea41d52 adding Grunt - for now just lint for js and coffee 2014-10-02 14:40:33 +00:00
perroned
297d8bf9c9 Added another check reducing wasteful and redundant object checks. 2014-10-02 07:40:18 -07:00
perroned
0cafbba7f7 Added a single field check to remove lots of un-needed, wasteful code. 2014-10-02 07:37:51 -07:00
perroned
20a32fa16e Added some comments, added more fields for updateVoiceUser, fixed up some code. 2014-10-02 07:15:45 -07:00
Maxim Khlobystov
51cbf15365 Added background colour to the whiteboard. 2014-10-01 20:09:15 -07:00
perroned
922caa921f Updated collections to only publish public fields. 2014-10-01 11:07:02 -07:00
perroned
15614fccdb Added ability to translate chat messages between flash and html5. 2014-10-01 11:02:29 -07:00
perroned
f0f01fe486 Distinguishing between server invokeable and server action methods. Removing authentication for private server action methods. 2014-09-30 10:12:47 -07:00
perroned
35c4e9645b Moving more functions to be private. 2014-09-30 10:02:36 -07:00
perroned
58e62e4511 Adding more security to server methods. 2014-09-30 06:56:10 -07:00
Maxim Khlobystov
b8a765f10d Added default meeting name in case no value has been entered into the demos app form. 2014-09-26 11:06:38 -07:00
Anton Georgiev
3f45b6fc18 the footer grabs data from config.coffee 2014-09-25 20:02:38 +00:00
perroned
8f36a7817e Securing client access to server-side slide modifications. 2014-09-25 12:59:26 -07:00
Anton Georgiev
d5d6761831 temporarily hide the webcam button (until we actually start dealing with webcams) 2014-09-25 19:51:06 +00:00
Anton Georgiev
351f175796 do not send a message to the user. It will open a tab for them before you have even started typing your message 2014-09-25 19:47:00 +00:00
perroned
a9cf977654 Adding in commented code for securing presentations. If uncommented no slides or presentations can be used until the user is properly supplied with credentials on log in (still figuring that out). 2014-09-25 12:20:00 -07:00
Anton Georgiev
7beffc1ac7 Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into chat-tab-flashing 2014-09-25 19:00:57 +00:00
Anton Georgiev
b506b6a412 cleaning up and changing the color for new chat message notification 2014-09-25 18:58:32 +00:00
perroned
d141729d89 Moving more methods to server side only. 2014-09-25 11:47:43 -07:00
Anton Georgiev
49461f4bb3 implemented visual notification for unread chat messages 2014-09-25 18:35:04 +00:00
Maxim Khlobystov
156e84cb70 Made zoom level consistent between slides and encapsulated some duplicate code. 2014-09-25 11:34:08 -07:00
perroned
06b9919afd Moved redis publishing functionality to non-client-callable server side format. 2014-09-25 11:29:43 -07:00
Anton Georgiev
137cee3bc5 recover the displaying of the optionBar 2014-09-25 18:17:39 +00:00
Anton Georgiev
1f41635d8b fixed closing private chat tabs. Some cleaning up 2014-09-25 17:57:58 +00:00
Maxim Khlobystov
feba2731e5 Fixed missing cursor on resized whiteboard. 2014-09-25 10:43:09 -07:00
perroned
f98686abc0 Securing more methods. 2014-09-25 10:37:07 -07:00
Anton Georgiev
de672cd6ca recording tabs in a clientside only collection. 2014-09-25 17:24:42 +00:00
perroned
7486acd1f8 Many more changes to functions to user different ids, and server methods more secured. 2014-09-25 10:21:46 -07:00
perroned
ac542d0f87 More changes to server side methods. 2014-09-25 09:19:02 -07:00
perroned
6ab262f368 Changing ids and validating method callers. 2014-09-25 08:54:14 -07:00
Maxim Khlobystov
46026e330b Fixed zooming and panning so that it works properly with any adjusted size of slides. 2014-09-25 08:30:48 -07:00
perroned
715686f34e Moving files to the server to restrict client access. 2014-09-25 07:45:13 -07:00
Maxim Khlobystov
6566347ae1 Fixed the issue with whiteboard borders for the very first slide user sees after opening a new presentation. 2014-09-24 14:38:33 -07:00
perroned
a0ffb6e48d Working on lower and raise hand. 2014-09-24 12:55:55 -07:00
Anton Georgiev
ab0e746ee1 move tab related code in chat_bar.coffee 2014-09-24 19:44:18 +00:00
Maxim Khlobystov
6efe4ccfb5 Fixed whiteboard scaling. 2014-09-24 10:26:24 -07:00
perroned
8c908204bc Change newline character. 2014-09-24 09:48:25 -07:00
perroned
efbd3f1e94 More switching 2014-09-24 09:46:19 -07:00
perroned
52f0b771fe Switching userIds to _ids in chat. 2014-09-24 09:42:02 -07:00
perroned
f6421c08fa Merge conflicts 2014-09-24 08:46:57 -07:00
Anton Georgiev
5876d5ef9a found when a given chat tab should be flashing 2014-09-24 00:18:27 +00:00
Anton Georgiev
18c876b69c mute/unmute yourself from the userlist icons 2014-09-23 20:56:57 +00:00
Anton Georgiev
a84e48f9b2 lower your own hand from the userlist icon if it [your hand] has been raised 2014-09-23 20:40:59 +00:00
Anton Georgiev
866f9d5d77 simplify how get_all_meetings_request is sent 2014-09-23 20:15:03 +00:00
Anton Georgiev
81427b7968 cosolidate validateAuthToken 2014-09-23 19:59:56 +00:00
Anton Georgiev
9bc23c9510 restructuring the serverside. All publishing should go through "publish" 2014-09-23 19:55:25 +00:00
Anton Georgiev
a9697d96cc ask the user to confirm before logging out 2014-09-23 19:02:31 +00:00
Anton Georgiev
7d9f25fd9b fix logging out, which I broke earlier today with the moving of some code into users.coffee 2014-09-23 18:59:58 +00:00
Anton Georgiev
0e9bf62d48 fix indentation 2014-09-23 18:27:59 +00:00
Anton Georgiev
d31124239e split the welcome message into multiple lines 2014-09-23 18:03:59 +00:00
Anton Georgiev
0dbeb75148 remove excess logging 2014-09-23 17:20:18 +00:00
Anton Georgiev
288bcc88db updating the user related methods 2014-09-23 15:58:13 +00:00
Anton Georgiev
e67cc4f68b move user-related meteor methods out of redispubsub 2014-09-23 15:45:01 +00:00
Maxim Khlobystov
e3f98d488d Merge branch 'testing-version-002' of https://github.com/antobinary/bigbluebutton into meteor-client-whiteboard 2014-09-23 08:40:47 -07:00
Anton Georgiev
47e3b4eded send a user_left_voice_request when the html5 user clicks on Leave Audio. Right now we just leave it to webrtc to notify the server 2014-09-23 15:22:55 +00:00
Maxim Khlobystov
5e6c6a4739 Improved zooming performance by getting rid of multiple MongoDB observe handlers. 2014-09-22 17:07:01 -07:00
Maxim Khlobystov
9de4e24a26 Fixed ascending scaling for portrait slides on window resize. 2014-09-22 15:29:37 -07:00
Maxim Khlobystov
13166247a0 Added presentation's filename to the whiteboard title. 2014-09-22 15:11:24 -07:00
Anton Georgiev
32f1473ba0 Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into testing-version-002 
Conflicts:
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
 2014-09-22 21:51:09 +00:00
Anton Georgiev
6a2c6f2848 force more of the username to be displayed 2014-09-22 21:47:05 +00:00
Maxim Khlobystov
d86257bee2 Beginning work on whiteboard scaling. 2014-09-22 14:13:10 -07:00
Maxim Khlobystov
3b7f9f254a Fixed the issue with multiple cursors (window resizing or undoing annotation). 2014-09-22 14:00:50 -07:00
Anton Georgiev
d5f4a1630e Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into merge-whiteboard-changes 2014-09-22 20:14:14 +00:00
Anton Georgiev
c47c7f78cb giving current_time another try// using it as a timestamp in the chat window in HTML5 2014-09-22 19:56:54 +00:00
Anton Georgiev
626e91fe1c Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merge-danny-ui 
Conflicts:
	labs/meteor-client/client/views/chat/chat_bar.coffee
	labs/meteor-client/client/views/users/user_item.html
 2014-09-22 19:35:53 +00:00
Maxim Khlobystov
a51d4874a4 Fixed the issue with redisplaying shapes that occured while changing slides or undoing annotation. 2014-09-21 16:36:50 -07:00
Maxim Khlobystov
50301a9ce9 Reverted the changes related to multiple cursors. 2014-09-21 16:24:06 -07:00
Anton Georgiev
4e439b7f0e displays listen_only users. Added tooltips to listen_only and muted 2014-09-19 21:23:58 +00:00
Anton Georgiev
3e193fe51a simplify the handling of voice events, reusing some code 2014-09-19 19:51:02 +00:00
Anton Georgiev
7df7e19dde handle user_left_voice_message. Implemented a function updateVoiceUser where we will reuse some code 2014-09-19 19:39:59 +00:00
Anton Georgiev
dd4615f573 reuse the code for getting the time a user joined 2014-09-19 18:29:06 +00:00
Anton Georgiev
558c5efa1a reverting the changes related to using curr_time for sorting chat messages 2014-09-19 18:21:26 +00:00
Anton Georgiev
bb43a38bed send voiceBridge and duration in get_all_meetings_reply. We need the voiceBridge to join audio 2014-09-19 17:55:59 +00:00
Anton Georgiev
fd91be7622 allowing single quote in the meeting name so that we can enter the meetings created through the API e.x. Anton's meeting. Still stripping double quote because otherwise the name would be wrapped in double quotes 2014-09-19 15:55:56 +00:00
Anton Georgiev
9831e532c5 now using voiceConf from Meteor.Meetings 2014-09-19 15:35:08 +00:00
Anton Georgiev
cad3409cce use the time of joining for the sorting of all chat messages 2014-09-18 23:55:53 +00:00
Anton Georgiev
3ab7d6470d the actual setting of from_time for the greeting message 2014-09-18 23:42:31 +00:00
Anton Georgiev
4381b0528f still dealing with whitespace issues 2014-09-18 23:02:53 +00:00
Anton Georgiev
77a383f497 in the process of adjusting the greeting message to use the time the user entered the meeting 2014-09-18 22:38:54 +00:00
Anton Georgiev
86e36d375e needed to fix indentation before modifying the file, kept getting errors 2014-09-18 22:36:33 +00:00
Anton Georgiev
d8057fddcb try using header.current_time instead of message.from_time whenever possible. We"ll see if it improves how we sort the chat messages 2014-09-18 21:55:53 +00:00
Anton Georgiev
d6bfa9dbda rework the quote stripping 2014-09-18 21:19:51 +00:00
Anton Georgiev
b7fef986d7 added a meetingName field so we can now control in which meeting we are entering" 2014-09-18 20:47:33 +00:00
Maxim Khlobystov
938f883b63 Fixed multiple cursors issue on clicking 'Clear All Annotations' (cursor is being removed now). 2014-09-18 08:39:38 -07:00
Anton Georgiev
b17b2b1b99 Merge branch 'meteor-client-whiteboard' of https://github.com/gthacoder/bigbluebutton into testing-version-001 2014-09-17 22:04:43 +00:00
Lucas Zawacki
51dabcfdf5 Refactor whiteboard paper to use less variables 2014-09-17 17:24:13 -03:00
Lucas Zawacki
079c44a367 Add whiteboard pencil based on line tool 2014-09-17 17:04:30 -03:00
perroned
f45ee807e8 Working on presenter tool for muting all users. 2014-09-17 10:51:10 -07:00
perroned
6526cdaa8b Beginning work on stats for # of hands raised. 2014-09-16 12:29:17 -07:00
perroned
a2274bf017 Made user presenter. Beginning presenter functionality. 2014-09-16 08:24:52 -07:00
perroned
e6e66ece42 Removed border code. Doesn't seem to be used/needed anymore. Causes shapes and DOM elements to be created repeatedly. 2014-09-16 07:35:26 -07:00
Maxim Khlobystov
fe526f5277 Encapsulated some duplicate code. 2014-09-15 09:46:02 -07:00
Maxim Khlobystov
e852cceeac Zooming is now applied to paths and all the geometric shapes too. 2014-09-12 13:26:25 -07:00
Maxim Khlobystov
84bddefcbc Fixed browser compatibility issue with running preservation of aspect ratio. 2014-09-12 10:43:19 -07:00
Maxim Khlobystov
022760f255 Added fixed borders adjustable for slide dimensions (fixed the issue with non-standard slides (i.e. A4)). 2014-09-11 16:10:51 -07:00
perroned
b4ed2bac5b Removed resizing for chat box for now. Made error message clearer. 2014-09-11 11:17:31 -07:00
perroned
72f857e76a Fixed title. 2014-09-11 10:37:09 -07:00
perroned
b4414c8c0a Important changes, removed the unnecessary timestamp code, and fixed messages beeing joined when they should sandwich messages from another user. 2014-09-11 10:02:29 -07:00
perroned
4407b9c24b Readded scrolling on chatbar render. 2014-09-11 09:52:33 -07:00
perroned
ddec586d2e Cleaned a few UI things. 2014-09-11 09:37:41 -07:00
perroned
753c80f34e Made extra dummy entry smaller. 2014-09-11 09:31:13 -07:00
perroned
708427422b Comments explaining scrolling. 2014-09-11 09:28:41 -07:00
perroned
61d2a959c8 Fixed message, yet again. 2014-09-11 09:26:06 -07:00
perroned
cea9a226e6 Turns out timing code is still needed for some things. 2014-09-11 08:04:12 -07:00
perroned
350ea3b196 commented out unnessecary time stamp code, group messages within same minute and same user. 2014-09-11 07:35:34 -07:00
Maxim Khlobystov
c1443c45e0 Removed repeating code statement. 2014-09-10 18:12:36 -07:00
Maxim Khlobystov
4e5871dd8e Cleaned up. 2014-09-10 17:48:34 -07:00
Maxim Khlobystov
c37c5c6601 Implemented slide zooming and panning (horizontally and vertically). 2014-09-10 17:02:13 -07:00
perroned
b4b72095ae Cleaned up code a bit. 2014-09-10 13:23:38 -07:00
perroned
74c1363992 Fixed up greeting, added comments for future direction, addressed issue. 2014-09-10 13:05:15 -07:00
perroned
c3a3cd6e83 Working on merging chat messages from the same user. 2014-09-10 12:48:23 -07:00
perroned
314821a243 Merge remote-tracking branch 'maxim/meteor-client-whiteboard' into creating-better-templates 2014-09-10 10:34:52 -07:00
Maxim Khlobystov
22ac4c6598 Proper handling of slide dimensions (natural size). 2014-09-09 09:30:02 -07:00
perroned
cd80d881ad Merge remote-tracking branch 'maxim/meteor-client-whiteboard' into creating-better-templates 2014-09-09 05:37:02 -07:00
Maxim Khlobystov
5ef2913da4 Fixed ellipses on a whiteboard. 2014-09-07 13:34:59 -07:00
Maxim Khlobystov
02678f9c32 Merge branch 'merging-html5-with-master' of https://github.com/antobinary/bigbluebutton into meteor-client-whiteboard 2014-09-04 14:42:14 -07:00
perroned
ecb83c9e53 Added the ability to add new lines to messages. 2014-09-04 11:54:46 -07:00
Maxim Khlobystov
3278da5505 Rounded linecap was added to whiteboard lines. 2014-09-04 11:31:47 -07:00
perroned
bdeb664875 Added tooltips for icons in the users list. 2014-09-04 11:08:08 -07:00
perroned
ce31260a7c Fixed navbar button for hiding/showing navbar. 2014-09-04 10:57:28 -07:00
Anton Georgiev
0e670a05d8 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merging-html5-with-master 2014-09-04 17:15:13 +00:00
Anton Georgiev
fd85a30ff2 handling recording_status_changed_message 2014-09-04 17:13:23 +00:00
perroned
1ddd2e439c Changed title 2014-09-04 10:06:36 -07:00
perroned
37577b3ce4 Fixed server version 2014-09-04 09:46:02 -07:00
Anton Georgiev
1ed41ceb59 splitting "recorded" into "currentlyBeingRecorded" and "intendedForRecording" 2014-09-04 16:34:18 +00:00
perroned
a0163e5117 Fixed meeting recording status. 2014-09-04 09:32:24 -07:00
Anton Georgiev
206a2e23ea Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merging-html5-with-master 2014-09-04 15:04:42 +00:00
perroned
29cdfe1530 Added code for getting proper voice bridge pin 2014-09-04 07:48:50 -07:00
Anton Georgiev
4a88ebdcaf support voice_conf and duration in meeting_create_message. put empty strings for these params in get_all_meetings_reply 2014-09-04 14:47:32 +00:00
perroned
c6a91079bd Added newline and fixed operator. 2014-09-04 07:37:36 -07:00
perroned
acc85a1bf8 Fixed errors when data doesn't load properly. 2014-09-04 06:45:17 -07:00
perroned
65024217a7 Navbar elements do not rely on data being present anymore. So now if there is a connection or data issue the UI doesn't misbehave and disappear. 2014-09-03 13:11:56 -07:00
perroned
12eb51523d Changing the way UI relies on data. 2014-09-03 13:02:00 -07:00
perroned
8c00dcc56d Removed not needed code. Changing UI elements' dependencies to data always being available. 2014-09-03 12:22:08 -07:00
perroned
867928a0b6 Merge remote-tracking branch 'anton/merging-html5-with-master' into creating-better-templates 2014-09-03 10:44:33 -07:00
Anton Georgiev
f5fd9ee664 log when meeting_created_message was received 2014-09-03 15:09:34 +00:00
Anton Georgiev
149b21936d not sure if I should commit these 2014-09-02 15:59:50 +00:00
Anton Georgiev
70a3553ae9 cleaning up 2014-09-02 15:19:50 +00:00
Anton Georgiev
27e05e112a some work on presentation_page_resized_message 2014-09-02 15:19:21 +00:00
perroned
2a6d7b7578 Fixing some UI sizing and overflowing issues. 2014-08-22 11:46:50 -07:00
Anton Georgiev
6776c17ca7 update whiteboard_text 2014-08-22 15:26:37 +00:00
Anton Georgiev
bebe541cbf colorful shapes (cont'd) 2014-08-21 22:31:32 +00:00
Anton Georgiev
8839613e0a Merge branch 'meteor-client-messages-better-templates' of github.com:gthacoder/bigbluebutton into colorful-shapes 2014-08-21 22:17:18 +00:00
Anton Georgiev
ad4413db48 fixed the sorting of chat messages 2014-08-21 16:03:31 -04:00
Maxim Khlobystov
3538ce9509 Stroke color and width are displayed properly on HTML5 client's side. 2014-08-21 12:36:50 -07:00
Anton Georgiev
126b0eb127 removed unused properties from config 2014-08-21 19:07:02 +00:00
Anton Georgiev
8ef0248868 removed unused properties from config 2014-08-21 19:06:20 +00:00
Anton Georgiev
f1055361c9 Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into merging-html5-with-master 2014-08-21 18:26:00 +00:00
Anton Georgiev
e93819e3af cleaning up 2014-08-21 18:24:01 +00:00
Anton Georgiev
078fbc938e minor fix 2014-08-21 18:06:34 +00:00
Anton Georgiev
9435b5ee7b (un)muting in Flash is displayed in HTML5 2014-08-21 18:06:08 +00:00
perroned
8a26a7b2a7 Hide settings icon 2014-08-21 08:11:31 -07:00
perroned
64ff5f1da2 Unified color conversion methods combining both to make it better, placed it in globals.coffee as a coffeescript function, and added a global handlebars helper that calls it too. 2014-08-21 07:40:19 -07:00
perroned
f0738dda62 Fixed up issue where closing tags for anchor links were not properly ended causing all following text to be swallowed up in the link text. 2014-08-21 07:12:38 -07:00
perroned
dd9267fab0 Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates 2014-08-21 06:49:20 -07:00
Maxim Khlobystov
75d9c03b48 Tags and line breaks inside the chat messages have been replaced with the ASCII equivalents (keeping links clickable). 2014-08-20 22:14:15 -07:00
Anton Georgiev
d59e3366dc fixed the auto display of shapes 2014-08-20 21:17:52 +00:00
Anton Georgiev
f9261d9696 fix indentation 2014-08-20 21:17:18 +00:00
Anton Georgiev
c746cd30f5 fix typo 2014-08-20 20:43:29 +00:00
Anton Georgiev
adf20cca7d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-08-20 15:24:25 +00:00
perroned
3caebfc1f4 Fixed error message when there are 0 messages in chat, and prevented unsafe data from being inserted into the DOM. 2014-08-20 08:02:48 -07:00
Anton Georgiev
a63ea5875e increased the size of the cursor to make it more visible 2014-08-19 21:20:11 +00:00
Anton Georgiev
de15efbc74 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-19 20:28:12 +00:00
Anton Georgiev
0cb9dc4668 cleaning up 2014-08-19 20:27:44 +00:00
perroned
47bbfad399 Working on whiteboard sizing 2014-08-19 13:22:29 -07:00
Anton Georgiev
6fcaf6537b cleaning up 2014-08-19 19:53:27 +00:00
Anton Georgiev
24fb6c55bb Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-19 19:40:54 +00:00
Anton Georgiev
3edc80bc63 improve the calculation for the relative location of the shape 2014-08-19 19:39:17 +00:00
Anton Georgiev
35086951e5 cleaning up 2014-08-19 19:36:45 +00:00
Anton Georgiev
639f672e29 fixed an issue where textShapes would disappear after page refresh 2014-08-19 19:09:37 +00:00
Anton Georgiev
6acc236cc8 cleaning up 2014-08-19 19:09:04 +00:00
Anton Georgiev
a976cd7c2e use the helper code within whiteboard_text 2014-08-19 18:46:50 +00:00
Anton Georgiev
a27bd5cd91 attempting to avoid the passing of a dom node as an argument 2014-08-19 18:45:45 +00:00
Anton Georgiev
4935e147d2 adding textFlow 2014-08-19 16:54:19 +00:00
Anton Georgiev
40afd09431 adding textShapes 2014-08-19 16:54:01 +00:00
Anton Georgiev
df1a015041 accommodate textShapes 2014-08-19 16:53:16 +00:00
perroned
25c1cbc10b Moved some things around and cleaned up 2014-08-19 08:52:24 -07:00
perroned
578d91a0d7 fixed issues using wrong data 2014-08-19 08:43:48 -07:00
perroned
11b8a51e27 Added new case for breaklines 2014-08-19 08:37:16 -07:00
perroned
002370c70a Santizing and styling user input in chat messages 2014-08-19 08:27:32 -07:00
perroned
747c155a09 Added colors for messages. 2014-08-19 07:10:23 -07:00
perroned
87b67a5223 resized some things 2014-08-18 10:29:38 -07:00
perroned
7738b246aa Id for lowering hand now person doing it 2014-08-18 08:15:46 -07:00
perroned
7a895f5edc Merge remote-tracking branch 'anton/creating-better-templates' into creating-better-templates 2014-08-18 08:11:36 -07:00
perroned
c4da201431 Moved buttons around to match layout 2014-08-18 08:10:57 -07:00
Anton Georgiev
f10101c23c Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-18 15:05:32 +00:00
Anton Georgiev
f506c964a8 userRaiseHand and userLowerHand is functioning 2014-08-18 15:01:16 +00:00
perroned
3562a9ca34 removed useless file (not needed); users cannot edit anything 2014-08-18 07:55:59 -07:00
perroned
a9c938754a Removed insecure package for beta release 2014-08-18 07:32:24 -07:00
perroned
2b57a6e0a6 Fixed some duplicate code and reordered things 2014-08-18 07:29:02 -07:00
perroned
877015d6c9 Proper name overflowing solution. 2014-08-18 07:16:07 -07:00
perroned
41e0c8cf4c Added tooltip for user names in the user list, added hand raise status. 2014-08-18 05:54:12 -07:00
Anton Georgiev
5d0744afc4 raise/lower hand event is published in pubsub. now we are missing the java handling... 2014-08-15 21:08:12 +00:00
Anton Georgiev
218092a745 the html5 client now starts as an attendee, not as a Moderator 2014-08-15 20:27:10 +00:00
perroned
a86c84bb08 Fixing up UI for long names in uders list 2014-08-15 13:25:28 -07:00
Anton Georgiev
e68766fc92 raise/lower hand incoming messages are now handled 2014-08-15 20:18:53 +00:00
perroned
6064671a5b Fixed issue with messages not showing up 2014-08-15 12:30:44 -07:00
perroned
c46c9f2b61 Voice bridge pin 2014-08-15 12:20:41 -07:00
perroned
56df4efd66 Fix removed font size 2014-08-15 12:18:23 -07:00
perroned
e1e12fe3c6 Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates 
Conflicts:
	labs/meteor-client/client/views/chat/chat_bar.html
 2014-08-15 12:17:37 -07:00
perroned
0c845d5c0b Made neater after remove bootstrap2 package 2014-08-15 12:14:10 -07:00
Anton Georgiev
0775d645c5 change presenter works 2014-08-15 19:01:38 +00:00
perroned
55f36c24f2 Removed unused code and fixed UI issue with chat greeting 2014-08-15 11:30:43 -07:00
perroned
98e591b748 Merge remote-tracking branch 'anton/creating-better-templates' into creating-better-templates 
Conflicts:
	labs/meteor-client/client/main.coffee
 2014-08-15 11:27:40 -07:00
perroned
0563a5b37c Options now shows currently used font size 2014-08-15 11:20:21 -07:00
Maxim Khlobystov
3064bea6d2 Slightly changed the chat message getter code to be more efficient. 2014-08-15 11:13:28 -07:00
Maxim Khlobystov
43b93ff080 No repeating timestamps in successive messages from the same user. 2014-08-15 11:00:15 -07:00
perroned
bd829c312f You can now change the font size of messages in the options bar 2014-08-15 10:17:51 -07:00
perroned
3c41b62492 Removed duplicate bootstrap packages, fixing up UI issues now to compensate 2014-08-15 09:37:43 -07:00
perroned
85e9d888d1 Fixed ,ajor issues with duplication of button handler preventing audio calls from being made 2014-08-15 09:26:17 -07:00
Anton Georgiev
8999dfb77b Merge branch 'more-whiteboard-shapes' of https://github.com/lfzawacki/bigbluebutton into creating-better-templates 2014-08-15 15:52:47 +00:00
Anton Georgiev
71a062af95 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/main.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
 2014-08-15 15:49:18 +00:00
Anton Georgiev
029b26ab32 cleaning up and minor fix to slideshow error - whiteboard_paper's last function which is still under development 2014-08-15 15:22:39 +00:00
Anton Georgiev
6633a30d7d fix drawListOfShapes(shapes) and some cleaning up 2014-08-15 15:11:31 +00:00
Anton Georgiev
498725fdba removing single shape and removing all shapes from slide 2014-08-15 15:04:35 +00:00
perroned
7eb22d415f Fixed some UI overflowing issues 2014-08-15 06:58:33 -07:00
Maxim Khlobystov
9ec52a50d0 Username doesn't repeat in successive messages (it is displayed only once). 2014-08-14 17:28:01 -07:00
perroned
8764bdab26 Fixed overflowing messages, and navbar 2014-08-14 12:22:51 -07:00
Lucas Zawacki
7168439869 Drawing ellipses 2014-08-14 15:53:47 -03:00
Lucas Zawacki
b5067d8a37 Drawing lines on whiteboard 2014-08-14 15:11:56 -03:00
Lucas Zawacki
b06c00a458 Drawing triangles on whiteboard 2014-08-14 15:11:18 -03:00
perroned
753ec4dd1b Added recording status and matching icons 2014-08-14 10:26:15 -07:00
Maxim Khlobystov
e16ec283fe Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into meteor-client-messages-better-templates 
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/views/chat/chat_bar.coffee
	labs/meteor-client/client/views/chat/chat_bar.html
 2014-08-14 10:20:21 -07:00
perroned
a83e2fb947 Fixed some private chat things 2014-08-14 07:48:08 -07:00
perroned
59bcb84b9d Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates 
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/main.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
 2014-08-13 13:56:04 -07:00
perroned
d079f5cb72 Remove greeting in private message, made it simpler 2014-08-13 12:48:44 -07:00
perroned
9a2990fe4a Only send initial message once 2014-08-13 12:16:27 -07:00
perroned
b830735e08 scrolling window for chat tabs 2014-08-13 11:42:31 -07:00
perroned
d74116be1d Fixing up private chat UI and message filtering issues and making private chat more efficient and got it into a working state again 2014-08-13 11:30:55 -07:00
Anton Georgiev
52e542adfc now we only draw on DRAW_END - no more fuzzy shapes on the html5 whiteboard due to slow drawing 2014-08-12 21:56:45 +00:00
Anton Georgiev
2ef0dbb232 working on handling slow drawing of shapes 2014-08-12 21:50:10 +00:00
Anton Georgiev
07138bda00 working on clearing all shapes from a slide 2014-08-12 20:05:34 +00:00
Anton Georgiev
9d5000e636 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/main.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
 2014-08-12 18:53:50 +00:00
Anton Georgiev
8706792903 cleaning up 2014-08-12 17:44:32 +00:00
perroned
f880aceba3 Fixed up UI stuff, fixed up joining call/muting audio/detecting speaking 2014-08-12 09:25:15 -07:00
Anton Georgiev
1e465d66e8 we have a moving cursor 2014-08-12 16:18:29 +00:00
Anton Georgiev
8e0fc0cf15 working on displaying the presenter's cursor/pointer 2014-08-11 20:54:16 +00:00
perroned
446f4e5ad9 Added menu buttons back to options tab, fixed message scrolling 2014-08-11 12:43:49 -07:00
perroned
6db655e1df Fixing chat ui 2014-08-11 12:32:42 -07:00
Anton Georgiev
04494aa8a4 cleaning up 2014-08-11 18:46:10 +00:00
Anton Georgiev
3070bc6682 shapes seem to be drawn at the right time. we don"t loop excessively 2014-08-11 18:41:03 +00:00
perroned
d6bcf90b3e Lots of UI stuff 2014-08-11 09:21:14 -07:00
Anton Georgiev
49b44d3533 in the process of separating "shape" 2014-08-11 15:56:46 +00:00
Anton Georgiev
0a59398781 the server is common for all meetings. We should not clear the collections upon a user's departure. Fixed an error where after logout an html5 user would not be able to enter into a running meeting 2014-08-11 15:10:01 +00:00
Anton Georgiev
d1b7a72c0a fixing separation of public from private chat. Now things look alright on the Flash side 2014-08-11 14:58:58 +00:00
Chad Pilkey
9a5343aac5 Merge remote-tracking branch 'upstream/master' into fix-chrome-webrtc 2014-08-08 13:19:42 -07:00
perroned
ef0168fbf4 Added footer, fixed navbars 2014-08-08 12:30:28 -07:00
perroned
9aa7e182ec Organized code :) 2014-08-08 09:04:04 -07:00
perroned
510905d000 Cleaning up UI 2014-08-08 08:18:38 -07:00
perroned
8060b0b20d Fixed navbar and removed some unused things 2014-08-08 08:12:02 -07:00
perroned
43f3a041f8 Outlined changes that need to be made to prevent users from having multiple sessions. 2014-08-08 06:09:39 -07:00
perroned
72cd8c1050 Made prettier, cleaned up code, removed things in code and UI that arent needed 2014-08-07 13:29:13 -07:00
perroned
eb5ef9cd08 Unifying layouts and modules. Making everything look better and look the same. Reducing code and making it easier to add modules. 2014-08-07 09:02:35 -07:00
perroned
903eda589f Major changes to UI and templates 2014-08-06 10:46:54 -07:00
perroned
682762cd21 First commit 2014-08-06 06:03:03 -07:00
perroned
e122e31521 Working on whiteboard positioning 2014-08-06 05:57:51 -07:00
Anton Georgiev
fea70bda5f using coffeescript 'comprehension' 2014-08-05 21:48:11 +00:00
Anton Georgiev
eea49c7663 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/client/main.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
 2014-08-05 21:27:15 +00:00
Anton Georgiev
977a7f137c reworking whiteboard.html, set the whiteboard to be displayed by default 2014-08-05 21:18:18 +00:00
Anton Georgiev
204acf3c53 cleaning up 2014-08-05 21:13:51 +00:00
Anton Georgiev
293bec988e displaying shapes again 2014-08-05 21:10:56 +00:00
Anton Georgiev
07cec1d020 cleaning up 2014-08-05 21:07:33 +00:00
Anton Georgiev
327b547014 split the whiteboard template so that when the slide info is loaded/modified we trigger an event and rerender the slide template 2014-08-05 21:05:31 +00:00
perroned
ed1ca4651e Added lower hand 2014-08-05 11:14:19 -07:00
Maxim Khlobystov
f9a483561e Meteor client detects URLs inside messages received (from either Meteor or Flash). Outgoing messages are being parsed and re-rendered to be compatible with Flash client. 2014-08-01 10:38:48 -07:00
perroned
17e4ea629f Fixed some errors 2014-08-01 08:01:44 -07:00
Anton Georgiev
c8de68eaca now the slide is displayed when we first load the page 2014-08-01 14:54:48 +00:00
perroned
d5ab7d1009 Added toggle for whiteboard visibility 2014-08-01 06:51:45 -07:00
perroned
aff1b175f6 Merge branch 'prototype-metor-client' of https://github.com/perroned/bigbluebutton into prototype-metor-client 2014-07-31 13:48:24 -07:00
perroned
24918e943b Supressed a lot of debugging 2014-07-31 13:31:50 -07:00
perroned
b3430cc09b Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-31 13:22:45 -07:00
perroned
2d101e25e3 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-31 12:24:37 -07:00
Anton Georgiev
df0d0668c0 cleaning up 2014-07-31 19:13:00 +00:00
Anton Georgiev
b0cc462953 needed to remove another line of obsolete code causing an error 2014-07-31 17:42:46 +00:00
Anton Georgiev
627f46f84e was able to display a rectangle on the slide 2014-07-31 17:38:54 +00:00
Anton Georgiev
9205fcef60 fixing the calling of displaySlide, displayShapeOnSlide. Removing code referring to globals... (left over from the Express version) 2014-07-31 17:34:52 +00:00
Anton Georgiev
7fe1eb8e1e splitting the displaying of slide and shapes into separate functions and calling them via Spacebar 2014-07-31 15:16:47 +00:00
perroned
1d7e4aed8d Tidying UI 2014-07-31 07:29:45 -07:00
perroned
3d402ef11c Adding user accessibility options 2014-07-31 07:11:01 -07:00
Anton Georgiev
fdd7c57d03 started work on drawing shapes 2014-07-30 21:31:12 +00:00
perroned
a15265b0c5 More tooltips :) 2014-07-30 13:51:54 -07:00
perroned
92eeb16c4b Added more tooltips 2014-07-30 13:24:53 -07:00
perroned
39d47318d6 Added some tooltips 2014-07-30 13:22:23 -07:00
Anton Georgiev
0c9a17f308 remove Draw button 2014-07-30 19:42:34 +00:00
Anton Georgiev
69d8e54141 fixed the displaying of the current slide - had to regulate which presentation is current=true aside from which slide is current=true 2014-07-30 19:35:31 +00:00
Anton Georgiev
e966ae84ca cleaning up 2014-07-30 18:29:02 +00:00
Anton Georgiev
d25df88be4 rough: displays the slide 2014-07-30 17:06:29 +00:00
Anton Georgiev
22ce0dd2bc cleaning up 2014-07-30 16:22:22 +00:00
Anton Georgiev
a284517ffe slide.current true is updated in the collection when the slide changes on the Flash client 2014-07-30 16:19:11 +00:00
Anton Georgiev
a57e8e61bc got the slideId 2014-07-30 15:20:29 +00:00
Anton Georgiev
5f5d18c52d add only unique presentations 2014-07-29 21:33:35 +00:00
Anton Georgiev
176f1176c1 working on adding presentations to the collection 2014-07-29 21:30:16 +00:00
Anton Georgiev
b6d9b45f37 adding Presentations collection 2014-07-29 20:57:02 +00:00
Anton Georgiev
9af56af4b1 add the raphaeljs-package 2014-07-29 20:29:53 +00:00
Anton Georgiev
cd7ea270df moved the code from the whiteboard prototype to the html5 client. Now will start integrating it 2014-07-29 19:23:16 +00:00
perroned
b16f01f0d4 Fix the user being registered as talking if they mute while talking. 2014-07-29 12:22:41 -07:00
perroned
1700417958 Fix field name being used 2014-07-29 12:21:27 -07:00
perroned
042ba3cc00 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-29 10:07:12 -07:00
Anton Georgiev
834b48dde3 cleaning up 2014-07-29 16:02:30 +00:00
Anton Georgiev
821af76933 now user.voiceUser.muted changes to true/false as it is supposed to do 2014-07-29 15:58:32 +00:00
Anton Georgiev
7a03063d52 wait for mute_voice_user_request 2014-07-29 15:55:46 +00:00
Anton Georgiev
f10650d8d8 fix publishing 2014-07-29 15:42:19 +00:00
perroned
bc0b2ccee7 Clear private chat messages when conversation is closed. 2014-07-29 08:04:55 -07:00
Anton Georgiev
140795f694 working on mute/unmute events 2014-07-29 15:03:19 +00:00
perroned
9f8729a825 Handlebars comment style doesn't work so well. 2014-07-29 07:24:21 -07:00
perroned
30d96b8229 User raise hand ability since html5 client will be for students/viewers 2014-07-29 07:20:51 -07:00
Anton Georgiev
7730abbeb8 fix for the merge and fix for an issue with get_all_meetings_request not recognized in bbb-apps 2014-07-28 21:01:06 +00:00
Anton Georgiev
3075166fa8 Merge branch 'meteor-merge-private-chat' into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/client/views/chat/chat_bar.coffee
 2014-07-28 19:56:40 +00:00
perroned
248b90f3bb Adding UI for muting functionality 2014-07-28 12:24:07 -07:00
Anton Georgiev
17ae9c1d88 style change 2014-07-28 19:13:36 +00:00
Maxim Khlobystov
3b10e80342 XX:00 bug in timestamps was fixed. 2014-07-28 11:04:40 -07:00
perroned
7e8cedc4dc Updated UI to now show whether a user is sharing audio and further whether the user is actually speaking or not. 2014-07-28 10:43:26 -07:00
perroned
b7a0a1ed31 Status bar icon now shows when user is talking. Should be changed to use more pronounced icons. 2014-07-28 08:52:50 -07:00
perroned
4be030ef2f Clear user data when they logout 2014-07-28 08:00:07 -07:00
perroned
682e4a5dcd Wipe subscriptions after user logout 2014-07-25 09:36:31 -07:00
perroned
904d91f2b2 Only load collections when the previous was successful, now check if user is validated by checking the integrity of their database entry 2014-07-24 13:06:07 -07:00
perroned
3eb2ce47e8 Display header only when user is actually inside 2014-07-24 13:04:53 -07:00
perroned
48806ca51f Will need to implement this server-side function 2014-07-24 13:04:04 -07:00
perroned
47c28469d8 Manual merge of meteor-client-change-logout into prototype-metor-client 2014-07-24 11:04:12 -07:00
perroned
62dde1fb8c Restructured logout procedure 2014-07-24 10:56:31 -07:00
perroned
f826215dd7 Now displays when user is actually talking 2014-07-24 09:12:27 -07:00
perroned
0b931aa7d8 Working on detecting sound while talking 2014-07-24 07:43:46 -07:00
perroned
44c16be891 Update user list title 2014-07-24 07:42:17 -07:00
perroned
49e05abebd Update methods for user sharing audio 2014-07-24 07:39:53 -07:00
Maxim Khlobystov
e2fd5f5202 Chat message timestamp is fixed (converted from Epoch time to 24-hour clock). 2014-07-22 18:38:52 -07:00
perroned
ace02d8cb4 Supressed error and make access safer. Still don't know what the proper way to fix this is. 2014-07-22 08:15:24 -07:00
perroned
f45abb866b Fixed message scrolling and added some message filtering 2014-07-22 06:33:27 -07:00
perroned
387ad47f31 Updated method for determining whether user is talking 2014-07-22 06:31:32 -07:00
perroned
eb7c8d0507 Kicking users now works properly 2014-07-21 08:54:38 -07:00
perroned
d6e7ee3944 Updated session to coffeescript from js 2014-07-21 08:30:21 -07:00
perroned
1113ecc114 Fixed logout issue 2014-07-18 08:18:27 -07:00
perroned
2461be4edf Merging in persistent sorage solution 2014-07-18 07:30:46 -07:00
perroned
11904455cf Removed files 2014-07-18 07:21:54 -07:00
perroned
0de71c6039 removing things 2014-07-18 07:19:49 -07:00
perroned
5a96d7c370 Updated ignore file 2014-07-18 07:17:06 -07:00
perroned
3214985e4e Commented code 2014-07-18 07:08:59 -07:00
perroned
730616631a Once logged out user cannot return to meeting without the server validating their entrance. 2014-07-18 06:41:35 -07:00
perroned
7e4b88a5d1 Updated session calls to use amplifies session. data now preserved upon refresh 2014-07-17 13:13:06 -07:00
perroned
b1e1f6f96a Collections now remain after refresh 2014-07-17 12:45:26 -07:00
perroned
11bb0daf89 Fixing up chat tabs... again. 2014-07-17 08:25:56 -07:00
perroned
fdc214dd65 Removed some clutter, fixing up packages and environment 2014-07-16 11:10:27 -07:00
perroned
219b3b70d5 Putting voice call functionality into client prototype 2014-07-14 07:46:02 -07:00
perroned
56e94e6133 Proof of concept prototype successful. Can join audio call using WebRTC in html5 client. 2014-07-11 11:58:25 -07:00
perroned
9b3251ba40 Added files required for JsSip and new modules which were removed 2014-07-11 10:55:02 -07:00
perroned
b72568600d Fixed the view to make private chat sort messages correctly 2014-07-11 09:05:30 -07:00
perroned
9d0c06b086 Fixed messages to display previous messages from before join, display greeting, then display new messages accordingly 2014-07-11 08:53:49 -07:00
perroned
239666d2ef Trying to fix up, still a big mess 2014-07-10 07:36:29 -07:00
perroned
4001373438 Still trying to get the tabs UI working 2014-07-10 06:11:38 -07:00
Anton Georgiev
7ea4571568 coffeescript proper style 2014-07-09 19:09:10 +00:00
perroned
e91f0e832e Merge branch 'meteor-merge-private-chat' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-09 09:08:07 -07:00
Anton Georgiev
884cce7e9b the client will have access only to the meeting they are in so they can see the meeting"s name and record status 2014-07-09 16:06:25 +00:00
perroned
328872b222 Merge branch 'meteor-merge-private-chat' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-09 08:38:25 -07:00
perroned
2797bb15f3 Updated bootstrap 2014-07-09 08:36:08 -07:00
Anton Georgiev
1c1815fb16 missed these changes in the merge 2014-07-09 15:26:12 +00:00
Anton Georgiev
3ad1bdd341 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat 
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/views/chat/chat_bar.coffee
	labs/meteor-client/collections/collections.coffee
	labs/meteor-client/lib/router.coffee
	labs/meteor-client/server/publish.coffee
	labs/meteor-client/server/server.coffee
 2014-07-09 15:09:27 +00:00
perroned
af3c7f4896 Removed old comment 2014-07-09 06:31:04 -07:00
perroned
df4a393b12 Added method for getting meeting name 2014-07-09 06:28:33 -07:00
perroned
098a4c7f81 Added private chat and chat tabs functionality. Tab UI is still buggy. 2014-07-09 06:18:52 -07:00
perroned
a304301bd4 By default youre in public chat 2014-07-09 06:16:17 -07:00
perroned
4460127b6a Method for getting user's name' 2014-07-09 06:15:50 -07:00
Anton Georgiev
48010179e5 fixed adding to Slides collection 2014-07-08 17:15:30 +00:00
Anton Georgiev
abddc57c6f worked on slides collection 2014-07-08 15:14:55 +00:00
Anton Georgiev
168eb4e715 adding Slides collection 2014-07-07 20:58:50 +00:00
Anton Georgiev
7aef935771 filter log messages from flooding event types - cursor update, page resizing... 2014-07-07 20:51:33 +00:00
Anton Georgiev
86e90bbdef forgot to publish the Shapes collection 2014-07-07 20:31:18 +00:00
Anton Georgiev
4adef66799 remove redundant meetingId decl 2014-07-07 20:21:36 +00:00
Anton Georgiev
498472969e adding a shape to the collection 2014-07-07 20:17:09 +00:00
Anton Georgiev
c74737d66c adding a Shapes collection 2014-07-07 19:08:24 +00:00
Anton Georgiev
f1416a49a5 on get_presentation_info_reply request shapes 2014-07-07 18:04:47 +00:00
Anton Georgiev
3d00b2f2b8 changed logging style 2014-07-07 18:03:33 +00:00
perroned
8bc9ace261 Make tabs reappear 2014-07-07 08:31:29 -07:00
perroned
adb7dbc77c working on private chat tabs 2014-07-07 08:30:17 -07:00
perroned
d0d4227d17 Made a tab creation helper 2014-07-04 08:00:46 -07:00
Anton Georgiev
c79c17d61a stop sending userName and meetingName via the URL. Now we can obtain them from bbb-apps and the Collections 2014-07-03 20:50:24 +00:00
Anton Georgiev
561d099eec display number of meetingsin console.log 2014-07-03 20:40:36 +00:00
Anton Georgiev
52202527a8 use the user's username when sending a chat message 2014-07-03 20:39:47 +00:00
Anton Georgiev
25cbf5af27 fix removing users from Users 2014-07-03 18:44:05 +00:00
Anton Georgiev
f651744da9 handle end of meeting + some cleanup 2014-07-03 18:31:32 +00:00
perroned
837edef50b Created array to keep track of tabs 2014-07-03 10:56:56 -07:00
perroned
1b01ce8666 Added private chat creation and UI 2014-07-03 10:56:16 -07:00
perroned
94fe921ad6 Added private chat selectors 2014-07-03 10:55:32 -07:00
perroned
75bc1500e6 Added the default tabs 2014-07-03 10:55:06 -07:00
perroned
5d03c2651b Added functions for adding new tabs 2014-07-03 10:54:41 -07:00
Anton Georgiev
444aef0b25 Meetings collection, adding to it on Server.start 2014-07-03 15:52:43 +00:00
Anton Georgiev
39d62e1d4a now get_all_meetings_reply returns info about meetingName and recorded status 2014-07-03 15:30:06 +00:00
Anton Georgiev
3fa27ae11a Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/client/globals.coffee
 2014-07-02 19:10:12 +00:00
Anton Georgiev
c40bcece8f cleaning up 2014-07-02 17:57:07 +00:00
Anton Georgiev
22785c12bc cleaning up. The client side can only see one meeting 2014-07-02 17:13:00 +00:00
perroned
775d4ef0eb Added comments for future changes - 2 2014-07-02 09:23:30 -07:00
perroned
5c326e0cd6 Added comments for future changes 2014-07-02 09:21:33 -07:00
perroned
a85a706d1d Updated templates to new message format, the chat now displays real messages 2014-07-02 09:17:05 -07:00
perroned
d9eb0c8cf2 Changes 2014-07-02 08:43:56 -07:00
perroned
a8defa1c30 Changes 2014-07-02 08:41:12 -07:00
Anton Georgiev
5ea58dfb23 fixing user logout 2014-07-02 15:09:55 +00:00
Anton Georgiev
2b2622ecc9 fixing when a chat message is added to a collection 2014-07-02 15:08:56 +00:00
Anton Georgiev
773825de73 fixing chat so that we only call Meteor.redisPubSub from within RedisPubSub 2014-07-02 14:47:22 +00:00
Anton Georgiev
d599a782a3 cleaning up 2014-06-27 19:47:16 +00:00
perroned
2beb2868b1 commented 2014-06-27 12:29:07 -07:00
Anton Georgiev
dd85764db9 fix user logout 2014-06-27 19:16:04 +00:00
Anton Georgiev
2fb970d9cd adjusting the parameter names so that they match what is recognized on the server 2014-06-27 19:10:11 +00:00
Anton Georgiev
8c61b3fcdc sending on the chat channel 2014-06-27 18:41:25 +00:00
Anton Georgiev
d6851c39a4 when we try to send a chat message from the html5 client we now send a send_public_chat_message_request towards bbb-apps 2014-06-27 17:53:31 +00:00
Anton Georgiev
9a9c80efab when we press Enter, the chat message enters the collection 2014-06-27 17:31:01 +00:00
perroned
d53e340f28 Fixed bug in sending message, missing parentheses 2014-06-27 10:22:56 -07:00
Anton Georgiev
9ef70b55e9 inserting the chat messages we receive from bbb-apps into the Chat collection 2014-06-27 16:16:17 +00:00
Anton Georgiev
f0a50ce174 introducing Chat collection, clear on start, publish, subscribe, etc 2014-06-27 15:37:33 +00:00
perroned
60ac20880c Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-06-27 07:40:36 -07:00
Anton Georgiev
1aacd65e66 clear Users data on startup 2014-06-27 14:38:08 +00:00
perroned
8a213f6354 stress the current user 2014-06-27 06:59:31 -07:00
Anton Georgiev
08e446e6a0 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 2014-06-26 20:28:54 +00:00
perroned
50e746e5da Fixed bug where help link changed current page, now opens new tab 2014-06-26 13:15:31 -07:00
perroned
090c5ae595 Fixed issue with no server version being displayed 2014-06-26 13:11:31 -07:00
Anton Georgiev
8f11be5a8b dealing with users event 2014-06-26 20:11:18 +00:00
perroned
f270f74903 Implemented auto scrolling to the bottom of the chat messages window, building chat message to send to server 2014-06-26 12:58:58 -07:00
Anton Georgiev
7b5866cf1e we get information about all the meetings on starting up the Meteor server 2014-06-26 19:54:24 +00:00
Anton Georgiev
86dfa841bf switched server.js to coffeescript 2014-06-26 18:10:15 +00:00
Anton Georgiev
99bd016cab the first thing we do when we start the Meteor server is to grab the list of active meetings from bbb-apps 2014-06-26 18:09:39 +00:00
perroned
2123998bcb Changed some toggles, fixed up some UI, more chat functionality 2014-06-26 10:13:19 -07:00
perroned
46cdeafabb Cleaned up lots of code, changed toggles to server calls 2014-06-26 08:14:43 -07:00
perroned
8971b21a90 Added some comments 2014-06-26 08:13:29 -07:00
perroned
7ac36b1cf6 Tidy up, more chat UI, log out user info to check for duplicates' 2014-06-25 11:51:16 -07:00
perroned
efb2177b2b Fixing up some UI 2014-06-25 07:04:04 -07:00
perroned
30bae7c80f Recreating chat UI 2014-06-25 06:28:15 -07:00
perroned
bbdfc071ef Set a few values that should be retrieved from server later 2014-06-25 06:27:12 -07:00
perroned
806bf90b4c Some tidying up and making things more proper 2014-06-24 11:39:32 -07:00
perroned
3eb07aec15 Fixed a bug when switching panes 2014-06-24 11:36:22 -07:00
perroned
abe150cd88 Added some whitespace 2014-06-24 11:20:18 -07:00
perroned
ddde558da2 Fixed up collection declarations 2014-06-24 11:18:25 -07:00
perroned
34e62b838e Moved function 2014-06-24 11:11:51 -07:00
perroned
13df1b475b Working on chat UI 2014-06-24 11:11:26 -07:00
perroned
7412774b5c Added chatbar CSS 2014-06-24 11:10:43 -07:00
perroned
28d7358f67 Moved a file to the global namespace 2014-06-24 11:10:02 -07:00
perroned
067463b866 beginning work on the chat UI 2014-06-24 06:46:42 -07:00
perroned
30694171f5 Altered some values for default view 2014-06-24 06:46:14 -07:00
perroned
c282b46b4c Cleaning up the code a bit, placed rendering logic inside individual templates to be a bit neater 2014-06-23 12:54:17 -07:00
perroned
ac61ea7a24 Added sample whiteboard entry 2014-06-23 12:51:54 -07:00
perroned
c76378edff Added logout page 2014-06-23 12:11:57 -07:00
Anton Georgiev
31ff2121ab logging out 2014-06-23 17:55:54 +00:00
Anton Georgiev
43c1eae0e5 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 2014-06-23 17:48:59 +00:00
Anton Georgiev
5532f3c766 implementing user logout 2014-06-23 17:48:11 +00:00
perroned
cf2215db07 Adding some functionality for logout button 2014-06-23 10:44:09 -07:00
perroned
6005ea000e Fixed kicking users... for now, until things change again 2014-06-23 10:20:08 -07:00
perroned
63a3a4c737 Created a helper and rewrote logic to determine if user is sharing audio/video 2014-06-23 09:58:30 -07:00
perroned
32ddd86438 Fixed spelling issue 2014-06-23 06:24:12 -07:00
perroned
70714bd320 Fixed some helpers and templates to match data format 2014-06-23 06:22:30 -07:00
perroned
466787ab47 Added new line feeds to files 2014-06-23 06:21:03 -07:00
perroned
b63a1cb549 Fixed setPresenter helper 2014-06-23 06:17:19 -07:00
perroned
bf1a65541d updated user retrieval 2014-06-23 06:16:24 -07:00
perroned
e53ced5200 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-06-20 12:36:00 -07:00
Anton Georgiev
a102a501ed insert more info about the user in the collection 2014-06-20 19:30:37 +00:00
Anton Georgiev
33597fcbe5 added a field username to the Users collection 2014-06-20 15:22:04 +00:00
Anton Georgiev
dd8d10260b following the model meetingId, userId 2014-06-20 14:44:32 +00:00
perroned
01b7fc9111 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 
Conflicts:
	labs/meteor-client/client/views/users/user_list.coffee
	labs/meteor-client/server/insert-startup-data.js
 2014-06-20 07:32:12 -07:00
Richard Alam
78ebb5b14c - start implementing per user access code 2014-06-19 15:43:20 -07:00
Anton Georgiev
82b8f9d134 Meteor.users -> Meteor.Users the collection should start with a capital letter 2014-06-19 21:29:52 +00:00
Anton Georgiev
d963078423 get_users_reply populates the collection of users 2014-06-19 21:16:48 +00:00
Anton Georgiev
6d98622d38 handling user_left_message - removing the user from the Meteor.users collection 2014-06-19 20:25:27 +00:00
perroned
4e3dc04573 Removed 'sign in as...' buttons 2014-06-19 11:13:52 -07:00
Anton Georgiev
0f4ac2a32a moved the subscription code so it is executed on connect and not on client startup 2014-06-19 18:13:12 +00:00
perroned
1da3dfe3a5 Using realistic data 2014-06-19 10:52:41 -07:00
perroned
124068a590 Use data from session now 2014-06-19 10:52:08 -07:00
Anton Georgiev
d6e873c013 working with coffeescript 2014-06-19 16:57:43 +00:00
Anton Georgiev
8d5f3170cc we now subscribe to stay up to date only with our meeting's users 2014-06-19 15:36:51 +00:00
Anton Georgiev
eb5703b5d8 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/lib/router.coffee
 2014-06-19 15:24:20 +00:00
Anton Georgiev
af122d2629 work in progress on subscribing a client for the users changes for a single meeting only 2014-06-19 15:19:32 +00:00
perroned
3f93644255 Added server code for calling client function 2014-06-19 07:46:26 -07:00
perroned
529f573d20 Added client function for receiving data from server 2014-06-19 07:45:58 -07:00
Anton Georgiev
67d1a1f947 sending meeting info to the client 2014-06-19 14:27:14 +00:00
perroned
eeb4558f92 Beginning chat system 2014-06-19 06:29:48 -07:00
perroned
49a0b715b7 Re-enabled server's startup code 2014-06-19 06:28:34 -07:00
perroned
79e5ae19a2 Added sample chat data 2014-06-19 06:27:44 -07:00
perroned
f285638184 toggling chat 2014-06-19 06:27:27 -07:00