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

979 Commits

Author SHA1 Message Date
Maxim Khlobystov
fc6321cb18 Prevented the navbar from jumping to the second row in portrait orientation. 2014-12-17 10:14:25 -08:00
perroned
c7e7b8af99 Removed function that isn't used 2014-12-17 09:37:11 -08:00
perroned
3f457de891 Fixed handler for navbar expansion. 2014-12-17 09:14:39 -08:00
perroned
f69c554c87 UI tweaks for chat tabs 2014-12-17 08:38:37 -08:00
Anton Georgiev
20fbcb84b6 cleaning up 2014-12-17 00:29:58 +00:00
Anton Georgiev
d535804071 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2014-12-17 00:22:12 +00:00
Anton Georgiev
5c9335dd69 improver chat sorting by time, welcome message is now per user and comes from the server 2014-12-17 00:20:13 +00:00
Maxim Khlobystov
e71a8f91ba Fixed the issue with missing whiteboard cursor. 2014-12-16 15:27:39 -08:00
Anton Georgiev
5c6fee4333 Merge branch 'meteor-new-ui' of github.com:perroned/bigbluebutton into testing-version-008 2014-12-16 22:38:08 +00:00
perroned
10526b4a46 newline 2014-12-16 10:59:20 -08:00
perroned
f3a48368a7 Some usability improvements making it easier to select chat name or close chat tab 2014-12-16 10:57:42 -08:00
perroned
ebe3cc20b9 Address a small typo. No more needed, fixed properly in translation units. 2014-12-16 10:03:14 -08:00
perroned
546ad2e833 Use welcome message from config file 2014-12-16 08:54:36 -08:00
perroned
3e2393f1bd Added config fields for welcome message 2014-12-16 08:54:02 -08:00
perroned
7c405fa120 Use proper version variable 2014-12-16 08:53:30 -08:00
perroned
42847c20ba Added new fileds in information we pull from config file. 2014-12-16 08:52:52 -08:00
perroned
f52aedaede Added copyright year entry to configuration file 2014-12-16 07:57:33 -08:00
perroned
8a72339f00 Build footer with new ifnormation 2014-12-16 07:55:38 -08:00
perroned
00d73c7142 Retrieve footer info from configuration file 2014-12-16 07:55:11 -08:00
perroned
9156684a5c Better solution for key press 2014-12-16 07:11:23 -08:00
perroned
d885a173ec Allow both return/enter keys to work. Fixed some bugs in adding new lines and sending messages. 2014-12-16 06:43:03 -08:00
Anton Georgiev
71f5e53e92 Merge branch 'meteor-order-users' of github.com:lfzawacki/bigbluebutton into testing-version-008 2014-12-15 22:40:38 +00:00
perroned
3840540783 Using proper BBB audio query. 2014-12-15 13:16:35 -08:00
perroned
ebc8cecb94 More user friendly message when slideshow is loading. 2014-12-15 13:15:42 -08:00
perroned
1f628b255b More appropriate string when meeting is loading. 2014-12-15 13:14:12 -08:00
perroned
0e5f044382 More appropriate string when meeting is loading. 2014-12-15 13:12:36 -08:00
Anton Georgiev
a3d05cf14a Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-008 2014-12-15 21:10:56 +00:00
Maxim Khlobystov
d998b6560a Made the whiteboard scale with its container on closing/opening userlist/whiteboard/chat. 2014-12-15 13:08:09 -08:00
Anton Georgiev
db8a552afa Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-15 20:12:23 +00:00
Maxim Khlobystov
b7b178b37a Got rid of some unnecessary padding below the navbar on collapsing userlist/whiteboard/chat in the mobile version. 2014-12-15 09:06:22 -08:00
Lucas Zawacki
03b56d84ef Order users by time of raise_hand and name 2014-12-12 18:58:54 -02:00
Anton Georgiev
4890131591 (redo) Public did not look selected when it was (when private tabs available) 2014-12-12 16:23:47 +00:00
Anton Georgiev
0ed83d2542 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-ui-less 
Conflicts:
	labs/meteor-client/app/client/stylesheets/landscape/chat.less
	labs/meteor-client/app/client/stylesheets/portrait/chat.less
 2014-12-12 16:23:26 +00:00
