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
|
3cd0625424
|
Merge pull request #5007 from ritzalam/investigate-rtmps
support rtmps
|
2018-01-22 21:30:33 -05:00 |
|
Fred Dixon
|
13dc23b68a
|
Merge pull request #5008 from ritzalam/update-locales-jan-22-2018
- update locales to jan 22, 2018
|
2018-01-22 10:48:21 -05:00 |
|
Richard Alam
|
a22fca4931
|
- update locales to jan 22, 2018
|
2018-01-22 07:45:09 -08:00 |
|
Fred Dixon
|
e62899818e
|
Merge pull request #5006 from riadvice/2.0-ui-fixes
Update lock settings title width
|
2018-01-22 09:44:12 -05:00 |
|
Ghazi Triki
|
bbed266239
|
Update lock settings title width.
|
2018-01-22 15:30:12 +01:00 |
|
Fred Dixon
|
87802e6a9c
|
Merge pull request #5004 from riadvice/german-translation
Update flash client German localisation file from transifex
|
2018-01-21 09:59:22 -05:00 |
|
Ghazi Triki
|
e2f5fad58d
|
Update flash client German localisation file.
|
2018-01-21 15:57:45 +01:00 |
|
Fred Dixon
|
96f3cd67d0
|
Merge pull request #5002 from riadvice/webcams-only-for-moderator-on-off
Improve webcams only for moderator
|
2018-01-21 08:34:39 -05:00 |
|
Ghazi Triki
|
4238b12453
|
Switch lock settings "disable webcams" and "webcam only for moderators" states, only one of them can be enabled at the same time.
|
2018-01-21 08:46:24 +01:00 |
|
Ghazi Triki
|
ff7cf434b1
|
Improve camera control and display when webcamsOnlyForModerator is enabled.
|
2018-01-20 21:11:23 +01:00 |
|
Ghazi Triki
|
307f12448a
|
Add new hint box to LockSettings and update style.
|
2018-01-20 18:33:02 +01:00 |
|
Ghazi Triki
|
d6294c84a4
|
Fix function name typo.
|
2018-01-20 16:36:54 +01:00 |
|
Fred Dixon
|
44c780ed05
|
Merge pull request #5000 from riadvice/fix-webcam-regex
Fix flash stream regex
|
2018-01-20 09:04:36 -05:00 |
|
Ghazi Triki
|
5227217e85
|
Fix the regex that checks the Flash stream id by adding the option "-recorded" to the pattern, making sure recorded streams are matched too.
|
2018-01-20 09:34:11 +01:00 |
|
Richard Alam
|
6ea49e05aa
|
- add protocol for bwmon and port test
|
2018-01-19 14:30:49 -08:00 |
|
Maxim Khlobystov
|
1eddc2f408
|
Merge pull request #4971 from OZhurbenko/fix-issue-4954
Aligned the dropdown's close button on small screens
|
2018-01-19 16:08:35 -05:00 |
|
Richard Alam
|
11d226db2a
|
- clean up logging
|
2018-01-19 13:07:48 -08:00 |
|
Anton Georgiev
|
3159973533
|
Merge pull request #4961 from KDSBrowne/z.0.3-transifex-blank-locale
Make transifex.sh ignore locales with no translated strings
|
2018-01-19 18:54:19 -02:00 |
|
KDSBrowne
|
243272ad66
|
Change /transifex to /transifex.sh
|
2018-01-19 15:44:25 -05:00 |
|
Anton Georgiev
|
76af81d8d7
|
Merge pull request #4821 from jfsiebel/whiteboard-toolbar-locale
Whiteboard toolbar locale
|
2018-01-19 18:24:24 -02:00 |
|
Richard Alam
|
e789d1440d
|
- determine screenshare connection type
|
2018-01-19 12:16:47 -08:00 |
|
Joao Siebel
|
a42d88250e
|
Resolve merge conflict in english locales file
|
2018-01-19 17:43:11 -02:00 |
|
Richard Alam
|
9d660bb4b5
|
- determine video connection type
|
2018-01-19 08:47:21 -08:00 |
|
Richard Alam
|
ff85a724bb
|
- determine bbb-apps connection type
|
2018-01-19 08:46:34 -08:00 |
|
Richard Alam
|
0fc8df84c2
|
- determine voice connection type
|
2018-01-19 08:45:27 -08:00 |
|
Richard Alam
|
3ea109aa25
|
- port test connection
|
2018-01-19 08:45:01 -08:00 |
|
Richard Alam
|
6402966fb5
|
- determine port test connection type
|
2018-01-19 08:44:10 -08:00 |
|
Richard Alam
|
b20828a8cd
|
- bw mon determine connection type
|
2018-01-19 08:38:55 -08:00 |
|
Richard Alam
|
802f945b2a
|
- add bw mon options and some string constants
|
2018-01-19 08:35:39 -08:00 |
|
Richard Alam
|
ce57e58393
|
- add exception logging on jws
|
2018-01-19 08:34:49 -08:00 |
|
Anton Georgiev
|
9b16ae8d51
|
Merge pull request #4938 from KDSBrowne/z.0.1-mobile-btn-alignmet
Fix alignment of ActionsBar buttons for small screens
|
2018-01-18 16:34:27 -02:00 |
|
Anton Georgiev
|
9c101b73f2
|
Merge pull request #4976 from gutobenn/4955-changes
Adjusts on screenshare button and requested changes
|
2018-01-18 16:33:49 -02:00 |
|
KDSBrowne
|
745f79ba51
|
make breakpoint range start from 0em
|
2018-01-18 09:41:52 -08:00 |
|
Anton Georgiev
|
7ee95e3132
|
Merge pull request #4967 from OZhurbenko/fix-issue-4900
An attempt to fix race condition on resource loading
|
2018-01-18 13:20:41 -02:00 |
|
Fred Dixon
|
e37e635a70
|
Merge pull request #4984 from riadvice/chat-messages-style
Display moderator icon next to his name in chat messages
|
2018-01-17 23:37:20 -05:00 |
|
Anton Georgiev
|
f76b08f281
|
Merge pull request #4985 from antobinary/change-copyright
Change copyright year in HTML5 client to 2018
|
2018-01-17 20:40:38 -02:00 |
|
Augusto Bennemann
|
975525fe9b
|
Fix keys usage on actions-dropdown
|
2018-01-17 19:51:33 -02:00 |
|
Anton Georgiev
|
2ba9433c1d
|
change copyright year to 2018
|
2018-01-17 16:31:50 -05:00 |
|
Ghazi Triki
|
171db3e0ee
|
Display moderator icon next to his name in chat messages.
|
2018-01-17 22:02:26 +01:00 |
|
Anton Georgiev
|
9e45091e30
|
Merge pull request #4980 from KDSBrowne/z.0.4-btn-background-disappear-fix
Edit css to prevent disappearing close btn background
|
2018-01-17 18:29:03 -02:00 |
|
Anton Georgiev
|
7e4a9eda5d
|
Merge pull request #4979 from KDSBrowne/z.0.5-style-removedUser-view
Fix broken view styles displayed on error, on meetingEnd and for removed users
|
2018-01-17 17:45:31 -02:00 |
|
Fred Dixon
|
464e247a4a
|
Merge pull request #4982 from ffdixon/update-feedback-txt
Tweeked feedback dialog
|
2018-01-17 13:43:51 -05:00 |
|
Fred Dixon
|
6c36f8dc00
|
Tweeked feedback dialog
|
2018-01-17 12:42:17 -06:00 |
|
Augusto Bennemann
|
10cdd603bc
|
Fix null child element
|
2018-01-17 11:34:35 -02:00 |
|
Augusto Bennemann
|
5bf96b3c84
|
Screenshare button conditional rendering
|
2018-01-17 01:17:07 -02:00 |
|
Fred Dixon
|
346d127cf0
|
Merge pull request #4973 from riadvice/logout-feedback
Implemented "user rating feedback on logout" feature
|
2018-01-16 15:56:49 -05:00 |
|
Ghazi Triki
|
cf92e1aeef
|
Implemented "user rating feedback on logout" feature.
|
2018-01-16 20:37:05 +01:00 |
|
Augusto Bennemann
|
90adda6a93
|
Display either 'start' or 'stop' screenshare button, if screenshare enabled on config
|
2018-01-16 17:12:41 -02:00 |
|
KDSBrowne
|
644cb4f9b2
|
fix broken styles on error, on meetingEnd and for removed users
|
2018-01-16 10:26:57 -08:00 |
|