Commit Graph

9178 Commits

Author SHA1 Message Date
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
Chad Pilkey
2b78ed2c09 reworked the layout pushing so that viewers don't get new rows 2014-12-10 11:17:33 -08:00
Anton Georgiev
329784697f remove logout page. navigate to logOutUrl instead 2014-12-10 18:56:25 +00:00
Jesus Federico
821d4cbe01 Merge pull request #461 from jfederico/master
bbb-lti: Fixed issue that prevented https to work on nginx/tomcat
2014-12-10 11:34:03 -05:00
Jesus Federico
3f882b112e bbb-lti: Fixed issue that prevented https to work on nginx/tomcat 2014-12-10 11:31:38 -05: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
Fred Dixon
52c7aceb2b Merge pull request #460 from kepstin/recording-presentation-links
recording: Strip out the 'event:' from the beginning of urls in chat
2014-12-08 16:50:36 -05:00
Richard Alam
2cd918145c Merge pull request #459 from SenecaCDOT-BigBlueButton/reinforce-chat-scrolling
Reinforce chat scrolling
2014-12-08 16:19:47 -05:00
Chad Pilkey
0a1c74ce07 Merge remote-tracking branch 'upstream/master' into add-chat-fontsize-config
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
2014-12-08 13:11:34 -08:00
Chad Pilkey
c96e78d829 chat scrolling should be more robust and not rely on events firing 2014-12-08 13:07:40 -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
Calvin Walton
65bb9ce47e recording: Strip out the 'event:' from the beginning of urls in chat 2014-12-08 11:43:26 -05:00
Fred Dixon
b895316bad Merge pull request #458 from bigbluebutton/upload-transifex-locales
- update locales from transifex
2014-12-05 14:08:13 -05:00
Richard Alam
5667ea4156 - update locales from transifex 2014-12-05 11:05:42 -08: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
Richard Alam
3e4f2d930a Merge pull request #457 from SenecaCDOT-BigBlueButton/fix-chat-scrolling
Rewrote chat scrolling so that it always scrolls as far down as possible
2014-12-04 17:46:28 -05:00
Chad Pilkey
f12ac62a47 rewrote chat scrolling so that it always scrolls as far down as possible 2014-12-04 14:39:21 -08: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
Richard Alam
878c81d04b Merge pull request #456 from mconf/fix-client-warnings
Handle mxmlc warnings
2014-12-03 15:18:47 -05:00
Richard Alam
99c88fcc30 Merge pull request #455 from bigbluebutton/fix-issue-1830
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=18...
2014-12-03 15:18:32 -05:00
Felipe Cecagno
afdf4d5f4f few tweaks to handle the warnings during the compilation of bigbluebutton-client 2014-12-03 16:57:39 -02: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
Richard Alam
0b1678cfd1 - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1830 2014-12-02 10:54:21 -08: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
Richard Alam
d300b52fba Merge pull request #454 from SenecaCDOT-BigBlueButton/fix-presentation-mouseup
Moved the whiteboard mouseup listener to the stage
2014-12-01 18:25:18 -05: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