Maxim Khlobystov
|
fd9d9b02d6
|
Trying to wait for the moment when the user is kicked out more effectively.
|
2014-12-09 18:46:49 -08:00 |
|
Maxim Khlobystov
|
da0cb724a9
|
Merge branch 'testing-version-007' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui
|
2014-12-09 14:01:26 -08:00 |
|
Anton Georgiev
|
5f93fdc2f2
|
if the user is not in the meeting (kicked out) redirect to 'logout'
|
2014-12-09 17:06:28 +00:00 |
|
Anton Georgiev
|
9eeee1823d
|
Tyler's changes on UI
|
2014-12-09 00:22:09 +00:00 |
|
Anton Georgiev
|
00e860d794
|
Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-007
Conflicts:
labs/meteor-client/app/.meteor/packages
labs/meteor-client/app/client/views/users/user_item.html
|
2014-12-03 21:10:51 +00:00 |
|
Anton Georgiev
|
4c79a29c87
|
remove 'userNameEntry'
|
2014-12-01 20:59:39 +00:00 |
|
Anton Georgiev
|
4cecd51380
|
lint
|
2014-12-01 20:49:20 +00:00 |
|
Anton Georgiev
|
816a70f3bd
|
Merge branch 'meteor-ui-less' of github.com:antobinary/bigbluebutton into testing-version-007
Conflicts:
labs/meteor-client/app/.meteor/packages
labs/meteor-client/app/.meteor/versions
labs/meteor-client/app/client/stylesheets/users.less
labs/meteor-client/app/client/views/users/user_item.html
|
2014-11-28 23:44:32 +00:00 |
|
Anton Georgiev
|
4c32795b10
|
removing the table in users list
|
2014-11-28 23:39:02 +00:00 |
|
Anton Georgiev
|
9a2618ed35
|
style should be in the .less
|
2014-11-28 21:56:27 +00:00 |
|
Anton Georgiev
|
f5bda18c49
|
authToken instead of userSecret
|
2014-11-21 17:36:21 +00:00 |
|
Anton Georgiev
|
624354e246
|
use userId instead of the changing dbid
|
2014-11-21 17:28:50 +00:00 |
|
Anton Georgiev
|
a2d739a113
|
changed isCurrentUser to use userId
|
2014-11-19 23:20:34 +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
|
c275778b19
|
using the userSecret to control the permissions for raise/lower hand
|
2014-11-13 15:04:51 -05:00 |
|
perroned
|
e4eae36c38
|
Cleaned code. Fixed extra conversation positioning.
|
2014-11-06 07:27:43 -08:00 |
|
Maxim Khlobystov
|
461ae08280
|
Added the ability to distinguish between moderator and attendee.
|
2014-10-27 19:19:56 -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 |
|
Anton Georgiev
|
61da2885a9
|
fixes for isCurrentUserTalking
|
2014-10-14 22:38:15 +00:00 |
|
Anton Georgiev
|
b1818b9258
|
update for ListenOnly
|
2014-10-14 20:23:06 +00:00 |
|
Anton Georgiev
|
e0ac793255
|
update the talking check
|
2014-10-14 16:55:39 +00:00 |
|
perroned
|
b043b194b1
|
Removing presenter functionality from this viewer branch.
|
2014-10-14 08:51:08 -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
|
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
|
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 |
|
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 |
|