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

9369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
7ff2a05a73 clear session vars before redirecting 2015-02-06 16:55:46 +00:00
Anton Georgiev
08e0ada372 Merge branch 'whiteboard-modifications' of https://github.com/OZhurbenko/bigbluebutton into chat-quotes 2015-02-05 20:07:13 +00:00
Anton Georgiev
6e39140ab3 if unauthorized user attempts to subscribe, throw an error which will cause the user to be redirected to the login page 2015-02-05 19:58:39 +00:00
Oleksandr Zhurbenko
ef9d59dfb2 Added vertical centering, added Flexbox support for all browsers, cleared a console 2015-02-04 19:30:32 -08:00
Oleksandr Zhurbenko
f1129d88fb Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into whiteboard-modifications 2015-02-03 13:37:58 -08:00
Anton Georgiev
2e1ff49048 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into chat-quotes 2015-02-03 15:35:07 +00:00
Anton Georgiev
ee4db621fc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into chat-quotes 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
 2015-02-03 15:28:35 +00:00
Anton Georgiev
dced2a0902 allowing " and \ chars in the chat strings from the HTML5 client 2015-02-02 23:33:17 +00:00
Fred Dixon
078f4f1dae Merge pull request #504 from bigbluebutton/fix-how-we-use-sessionid-to-identify-user 
Fix how we use sessionid to identify user
 2015-02-02 17:56:18 -05:00
Richard Alam
d2a2b4b5db - use the new userid information to identify the red5 connection 2015-02-02 19:40:25 +00:00
Richard Alam
b91b7087c5 - treat authToken and userid differently. Before, userid and authtoken had the same values. 2015-02-02 19:38:18 +00:00
Richard Alam
fd061d82d1 - use the userid instead of having sessionid as the sessionid is just a duplicate info 2015-02-02 19:37:00 +00:00
Richard Alam
f17ae89b6f - remove duplicate register user as we now only process the register user message from bbb-web not from the client 2015-02-02 19:35:50 +00:00
Richard Alam
e2eea34830 - fix exception that broke sharing of webcam 2015-02-02 19:34:26 +00:00
Maxim Khlobystov
b9f6dbd646 Added some padding space between the slide and the whiteboard bottom border. 2015-02-02 08:34:37 -08:00
Maxim Khlobystov
9a2c10b7a8 Revert "add slide spacing on startup" 
This reverts commit 580d84c9fa.

Conflicts:
	labs/meteor-client/app/client/views/whiteboard/whiteboard.coffee
 2015-02-02 08:10:40 -08:00
Maxim Khlobystov
b27186c7c2 Revert "add bottom border for whiteboard slide when resizing" 
This reverts commit 06c4c71d18.

Conflicts:
	labs/meteor-client/app/client/views/whiteboard/whiteboard.coffee
 2015-02-02 08:05:29 -08:00
Richard Alam
98c9868bb3 - try to fix usr joining sequence 2015-01-31 09:39:43 -08:00
Maxim Khlobystov
aeabd91f6b Added Jasmine package and one of its dependencies. 2015-01-30 16:22:12 -08:00
Richard Alam
a900eed3ce - start modifying messages to use sessionid to identify user 2015-01-30 23:01:48 +00:00
Anton Georgiev
bd2ea9c711 unnecessary code repetition 2015-01-30 22:41:28 +00:00
Anton Georgiev
1f7b751ee6 user join was not triggering for html5 client users. using the token instead of userID to find the user 2015-01-30 22:12:31 +00:00
Anton Georgiev
f8675a72f4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into chat-quotes 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-01-30 17:37:54 +00:00
Anton Georgiev
3f867f205f Merge branch 'testing-version' of https://github.com/OZhurbenko/bigbluebutton into chat-quotes 2015-01-30 17:35:10 +00:00
Anton Georgiev
d83935c08e Merge branch 'new-branch' of github.com:perroned/bigbluebutton into chat-quotes 2015-01-30 17:33:21 +00:00
Anton Georgiev
c36e71c9cc fix some log strings 2015-01-30 17:31:08 +00:00
Richard Alam
63d586bf77 Merge pull request #502 from capilkey/090-accessibility-fixes 
First pass of accessibility fixes for 0.9.0
 2015-01-30 11:11:10 -05:00