Anton Georgiev
e4c696e358 focus on the input box when clicking on a chat tab 2014-12-12 16:20:06 +00:00
Maxim Khlobystov
3d033903b1 Got rid of unnecessary inline CSS. 2014-12-11 18:11:15 -08:00
Maxim Khlobystov
9f8436e71f Fixed the issue with hiding Join Audio Call tooltip on clicking its button. 2014-12-11 16:19:41 -08:00
Anton Georgiev
ef2def0ef5 not needed anymore. the isActiveTab is now fixed 2014-12-11 23:23:44 +00:00
Anton Georgiev
a157ec9b2f open the new tab even before a chat message was sent 2014-12-11 23:21:51 +00:00
Maxim Khlobystov
2b00252a02 Restructured the stylesheets. 2014-12-11 11:35:10 -08:00
Anton Georgiev
4f849c9d0e improve logs, improve flow in rouer.coffee 2014-12-11 17:23:19 +00:00
Anton Georgiev
c41e7aae14 when selecting Public chat, the tab did not look selected 2014-12-11 17:21:44 +00:00
Anton Georgiev
0c032080e1 was causing an error on reload 2014-12-11 17:21:15 +00:00
Anton Georgiev
43555fe1a1 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-11 16:41:57 +00:00
Maxim Khlobystov
8c552f540d Cleaning up. 2014-12-10 18:24:23 -08:00
Maxim Khlobystov
68321387c7 Made Public Chat tab active when page is loaded. 2014-12-10 17:19:08 -08:00
Maxim Khlobystov
0c27d35fce Merged the fix for landscape navbar positioning from branch 'navbar' of https://github.com/OZhurbenko/bigbluebutton. 2014-12-10 14:46:43 -08:00
Maxim Khlobystov
720b817150 Fixed the issue with hiding Expand tooltip. 2014-12-10 14:20:48 -08:00
Maxim Khlobystov
48d5df7ae4 Substitute the right chevron icon by the left chevron. 2014-12-10 14:17:41 -08:00
Maxim Khlobystov
cd5a16d38e Made the text in portrait mode larger. 2014-12-10 14:10:04 -08:00
Maxim Khlobystov
a4bcc69c12 Made the user list, whiteboard and chat always fit the page horizontally. 2014-12-10 13:48:41 -08:00
Anton Georgiev
1fdecb4e1b created an onLoadComplete function. fixed the check for user kicked out 2014-12-10 20:09:17 +00:00
Anton Georgiev
86de11305b improving the callback for cleaning old session vars 2014-12-10 19:31:03 +00:00
Anton Georgiev
1fee2f76a5 clear old session vars before setting new ones 2014-12-10 19:30:14 +00:00
Anton Georgiev
329784697f remove logout page. navigate to logOutUrl instead 2014-12-10 18:56:25 +00:00
Anton Georgiev
bd0cffcdeb improve visibility in logs 2014-12-10 16:24:22 +00:00
Anton Georgiev
5d1fe80482 added an extra case for the user connection status 2014-12-10 16:23:25 +00:00
Anton Georgiev
191d2d68ee Merge branch 'meteor-client-kicked-n-returning' of github.com:gthacoder/bigbluebutton into meteor-client-kicked-n-returning 
Conflicts:
	labs/meteor-client/app/client/main.html
	labs/meteor-client/app/client/views/users/user_list.coffee
	labs/meteor-client/app/server/user_permissions.coffee
 2014-12-10 15:50:08 +00:00
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
Anton Georgiev
26e5749d44 now we won't see 'ghost' users in the html5 client - users that registered but did not join 2014-12-10 00:33:56 +00:00
Anton Georgiev
c6b48e4037 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-007 2014-12-09 22:16:46 +00:00
Anton Georgiev
3150fc5483 in a race condition the user did not have a user.role 2014-12-09 22:10:06 +00: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
7e78e3dcc2 clean up and improve logging 2014-12-09 20:45:20 +00:00
Maxim Khlobystov
35e0090afe Merge branch 'meteor-ui-less' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2014-12-09 10:06:08 -08:00
Maxim Khlobystov
434cfc588c Made navbar responsive. 2014-12-09 10:03:01 -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
Maxim Khlobystov
032cc39c4e Replaced width-related breakpoint by the page orientation info for switching between landscape and portrait stylesheets. 2014-12-08 15:35:25 -08:00
Anton Georgiev
4d34b5f073 Merge branch 'master' of github.com:antobinary/bigbluebutton into testing-version-007 
Conflicts:
	labs/meteor-client/app/client/stylesheets/users.less
 2014-12-08 19:56:44 +00:00
