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

759 Commits

Author SHA1 Message Date
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