Commit Graph

22 Commits

Author SHA1 Message Date
Anton Georgiev
759ee46ca4 removing html-reporter 2014-11-18 15:49:47 +00: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
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
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
Lucas Zawacki
da1558c100 Include sipjs libraries from bbb client 2014-11-11 16:56:39 -02:00
Anton Georgiev
bc812c88e3 client side notification when disconnected/reconnecting 2014-10-30 15:00:45 +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
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
e66ba89cd2 switch to nemo64:bootstrap 2014-10-21 19:15:35 +00: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
Anton Georgiev
7b11ece002 remove extra raphael module 2014-10-16 18:07:11 +00:00
Anton Georgiev
06f13ea7cb update Meteor from 0.8.x to 0.9.4 2014-10-15 22:24:30 +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