Anton Georgiev
6b16a67e6c the default values for Session vars should be set on main page load 2014-12-05 19:04:46 +00:00
Anton Georgiev
f9dc0fdac1 clean Session var on logout 2014-12-05 18:53:53 +00:00
Anton Georgiev
b30d18cda7 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-05 14:52:32 +00:00
Anton Georgiev
596bacbc09 fixing issue where meetingName was using old value from Session 2014-12-04 21:31:13 +00:00
Maxim Khlobystov
a1682a02fe Put landscape and portrait stylesheets in separate files. 2014-12-04 13:30:52 -08:00
Maxim Khlobystov
1a8aca0315 Added a portrait mode for extra small devices. 2014-12-03 18:06:06 -08: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
Maxim Khlobystov
0a6e8a9b53 Made the size of visible panels fit the whole window on toggling userlist/whiteboard/chat. 2014-12-02 19:20:16 -08:00
Anton Georgiev
171f3dccfc reworked the toggle on/off expanding 2014-12-02 22:52:03 +00:00
Anton Georgiev
c7c35f3ef3 Merge branch 'meteor-client-css-to-less' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-02 18:25:15 +00:00
Maxim Khlobystov
2faa695b71 Made LESS selectors nested. 2014-12-02 08:59:06 -08:00
Anton Georgiev
2073c742b6 could not properly append the width without the ; 2014-12-02 16:23:30 +00:00
Anton Georgiev
3fc167f20a first cut of expanding view on toggle chat/users off 2014-12-01 23:36:03 +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
d892ae5c6c Merge branch 'meteor-client-post-summit-merge' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-01 20:40:43 +00:00
Maxim Khlobystov
b58bfb78c2 Fixed the issue with all the tabs re-displayed on refreshing or receiving a new message regardless of the previous tabs state. 2014-11-30 18:39:33 -08: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
Maxim Khlobystov
767a49de3a Merge branch 'meteor-recover-disconnection' of https://github.com/antobinary/bigbluebutton into meteor-client-post-summit-merge 2014-11-28 10:31:02 -08:00
Maxim Khlobystov
0d7f168cb5 Put hex values into variables. 2014-11-28 10:22:28 -08:00
Anton Georgiev
de36894cee must clear the chat tabs on logout 2014-11-28 16:41:00 +00:00
Anton Georgiev
8e34601ffc simplify the username fetching 2014-11-28 16:40:14 +00:00
Anton Georgiev
8a7ab38956 to_userid is now userid 2014-11-28 16:26:51 +00:00
Maxim Khlobystov
94cde21087 Temporary removed Velocity package. 2014-11-27 17:22:09 -08:00
Anton Georgiev
7cc9e97730 there is no need currently to hide the navbar on logout 2014-11-27 23:28:06 +00:00
Anton Georgiev
d64e324bf8 remove duplicate def of setInSession 2014-11-27 23:25:06 +00:00
Anton Georgiev
cbe31eb4c0 the reconnect button on logout logs you back in the meeting 2014-11-27 23:24:14 +00:00
Anton Georgiev
b1399a8d40 removed dbid 2014-11-27 22:08:33 +00:00
Anton Georgiev
6ba5d39b93 dbid->userid for chat tabs 2014-11-27 22:02:19 +00:00
Anton Georgiev
b3f3147a69 publish chat based on userid, not dbid 2014-11-27 20:30:23 +00:00
Anton Georgiev
3c12be30b5 cleaning up 2014-11-27 00:01:40 +00:00
Anton Georgiev
f5a3c987b1 added a condition. cleaning up 2014-11-26 23:57:39 +00:00
Anton Georgiev
f2760f3ef8 chat with authToken+userid instead of userSecret+dbid 2014-11-26 22:49:21 +00:00
Maxim Khlobystov
a2d868643b Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-post-summit-merge 
Conflicts:
	labs/meteor-client/app/client/globals.coffee
 2014-11-26 11:19:28 -08:00
Maxim Khlobystov
8256f78db1 Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-viewer 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/.meteor/versions
	labs/meteor-client/app/client/main.coffee
	labs/meteor-client/app/client/stylesheets/style.css
 2014-11-24 13:08:44 -08:00
