BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,291 Commits 13 Branches 260 Tags 1.1 GiB
366bb23c78
Commit Graph

993 Commits

Author SHA1 Message Date
Anton Georgiev
058fa24437 Merge branch 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-working-on-permissions 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/.meteor/versions
 2014-11-18 15:55:29 +00:00
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
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
Anton Georgiev
9ef7ad5edc using roles and predefined permissions per role for raising/lowering hand 2014-11-14 11:00:55 -05: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
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
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
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
Anton Georgiev
ffab06751c we have the .coffee now 2014-11-12 09:58:24 -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
Lucas Zawacki
ca8133070b Write parts of the client using the BBB api bridge methods 2014-11-12 11:30:34 -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
Anton Georgiev
0fe03afa28 on / updates the dbid 2014-11-12 07:53:36 -05:00
Maxim Khlobystov
68d1f4aea6 Added more unit tests to cover shapes.coffee. 2014-11-11 18:28:13 -08: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
Lucas Zawacki
da1558c100 Include sipjs libraries from bbb client 2014-11-11 16:56:39 -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
Fernando Bottin
7719fa2002 Added specs to test addPresentationToCollection() and remotePresentationToCollection(). 2014-11-11 12:16:13 -02:00
Anton Georgiev
f561ba0eb8 this is where we should handle validate_auth_token_reply 2014-11-11 08:38:39 -05:00
Anton Georgiev
fc2f560b7a simplified version to work with (no disconnection handling code) 2014-11-11 07:18:07 -05: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
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
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
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
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
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
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
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
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
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
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
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
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