Chad Pilkey
672348eafe labelling and tab order fixes for accessiblity 2015-01-30 08:03:36 -08:00
Richard Alam
555d6436e9 Merge pull request #501 from kepstin/ser-repair 
bbb-record: also delete the sanity '.fail' file on --rebuild
 2015-01-30 10:24:34 -05:00
Calvin Walton
e30ccd0983 bbb-record: also delete the sanity '.fail' file on rebuild 
This allows a rebuild to redo the sanity check if needed.
 2015-01-30 10:21:09 -05:00
Richard Alam
86a7dada71 Merge pull request #500 from kepstin/ser-repair 
Skip the 'ser' repair if there are no webcam videos
 2015-01-30 10:19:13 -05:00
Calvin Walton
c90e5f8990 Skip the 'ser' repair if there are no webcam videos 
This was causing the sanity check to fail.
 2015-01-30 10:11:44 -05:00
perroned
fe6ae739c2 Prevent close tab button from being hidden 2015-01-30 07:06:24 -08:00
Chad Pilkey
364178857e reapplied the global shortcut keys 2015-01-29 10:03:13 -08:00
Chad Pilkey
69b250bea6 fixed the loading of the slide text 2015-01-29 10:02:12 -08:00
perroned
919321d793 Prevent row from dropping by a few pixels when hovering a private tab 2015-01-29 09:53:31 -08:00
Oleksandr Zhurbenko
78bf4818ba Added text wrapping to whiteboard 2015-01-29 09:52:04 -08:00
perroned
c969d75730 Move notification class to parent tab element 2015-01-29 09:24:59 -08:00
perroned
46efa8cfa0 Fixing chat tabs dropping to a new line. 2015-01-29 08:59:32 -08:00
Chad Pilkey
a03a1736e3 Merge pull request #499 from bigbluebutton/fix-presentation-text-file-url 
- fix the presentation text file url
 2015-01-28 16:53:56 -05:00
Richard Alam
332c252b92 - fix the presentation text file url 2015-01-28 21:52:17 +00:00
Maxim Khlobystov
db9f9c7082 Fixed the whiteboard height on startup in portrait orientation. 2015-01-28 13:47:48 -08:00
Fred Dixon
29f237db3d Merge pull request #498 from capilkey/fix-issue-1871 
Fix issue 1871
 2015-01-27 18:43:33 -05:00
Chad Pilkey
9580a9c350 removed forceListenOnly option from the PhoneModule, use presenterShareOnly instead 2015-01-27 15:27:41 -08:00
Chad Pilkey
ef21d9a22e changed the java help delay from 3 to 7 seconds 2015-01-27 15:26:37 -08:00
Fred Dixon
aec62628f5 Merge pull request #497 from SenecaCDOT-BigBlueButton/fix-java-revert 
Revert "Revert "Added Java check to the configuration notifications""
 2015-01-27 17:35:12 -05:00
Chad Pilkey
19fb9b9671 Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-01-27 14:19:02 -08:00
Fred Dixon
e3124e5b1f Merge pull request #496 from bigbluebutton/revert-490-client-pre-check 
Revert "Added Java check to the configuration notifications"
 2015-01-27 17:12:16 -05:00
Fred Dixon
82545a03f3 Revert "Added Java check to the configuration notifications" 2015-01-27 17:11:54 -05:00
Fred Dixon
57d82e3eb9 Merge pull request #490 from SenecaCDOT-BigBlueButton/client-pre-check 
Added Java check to the configuration notifications
 2015-01-27 17:11:36 -05:00