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

9789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksandr Zhurbenko
99f4c51ce7 Rolling back server's IP 2015-03-04 16:47:06 -08:00
Oleksandr Zhurbenko
a2e96394ee Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 
Conflicts:
	labs/meteor-client/app/client/globals.coffee
 2015-03-04 16:42:22 -08:00
Oleksandr Zhurbenko
8aa86c8d79 Cleaning 2015-03-04 16:30:50 -08:00
Anton Georgiev
44429a6bd6 redirect user to HTML5 client if Flash not installed/enabled. Must be attendee (for now) 2015-03-04 23:51:33 +00:00
Oleksandr Zhurbenko
94ada286cd Fixing footer 2015-03-04 14:28:30 -08:00
Fred Dixon
25406d0400 Merge pull request #542 from bigbluebutton/revert-540-revert-536-bbb-lock-settings-fix 
Revert "Revert "Bbb lock settings fix""
 2015-03-04 17:03:37 -05:00
Fred Dixon
cf5ab25ca0 Revert "Revert "Bbb lock settings fix"" 2015-03-04 16:47:35 -05:00
Oleksandr Zhurbenko
deb0f05235 Added default settings to the config file 2015-03-04 13:45:01 -08:00
Oleksandr Zhurbenko
a48b24c8af Set up different default font sizes for mobile/desktop 2015-03-04 13:33:37 -08:00
Fred Dixon
1d6192a934 Merge pull request #541 from gthacoder/meteor-client-toggling-panels 
Modified rules for toggling the userlist/whiteboard/chat in HTML5 client.
 2015-03-04 15:26:48 -05:00
Maxim Khlobystov
e523ab6b3d Prevented user from closing all of the userlist/whiteboard/chat, made it reopen everything on that attempt. 2015-03-04 12:36:10 -05:00
Maxim Khlobystov
d542640768 Made the userlist toggled off by default when user enters the meeting using mobile device in landscape orientation. 2015-03-04 12:35:52 -05:00
Oleksandr Zhurbenko
85199503a7 Changed sizes' dependencies so now they depend on the width of the device 2015-03-04 09:27:35 -08:00
Chad Pilkey
6733a53ea9 Merge pull request #540 from bigbluebutton/revert-536-bbb-lock-settings-fix 
Revert "Bbb lock settings fix"
 2015-03-04 11:50:41 -05:00
Chad Pilkey
34fdfb9f83 Revert "Bbb lock settings fix" 2015-03-04 11:49:13 -05:00
Chad Pilkey
8de57dfc36 Fixed the WhiteboardModule definition in config.xml 2015-03-04 10:43:54 -05:00
Fred Dixon
6e7b1491ef Merge pull request #536 from tdj-br/bbb-lock-settings-fix 
Bbb lock settings fix
 2015-03-03 19:54:43 -05:00
Oleksandr Zhurbenko
90de6c5ae5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2015-03-03 16:16:55 -08:00
Fred Dixon
78bd38cb17 Merge pull request #539 from OZhurbenko/meteor-ui 
Meteor ui
 2015-03-03 19:11:27 -05:00
Oleksandr Zhurbenko
6e0894fc22 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2015-03-03 16:09:53 -08:00
Oleksandr Zhurbenko
100ea561f1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 
Conflicts:
	labs/meteor-client/app/lib/router.coffee
 2015-03-03 16:03:24 -08:00
Oleksandr Zhurbenko
acdfaeed22 Improved Chat 2015-03-03 15:38:19 -08:00
Fred Dixon
630209330e Merge pull request #538 from gthacoder/meteor-client-landscape 
Updates for HTML5 client's landscape view.
 2015-03-03 16:27:07 -05:00
Oleksandr Zhurbenko
e18369936f Fixed Chat tab sizes 2015-03-03 13:26:50 -08:00
Fred Dixon
cff0759f2f Merge pull request #537 from antobinary/failed-signin-stays-out 
html5client: Slow connection caused users to be refused access but also to be added to the userlist
 2015-03-03 16:26:49 -05:00
Anton Georgiev
b1b8eca6e6 rearranged the permissions so that even unvalidated users should be allowed to logoutSelf as long as authenticated 
Conflicts:
	labs/meteor-client/app/lib/router.coffee
 2015-03-03 19:41:30 +00:00
Maxim Khlobystov
2809396ab2 Made the userlist and chat scrollable when needed. 2015-03-03 14:40:07 -05:00
Maxim Khlobystov
0371752a84 Made sure the footer never covers the rest of the page in landscape orientation. 2015-03-03 14:39:40 -05:00
Maxim Khlobystov
59e1d72d81 Made sure the sliding menu buttons only exist on mobile devices in portrait orientation. 2015-03-03 14:39:22 -05:00
Maxim Khlobystov
10ff076629 Updated the Handlebars handler for the portrait mobile media query. 2015-03-03 14:39:05 -05:00
Chad Pilkey
7314f8f607 Merge pull request #535 from antobinary/nginx-stuff 
Nginx config and avoid :3000
 2015-03-03 12:47:20 -05:00
Oleksandr Zhurbenko
a785b6ad54 Some cleaning, textbox fixed in a mobile view, changed buttons and fonts in a mobile view 2015-03-03 08:36:15 -08:00
Tiago Daniel Jacobs
9d53c765fa Redoing the changes to PhoneButton due to conflict on merge 2015-03-03 07:04:47 +00:00
Tiago Daniel Jacobs
34e2e48be2 Merging 2015-03-03 06:52:56 +00:00
Tiago Daniel Jacobs
cc9fdc1a9e Fixed layouts combo state when presenter mode is turned on/off 2015-03-03 06:34:56 +00:00
Tiago Daniel Jacobs
0033e36384 Fixed state of webcam button when leaving presenter state 2015-03-03 06:34:10 +00:00
Tiago Daniel Jacobs
3060b2ea7d Implemented method to check if lock is in use or not, refactored to use it in entire code. 2015-03-03 05:01:58 +00:00
Tiago Daniel Jacobs
647c0a83bc Code clean up and fixes to lock settings 2015-03-03 04:49:56 +00:00
Tiago Daniel Jacobs
95cf0167f2 Restored ability to lock/unlock individual users 2015-03-03 00:44:34 +00:00
Anton Georgiev
5b6573bb0c root_url can be localhost based 2015-03-03 00:42:11 +00:00
Anton Georgiev
38c10aa627 cleaning up 2015-03-03 00:06:14 +00:00
Anton Georgiev
79c419a790 url is adjusted to the new format for passing the params 2015-03-02 23:36:19 +00:00
Anton Georgiev
c9d48fe2f0 reworked router so that the params are hidden from url on connect 2015-03-02 23:07:10 +00:00
Oleksandr Zhurbenko
a2d78a59cb Changed fonts in Chat tab 2015-03-02 13:25:44 -08:00
Anton Georgiev
84530e7958 clear ip 2015-03-02 21:14:01 +00:00
Anton Georgiev
e4aa3fe6bd bbb demo redirects to /html5client instead of to :3000 2015-03-02 21:13:40 +00:00
Oleksandr Zhurbenko
70eb511c0e Cleaning 2015-03-02 12:30:35 -08:00
Tiago Daniel Jacobs
7cd5fff1d6 Fixed display of the lock on join flag 2015-03-02 19:25:26 +00:00
Tiago Daniel Jacobs
bf62dd66a2 Fixed mute on start, added lock on join option 2015-03-02 18:06:09 +00:00
Anton Georgiev
ff91a3aea3 Merge branch 'nginx-stuff' of github.com:antobinary/bigbluebutton into nginx-stuff 2015-03-02 17:15:11 +00:00