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

9355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
49d99b17b4 Merge pull request #466 from ffdixon/master 
added support for utf-8 characters in submit form on index.html
 2014-12-14 15:53:33 -05:00
Fred Dixon
eeebed20f1 added support for utf-8 characters in submit form on index.html 2014-12-14 15:53:00 -05:00
Felipe Cecagno
d712b886a3 Merge branch 'multinotes' of github.com:mconf/bigbluebutton into 090-multinotes 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesRoom.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesRoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesService.java
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/managers/SharedNotesConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMap.mxml
 2014-12-12 19:40:52 -02:00
Lucas Zawacki
03b56d84ef Order users by time of raise_hand and name 2014-12-12 18:58:54 -02:00
Felipe Cecagno
befe30bcfb cleanup 2014-12-12 14:56:25 -02:00
Felipe Cecagno
9832eab463 reduced the dependency between the layouts module and the shared notes module 2014-12-12 14:52:09 -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
Richard Alam
7189deaed7 Merge pull request #465 from bigbluebutton/change-how-logs-roll-for-bbb-web 
- change logging for bbb-web to rollover at midnight and add date to th...
 2014-12-11 17:14:04 -05:00
Richard Alam
1b4c4f5f5e - change logging for bbb-web to rollover at midnight and add date to the filename 2014-12-11 22:07:22 +00:00
Richard Alam
3aef6be806 Merge pull request #464 from SenecaCDOT-BigBlueButton/add-chat-fontsize-config 
font size in config, and two bugs with private chat squashed
 2014-12-11 16:36:36 -05:00
Chad Pilkey
8b7d0ddb24 font size in config, and two bugs with private chat squashed 2014-12-11 13:16:38 -08: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
Pedro Beschorner Marin
0b883d5392 Refactored apps new multinotes service 2014-12-11 14:35:48 -02:00
Pedro Beschorner Marin
d414d98bd9 More cleanup 2014-12-11 14:35:41 -02:00
Pedro Beschorner Marin
ac0a76872b Some cleanup 2014-12-11 14:35:33 -02:00
Pedro Beschorner Marin
7cdfa399ea Getting the number of shared notes from layout 2014-12-11 14:35:23 -02:00
Pedro Beschorner Marin
128c3b19bd Automatically creating shared notes 2014-12-11 14:35:16 -02:00
Pedro Beschorner Marin
9b4bafb8bf Refactored the notes counter index control so removed ones can come back 2014-12-11 14:35:06 -02:00
Pedro Beschorner Marin
bd1a90090c Initial saving of the additional notes in the layout 2014-12-11 14:34:51 -02: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
Fred Dixon
b8f3f14725 Merge pull request #463 from SenecaCDOT-BigBlueButton/maybefix-chat-list-overflow 
taking another shot at fixing the chat list stack overflow
 2014-12-10 19:42:35 -05:00
Chad Pilkey
716d1f974b taking another shot at fixing the chat list stack overflow 2014-12-10 16:40:38 -08:00
Anton Georgiev
f3f80b41eb Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-008 2014-12-10 22:49:50 +00: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
Anton Georgiev
ccd6cbef9f Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-008 2014-12-10 22:27:29 +00: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
Fred Dixon
11f0b4fa9f Merge pull request #462 from SenecaCDOT-BigBlueButton/fix-layoutcombo-rows 
Reworked the layout pushing so that viewers don't get new rows
 2014-12-10 15:11:45 -05: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
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