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

8688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Lucas Zawacki
a54348a908 Use hostname instead of host on javascript webrtc bridge client code 
This prevents it from appending the port number when a request is made from
the HTML5 client
 2014-11-11 16:42:45 -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
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
Anton Georgiev
547788442d Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth 2014-11-04 16:56:25 +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