Maxim Khlobystov
075ca4e18c Moved from client-side-only collection for tracking chat tabs to its Session analogue. 2014-11-21 19:26:02 -08:00
Anton Georgiev
1e3daf1252 cleaning up 2014-11-21 22:12:55 +00:00
Anton Georgiev
6af440d219 cleaning up 2014-11-21 20:57:36 +00:00
Anton Georgiev
0e7f9e8bb3 delete the users from the collection on meeting end 2014-11-21 20:51:37 +00:00
Anton Georgiev
fe858d3888 when a user leaves the meeting mark the user as offline instead of removing from the collection 2014-11-21 20:29:07 +00:00
Anton Georgiev
b01e8e5418 cleaning up router.coffee 2014-11-21 18:02:53 +00:00
Anton Georgiev
a544329079 not needed anymore 2014-11-21 17:52:14 +00:00
Anton Georgiev
e7b6a48934 not used anywhere 2014-11-21 17:51:44 +00:00
Anton Georgiev
eb05ad18a5 authToken instead of userSecret 2014-11-21 17:45:44 +00:00
Anton Georgiev
f5bda18c49 authToken instead of userSecret 2014-11-21 17:36:21 +00:00
Anton Georgiev
c0b9ba37ee we no longer use getMyInfo() 2014-11-21 17:35:04 +00:00
Anton Georgiev
624354e246 use userId instead of the changing dbid 2014-11-21 17:28:50 +00:00
Anton Georgiev
a2bbc548f0 setInSession was defined twice 2014-11-21 17:25:42 +00:00
Anton Georgiev
a003365d35 redoing the router with authToken 2014-11-21 17:07:16 +00:00
Anton Georgiev
93f2338dae subscribe using the token 2014-11-21 15:05:03 +00:00
Maxim Khlobystov
9629fcbc9f Customized the Confirm Logout box. 2014-11-20 19:15:29 -08:00
Anton Georgiev
261066c8ae use authToken for subscribing 2014-11-20 23:35:30 +00:00
Anton Georgiev
a504be308c multi is false by default 2014-11-20 22:01:26 +00:00
Anton Georgiev
1a8019edfc removed html reporter 2014-11-20 21:36:18 +00:00
Anton Georgiev
ecacf5010b on regiser user add the user to the collection. on userjoin update the user 2014-11-20 21:32:51 +00:00
Anton Georgiev
81d8fbde08 function whoami to help during development 2014-11-19 23:22:50 +00:00
Anton Georgiev
0616c593f3 function whoami to help during development 2014-11-19 23:21:12 +00:00
Anton Georgiev
a2d739a113 changed isCurrentUser to use userId 2014-11-19 23:20:34 +00:00
Anton Georgiev
4ab88b2a32 added the meetingId when searching for the user 2014-11-19 20:47:37 +00:00
Anton Georgiev
9e628b0282 put the disconnection handling code back in place 2014-11-19 20:14:19 +00:00
Anton Georgiev
a31246c6f9 join audio, leave audio don't need server side assistance at this point 2014-11-18 22:44:52 +00:00
Anton Georgiev
9c4e7f80e2 reworked userLogout, added secret 2014-11-18 22:03:13 +00:00
Anton Georgiev
004b6d40ba we don't need to send user_join_voice_request or user_leave_voice_request. It's automatic 2014-11-18 19:54:46 +00:00
Anton Georgiev
0f61fbed24 reworked [un]muting user so it uses userId and userSecret 2014-11-18 19:35:51 +00:00
Anton Georgiev
45e1eb1ac3 lint of users.coffee 2014-11-18 16:28:00 +00:00
Anton Georgiev
058fa24437 Merge branch 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-working-on-permissions 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/.meteor/versions
 2014-11-18 15:55:29 +00:00
Anton Georgiev
759ee46ca4 removing html-reporter 2014-11-18 15:49:47 +00:00
Anton Georgiev
51f070bccf shortened the message 
(not sure why but we were getting an error with the previous version of the message)
 2014-11-18 15:47:43 +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
a9ebc858c1 the sip library was renamed 2014-11-17 22:02:17 +00:00
Maxim Khlobystov
f1bbcb2a49 Cleaning up. 2014-11-17 13:49:46 -08:00
Maxim Khlobystov
c4b352d87b Made all the Jasmine suites disabled by default. 2014-11-17 13:40:19 -08:00
Maxim Khlobystov
fb1bc92ada Removed a file containing a sample server-side unit test. 2014-11-17 13:31:32 -08:00
Maxim Khlobystov
b5a8fdd172 Removed Velocity HTML reporter. 2014-11-17 13:26:31 -08:00
damaren
7a004601b8 the two files that should have been in the last commit 2014-11-14 18:18:47 -02:00
damaren
690f1a291b added a button in the logout page to redirect the user to the login page 2014-11-14 18:03:45 -02:00
Lucas Zawacki
92584c1cad Merge branch 'merge-with-tests' of https://github.com/antobinary/bigbluebutton into merge-with-tests 2014-11-14 14:31:53 -02:00
Anton Georgiev
9ef7ad5edc using roles and predefined permissions per role for raising/lowering hand 2014-11-14 11:00:55 -05:00