BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,602 Commits 13 Branches 260 Tags 1.1 GiB
384fdb3e16
Commit Graph

1053 Commits

Author SHA1 Message Date
Richard Alam
14327a1edf Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch 2018-06-19 12:58:51 -07:00
Chad Pilkey
3a40cf169d make the file upload check for ff60 more explicit 2018-06-15 15:01:17 -07:00
Ghazi Triki
718d65f30b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into recording-message 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml
 2018-06-11 18:33:27 +01:00
Richard Alam
f7f291e70e Merge branch 'global-exception-catcher' of https://github.com/riadvice/bigbluebutton into riadvice-global-exception-catcher 2018-06-11 08:52:08 -07:00
Ghazi Triki
fd91ed72e1 Fixed locale typo. 2018-06-11 11:29:24 +01:00
Richard Alam
dc62b89691 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:49:13 -07:00
Richard Alam
83ac942452 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:23:49 -07:00
Ghazi Triki
4fdc77f2a5 Make sytle consistent for popups and buttons. 2018-06-09 00:07:37 +01:00
Ghazi Triki
337c260bcf Globally catch any unhandled exception. 2018-06-07 18:11:38 +01:00
Chad Pilkey
13da7042b3 add option to save user names to a file to gear button 2018-06-06 16:17:57 -07:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
Chad Pilkey
1001cc1ecd
Merge pull request #5638 from capilkey/show-individual-votes 
Improve the PollResultsModal spacing and sort
 2018-06-04 19:13:16 -04:00
Chad Pilkey
6f1884ed1c update PollResultsModal spacing and grid header text 2018-06-04 12:37:53 -07:00
Fred Dixon
1668b60069
Merge pull request #5628 from capilkey/show-individual-votes 
Add a table showing individual votes in the PollResultsModal
 2018-06-02 08:00:53 -04:00
Chad Pilkey
f7a5f675b6 add a table showing individual votes in the PollResultsModal 2018-06-01 16:06:49 -07:00
Ghazi Triki
78681bf9b2 Added new unread message ribbon to chat. 2018-05-30 16:59:10 +01:00
Ghazi Triki
db112d23d8 Added toaster for start and stop recording only for moderator. 2018-05-29 16:00:10 +01:00
Ghazi Triki
6e336fa36d Added "Resume Recording" title to RecordWindow. 2018-05-29 15:14:17 +01:00
Ghazi Triki
a39081afb3 Use toast notification at some application events. 2018-05-29 11:28:31 +01:00
Richard Alam
39558cd805 Merge branch 'recording-timer' of https://github.com/riadvice/bigbluebutton into riadvice-recording-timer 2018-05-23 10:11:09 -07:00
Chad Pilkey
f2025b658b temporarily disable uploading on Win FF60+ 2018-05-19 18:16:42 -07:00
Ghazi Triki
634635c8cd Update recording confirmation window and add recording timer (Work In Progress) 2018-05-18 15:58:08 +01:00
Chad Pilkey
8fc80492b6 redesign of screenshare select with win10 chrome warning 2018-05-16 20:01:34 -07:00
Fred Dixon
082792c720
Merge pull request #5503 from riadvice/choose-breakout-room 
Improve BreakoutRoomSettings layout and free-join behaviour.
 2018-05-09 19:41:22 -04:00
Ghazi Triki
72bbc49e60 Improve BreakoutRoomSettings layout and free-join behaviour. 2018-05-09 22:52:37 +01:00
Chad Pilkey
679cbbffc9 remove unused loading state from webrtc publish win 2018-05-09 14:33:23 -07:00
Chad Pilkey
a4695c6688 update screenshare select window to match #5463 2018-05-09 13:56:59 -07:00
Fred Dixon
70c31c1a50
Merge pull request #5475 from riadvice/choose-breakout-room 
Add new feature to breakout rooms that allows to freely join them
 2018-05-08 11:06:55 -04:00
Ghazi Triki
a75173fd90 Locale typo fix. 2018-05-08 08:56:28 +01:00
Richard Alam
1be8ba7f98 - update locales to latest 2018-05-07 08:36:50 -07:00
Ghazi Triki
54ae79d533 Add new feature to breakout rooms that allows to freely join them. 2018-05-07 16:03:53 +01:00
Chad Pilkey
cb8878d078 show callout when user doesn't join audio 2018-05-04 16:25:31 -07:00
Chad Pilkey
cb74bf51ad add a selection popup for screenshare publish type 2018-04-26 09:52:19 -07:00
Richard Alam
483f057b8e - update locales 2018-04-10 07:32:44 -07:00
Richard Alam
d8976e3f79 - handle user inacitivity audit message on the client 2018-04-09 12:22:58 -07:00
Richard Alam
39284f1d18 - start implementing user inactivity timer 2018-04-06 14:52:21 -07:00
Richard Alam
e6fb4d886d - update locales 2018-03-15 17:59:57 -07:00
Fred Dixon
f311422069 Remove 1935 from firewall message 2018-02-06 13:50:43 -06:00
Richard Alam
962b520d6a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-29 12:53:20 -08:00
Fred Dixon
036a23cfb1 Updated copyright date 2018-01-28 13:33:18 -05:00
Fred Dixon
189c05001e Adjusting the wording in Lock Settings dialog 2018-01-28 13:06:58 -05:00
Fred Dixon
728c71c327 Minor tweek in wording for Polling dialog 2018-01-28 12:17:16 -05:00
Ghazi Triki
a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
#	bigbluebutton-client/branding/default/style/css/V2Theme.css
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
#	bigbluebutton-html5/private/config/development/server/log.yaml
 2018-01-23 12:27:42 +01:00
Richard Alam
a22fca4931 - update locales to jan 22, 2018 2018-01-22 07:45:09 -08:00
Ghazi Triki
e2f5fad58d Update flash client German localisation file. 2018-01-21 15:57:45 +01:00
Ghazi Triki
307f12448a Add new hint box to LockSettings and update style. 2018-01-20 18:33:02 +01:00
Fred Dixon
6c36f8dc00 Tweeked feedback dialog 2018-01-17 12:42:17 -06:00
Ghazi Triki
cf92e1aeef Implemented "user rating feedback on logout" feature. 2018-01-16 20:37:05 +01:00
Ghazi Triki
38ab186b53 Change webcamsOnlyForModerator property and handle saving it in server and client. 2018-01-07 16:45:24 +01:00
Richard Alam
d43527d8aa Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-21 13:36:27 -08:00