KDSBrowne
|
e172220287
|
make fullscreen btn label include element name
|
2019-02-06 21:12:59 +00:00 |
|
KDSBrowne
|
eb3bf6010e
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update
|
2019-02-06 17:09:47 +00:00 |
|
Anton Georgiev
|
6b1db968d2
|
Merge pull request #6686 from KDSBrowne/2.2-accessibility-update-02
Improve create breakoutroom modal accessibility
|
2019-02-06 11:52:43 -05:00 |
|
Vitor Mateus
|
8a8c5a997b
|
Add locale for reset zoom button
|
2019-02-06 14:42:12 -02:00 |
|
KDSBrowne
|
38a05de498
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update
|
2019-02-06 14:49:44 +00:00 |
|
Tainan Felipe
|
4e43c99384
|
Add alert when is under a minute to end
|
2019-02-05 17:18:20 -02:00 |
|
Tainan Felipe
|
742040c57b
|
Merge remote-tracking branch 'upstream/master' into issue-6450
|
2019-02-05 13:01:20 -02:00 |
|
Anton Georgiev
|
42ce30416b
|
Merge pull request #6634 from vitormateusalmeida/issue-5846
Implement enable/disable Animations
|
2019-02-05 09:49:36 -05:00 |
|
Anton Georgiev
|
b27a0a7047
|
Update en.json
Related to #6334
|
2019-02-04 15:29:43 -05:00 |
|
Anton Georgiev
|
9c677319a7
|
Rename label for publishing polling results
Closes #6334
|
2019-02-04 15:28:17 -05:00 |
|
KDSBrowne
|
7aa16a2d4b
|
prevent SR announcing poll inputs as one element
|
2019-02-02 03:56:15 +00:00 |
|
Anton Georgiev
|
31dba59957
|
pull HTML5 locales Feb1, 2019
|
2019-02-01 18:47:53 +00:00 |
|
KDSBrowne
|
c6dd0cb387
|
improve label / use camel case
|
2019-02-01 15:48:54 +00:00 |
|
Vitor Mateus
|
17a299688e
|
Merge remote-tracking branch 'upstream/master' into issue-5846
|
2019-02-01 10:59:52 -02:00 |
|
Anton Georgiev
|
db2ca3ce79
|
Fix typo in en.json
|
2019-01-31 11:41:44 -05:00 |
|
Vitor Mateus
|
7e90c011bd
|
Merge remote-tracking branch 'upstream/master' into issue-5846
|
2019-01-31 13:27:43 -02:00 |
|
Anton Georgiev
|
66a6189bb5
|
Update en.json
|
2019-01-30 17:34:34 -05:00 |
|
Anton Georgiev
|
c667c08f65
|
Merge pull request #6683 from ffdixon/update-locales
Update/make consistent language strings
|
2019-01-30 17:33:00 -05:00 |
|
KDSBrowne
|
afe66d560f
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update
|
2019-01-30 14:40:55 +00:00 |
|
Vitor Mateus
|
e0ddffbf66
|
Merge remote-tracking branch 'upstream/master' into issue-5846
|
2019-01-30 10:01:29 -02:00 |
|
KDSBrowne
|
f602611e44
|
improve create breakoutroom modal accessibility / fix pre-existing lint errors
|
2019-01-30 02:15:01 +00:00 |
|
Fred Dixon
|
2c044b9e69
|
Update/make consistent language strings
|
2019-01-29 18:09:51 -06:00 |
|
Anton Georgiev
|
d6d91c9722
|
Merge pull request #6681 from antobinary/locales
Pulled the latest HTML5 client locales from Transifex Jan 29, 2019
|
2019-01-29 16:57:40 -05:00 |
|
Anton Georgiev
|
76bf828a02
|
pulled latest HTML5 client locales from Transifex
|
2019-01-29 21:15:10 +00:00 |
|
Joao Siebel
|
ba198e82c6
|
add unlock/lock individual attendee when the meeting is locked. close #6661
|
2019-01-29 13:17:09 -02:00 |
|
Anton Georgiev
|
ff43b848e8
|
Merge pull request #6644 from antobinary/issue-6625
Localize "No locale selected; fix locales fetch
|
2019-01-28 16:33:34 -05:00 |
|
Anton Georgiev
|
38afdcf22b
|
Merge pull request #6640 from pedrobmarin/master-presentation-ui
New UI for presentation/video swap and fullscreen buttons
|
2019-01-28 12:33:47 -05:00 |
|
KDSBrowne
|
749a609565
|
fix minor accessibility issues
|
2019-01-28 13:33:50 +00:00 |
|
Pedro Beschorner Marin
|
5b760b46ef
|
Fixed share video button for locked users
|
2019-01-28 11:24:03 -02:00 |
|
Vitor Mateus
|
c140acbd6b
|
Merge remote-tracking branch 'upstream/master' into issue-5846
|
2019-01-28 10:14:46 -02:00 |
|
Anton Georgiev
|
6ef4f39903
|
Localize "No locale selected; fix locales fetch
|
2019-01-25 18:19:54 +00:00 |
|
Pedro Beschorner Marin
|
d8fd9910bb
|
Removed pt_BR translations made out transifex
|
2019-01-25 11:03:51 -02:00 |
|
Vitor Mateus
|
b6d5b15e3e
|
Implement enable/disable Animations issue-5846
|
2019-01-24 14:16:23 -02:00 |
|
Anton Georgiev
|
975102fb0f
|
fixed json parsion issues in Transifex locale strings
|
2019-01-23 21:44:51 +00:00 |
|
Anton Georgiev
|
d7dadec51d
|
add 2.2 html5 localized strings
|
2019-01-23 21:16:33 +00:00 |
|
Tainan Felipe
|
cfee36f8d7
|
Add time remaining notification bar status
|
2019-01-23 14:13:03 -02:00 |
|
Anton Georgiev
|
850e9bc718
|
Recovered matching 2.0 German strings manually
|
2019-01-22 21:56:30 +00:00 |
|
Lucas Zawacki
|
57fc7a81f0
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into youtube-2.2
|
2019-01-21 02:50:56 -03:00 |
|
Anton Georgiev
|
94ab770c94
|
html5 locales on 2.2; updated script and files
|
2019-01-18 16:42:37 +00:00 |
|
Anton Georgiev
|
0190ef4528
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logout-endmeeting-menu
|
2019-01-17 18:53:32 +00:00 |
|
Anton Georgiev
|
ff3898224b
|
Merge branch 'master' into master-presentation-ui
|
2019-01-16 17:33:29 -05:00 |
|
Anton Georgiev
|
9fa096436d
|
Merge pull request #6511 from Tainan404/issue-6485
Re style error component and implements error description.
|
2019-01-16 14:55:23 -05:00 |
|
Anton Georgiev
|
49f8a99766
|
Merge pull request #6476 from Tainan404/issue-6392
Add breakout room invitation feature
|
2019-01-16 13:30:11 -05:00 |
|
Lucas Zawacki
|
bf99fff416
|
Fix a few more linter errors and remove old translation
|
2019-01-16 14:01:22 -03:00 |
|
Anton Georgiev
|
0d1a351842
|
Update audio overlay to omit BigBlueButton word
Closes #6562
|
2019-01-15 17:35:47 -05:00 |
|
Lucas Zawacki
|
e883d3a2b0
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into master-presentation-ui
|
2019-01-15 10:31:12 -03:00 |
|
Anton Georgiev
|
b4bd4d1725
|
recording indicator checks if iAmModerator; end meeting menu
|
2019-01-14 21:39:03 +00:00 |
|
Lucas Zawacki
|
550bbcd492
|
Share synchronized youtube video in presentation area
|
2019-01-14 14:40:27 -03:00 |
|
Tainan Felipe
|
0918cc4084
|
Merge remote-tracking branch 'upstream/master' into issue-6392
|
2019-01-14 09:30:59 -02:00 |
|
Anton Georgiev
|
afb812b531
|
WIP end meeting menu
|
2019-01-12 00:20:04 +00:00 |
|
KDSBrowne
|
6205059070
|
edit formatted string / use ternary operator / omit passing Auth.userId
|
2019-01-11 19:15:31 +00:00 |
|
KDSBrowne
|
f11fed7bd7
|
add take presenter role to actions menu
|
2019-01-10 16:10:45 +00:00 |
|
Anton Georgiev
|
3fbcb84bb2
|
Change label of hand tool in whiteboard tools
Closes #6297
|
2019-01-09 16:13:47 -05:00 |
|
Anton Georgiev
|
02e72e9a96
|
Update tooltip for multi-user mode
Closes #6333
|
2019-01-09 16:03:34 -05:00 |
|
Anton Georgiev
|
c2a9ff67ae
|
Merge pull request #6389 from BobakOftadeh/record-indicator
Record indicator
|
2019-01-09 14:42:58 -05:00 |
|
Tainan Felipe
|
a5f15b2e1c
|
Add 400 bad request status to error screen
|
2019-01-08 16:38:26 -02:00 |
|
Pedro Beschorner Marin
|
e413d0a5c3
|
Included shared notes feature
|
2019-01-08 13:24:34 +00:00 |
|
Bobak Oftadeh
|
e4d97538a3
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into testRecord
|
2019-01-03 20:28:27 +00:00 |
|
Anton Georgiev
|
66512f9e75
|
Merge pull request #6411 from zhu/fix-file-uploader-2
Fix file uploader mobile
|
2019-01-03 13:19:27 -05:00 |
|
Lucas Zawacki
|
6101ca5c13
|
Close presentation via a button in the top corner
|
2019-01-02 16:08:33 -03:00 |
|
KDSBrowne
|
aba38b635b
|
update tooltips to use sentence case
|
2018-12-28 21:26:35 +00:00 |
|
Tainan Felipe
|
53c935b7eb
|
Add breakout room invitation feature
|
2018-12-27 14:20:03 -02:00 |
|
Anton Georgiev
|
85d2e162c5
|
Merge pull request #6404 from Tainan404/issue-6261
Add mobile version to sort user on create breakout rooms
|
2018-12-19 13:40:07 -05:00 |
|
prlanzarin
|
8e7fe4b50b
|
Removed generic camera errors and improved video-preview gUM error handling
|
2018-12-17 17:45:57 +00:00 |
|
zhu
|
a0afca45b8
|
add dropzoneImagesLabel for images dropzone
|
2018-12-17 17:30:32 +08:00 |
|
zhu
|
01279fd804
|
separate pics or files upload in mobile device
|
2018-12-17 17:27:17 +08:00 |
|
zhu
|
b4d58fbd9c
|
notify user when selected files is rejected
|
2018-12-17 17:23:00 +08:00 |
|
Tainan Felipe
|
18ba3e402f
|
Merge remote-tracking branch 'upstream/master' into issue-6261
|
2018-12-14 17:01:19 -02:00 |
|
Tainan Felipe
|
b279dac9e9
|
Add mobile version to sort user on breakout rooms
|
2018-12-14 10:33:58 -02:00 |
|
Anton Georgiev
|
fbb12b055e
|
Merge pull request #6276 from Tainan404/issue-6262
Add drag & drop grid for breakout rooms
|
2018-12-13 11:35:24 -05:00 |
|
Bobak Oftadeh
|
5dfbafb30f
|
Implemented recording modal
|
2018-12-12 11:09:33 -08:00 |
|
Anton Georgiev
|
0c05b7befa
|
Fix typos
Close #6369
|
2018-12-10 15:05:42 -05:00 |
|
Anton Georgiev
|
9c99457938
|
Edit poll label
Closes #6303
|
2018-11-29 15:43:20 -05:00 |
|
Tainan Felipe
|
d1ae927f6f
|
Add warn message and open the breakouts room when create
|
2018-11-29 17:47:04 -02:00 |
|
Tainan Felipe
|
27e012ac56
|
Add drag and drop grid to sort user by room
|
2018-11-27 10:44:22 -02:00 |
|
Tainan Felipe
|
63a268b12f
|
Add intl to free join and change the state to true by dafault
|
2018-11-23 15:20:49 -02:00 |
|
Bobak Oftadeh
|
15d4e84d55
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-16 12:06:57 -08:00 |
|
Maxim Khlobystov
|
e9a6d387e4
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice
|
2018-11-14 17:20:43 -05:00 |
|
bobakoftadeh
|
c33723ac14
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-12 09:15:55 -08:00 |
|
Anton Georgiev
|
9555cd68b8
|
Merge pull request #6105 from KDSBrowne/start-poll-01
Add start, stop and publish a poll for Presenter
|
2018-11-08 13:52:36 -05:00 |
|
Maxim Khlobystov
|
9f67ce4106
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice
|
2018-11-06 18:17:52 -05:00 |
|
Maxim Khlobystov
|
90f38561c3
|
Add Webcam Settings to choose a camera
|
2018-11-06 18:10:56 -05:00 |
|
bobakoftadeh
|
856459e989
|
Merge branch 'user-manage-b' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-C
|
2018-11-06 13:47:38 -08:00 |
|
Bobak Oftadeh
|
edc941da9e
|
Implementation of lock-view modal menu
|
2018-11-06 13:39:07 -08:00 |
|
KDSBrowne
|
538e248058
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-11-02 21:25:40 +00:00 |
|
Ghazi Triki
|
ff80b30df1
|
Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master
# Conflicts:
# bigbluebutton-html5/imports/ui/services/audio-manager/index.js
|
2018-11-02 21:02:02 +01:00 |
|
Bobak Oftadeh
|
a97a1ece37
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-11-02 09:17:07 -07:00 |
|
Ghazi Triki
|
653fd74440
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
# bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
# bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
# bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
# bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.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/MainApplicationShell.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
# bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
# bigbluebutton-config/bigbluebutton-release
# bigbluebutton-html5/client/compatibility/kurento-extension.js
# bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
|
2018-11-01 14:00:54 +01:00 |
|
KDSBrowne
|
76e3759039
|
add formated message
|
2018-10-30 15:57:10 +00:00 |
|
Bobak Oftadeh
|
6bde6b06f5
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-10-29 14:39:25 -07:00 |
|
Tainan Felipe
|
07d89a0132
|
Add intl to breakout room name
|
2018-10-29 16:29:45 -03:00 |
|
Tainan Felipe
|
fceeca3795
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-26 11:52:54 -03:00 |
|
KDSBrowne
|
935eb1289d
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-10-25 18:39:26 +00:00 |
|
Anton Georgiev
|
c80e379de6
|
Merge pull request #6104 from Tainan404/zoom-implementation
Add fit-to-width for html5
|
2018-10-25 14:31:29 -04:00 |
|
KDSBrowne
|
95bb36df82
|
Merge remote-tracking branch 'Upstream/master' into start-poll-01
|
2018-10-25 17:25:26 +00:00 |
|
Anton Georgiev
|
1c720be973
|
pulled html5 locales oct 24, 2018
|
2018-10-24 20:36:48 +00:00 |
|
Anton Georgiev
|
e888f5dc14
|
removed dummy button examples visible without presentation
|
2018-10-24 14:01:07 +00:00 |
|
Tainan Felipe
|
2b5c9a32b4
|
Add intl
|
2018-10-23 17:34:09 -03:00 |
|
Tainan Felipe
|
4d7861f0be
|
Add intl message
|
2018-10-23 16:29:19 -03:00 |
|
Tainan Felipe
|
958bd406a6
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-23 14:53:46 -03:00 |
|