Anton Georgiev
952b4457f5
pull the latest German translations
2018-01-25 14:15:51 -05:00
Anton Georgiev
e5b1289b9c
remove duplicated Japanese locale
2018-01-25 13:42:33 -05:00
Anton Georgiev
ba7d3325b7
adjust Khmer locale, related to #4538
2018-01-25 13:36:19 -05:00
Anton Georgiev
0d2f52c033
pulled html5 client locales 2018-01-25
2018-01-25 12:28:45 -05:00
Anton Georgiev
72ea8b8906
remove duplicated keys in en.json
2018-01-24 16:49:48 -05:00
Anton Georgiev
b8400c7501
remove duplicated keys in en.json
2018-01-24 16:46:18 -05: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
Joao Siebel
a42d88250e
Resolve merge conflict in english locales file
2018-01-19 17:43:11 -02:00
Oleksandr Zhurbenko
f6ed7c3575
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4897
2018-01-15 12:33:29 -08:00
KDSBrowne
387f539c52
remove empty locale file
2018-01-14 10:29:36 -08:00
prlanzarin
acc9650370
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-upstream-errors
2018-01-12 21:39:24 +00:00
prlanzarin
8594ce169d
Merge remote-tracking branch 'mconftec/fixes-lucas' into video-upstream-errors
2018-01-12 20:02:45 +00:00
Tainan Felipe
8ae1fd1820
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends
2018-01-11 09:19:56 -02:00
Joao Siebel
0b02d90927
Resolve merge conflicts
2018-01-10 17:22:42 -02:00
Oleksandr Zhurbenko
7871681448
Changed all the references of kick to remove, to be consistent
2018-01-09 14:28:48 -08:00
Augusto Bennemann
e2ef3281ec
Localize video and screnshare error messages
2018-01-05 19:43:53 +00:00
Anton Georgiev
d22a6d5a96
Merge pull request #4883 from OZhurbenko/fix-issue-4863
...
Updated the message displayed to the kicked user
2018-01-04 14:20:00 -02:00
Anton Georgiev
34a503b218
Merge pull request #4624 from Tainan404/toast-breakout-ends
...
[HTML5] show audio modal and toast notification when breakout room ends
2018-01-03 19:11:27 -02:00
Oleksandr Zhurbenko
d8533a86b3
Changed the message displayed to the kicked user
...
Fixes #4863
2018-01-03 12:25:13 -08:00
prlanzarin
3a72afa350
Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection
2017-12-21 17:37:07 +00:00
Tainan Felipe
2c48392b2c
change intl id
2017-12-18 08:53:37 -02:00
Anton Georgiev
d6aa4ed44d
Merge pull request #4733 from oswaldoacauan/fix-4700
...
Improvements on Presentation Management
2017-12-15 19:03:54 -02:00
Lucas Zawacki
1e514aad04
Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu
...
Removed several variables that were in this.state to this in the html5 video-dock component
Conflicts:
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-15 13:47:03 -02:00
Tainan Felipe
c582f5bf08
add meetingEnded in Base component aand add intl translation
2017-12-14 17:03:34 -02:00
Joao Siebel
45ec92c230
Merge remote-tracking branch 'upstream/v2.0.x-release' into whiteboard-toolbar-locale
2017-12-14 08:47:45 -02:00
Tainan Felipe
a66db4797a
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-breakout-ends
2017-12-11 08:14:27 -02:00
prlanzarin
89bd746f1c
Changed webcam localization strings
2017-12-08 16:23:21 +00:00
João Francisco Siebel
950eb488a0
Add locale to whiteboard toolbox items
2017-12-08 11:28:02 -02:00
Anton Georgiev
bf7c26f02b
Merge pull request #4712 from Tainan404/localize-public-clear
...
Localize message from when clear the chat.
2017-12-07 18:27:55 -02:00
Anton Georgiev
c9a5ded2c1
Merge pull request #4662 from Tainan404/fix-design
...
Fix design issues
2017-12-05 18:54:08 -02:00
Anton Georgiev
255d64d430
Merge pull request #4687 from Gcampes/audio-refactor-bugfixes
...
Audio bugfixes and improvements
2017-12-05 17:17:35 -02:00
Oswaldo Acauan
938c3c2c0d
Add actual current pres indicator
2017-12-04 14:18:57 -02:00
Lucas Zawacki
1f2f5dc218
More reconnect logic and some translations
2017-12-01 21:40:25 -02:00
prlanzarin
f2bf5cca87
Fixed missing comma in english localization file
2017-11-29 14:02:55 +00:00
Tainan Felipe
488f9eacc3
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-design
2017-11-29 09:32:39 -02:00
Tainan Felipe
2afd7b16a0
readd missing messages
2017-11-29 08:48:57 -02:00
Oswaldo Acauan
807bd99f82
Fix stuck state on conversion failure
2017-11-28 10:26:00 -02:00
Oswaldo Acauan
e8de534964
Add error handling on presentation upload and covnersion
2017-11-27 15:44:45 -02:00
Tainan Felipe
d15bb139bb
refactor emoji menu
2017-11-23 15:20:27 -02:00
Tainan Felipe
545d9e158b
altered id of the intl message
2017-11-23 11:00:41 -02:00
Tainan Felipe
5f66e79263
linter fixes
2017-11-23 09:49:10 -02:00
Tainan Felipe
37440e11f1
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-breakout-ends
2017-11-22 11:11:21 -02:00
Tainan Felipe
6845aed0e0
localize message from when clear the chat
2017-11-21 16:31:53 -02:00
Anton Georgiev
697f178b8f
Merge pull request #4647 from Tainan404/translate-slide-option
...
Add localization for slides options
2017-11-20 18:11:37 -02:00
Gabriel Carvalho de Campes
74bb2bb5e8
fix permission overlay positioning, localizes messages
2017-11-17 17:01:52 -02:00
Tainan Felipe
881a8e153e
change name of the variables for goToSlide
2017-11-17 13:54:23 -02:00
Gabriel Carvalho de Campes
effb21fc1f
Changes and enhancements on audio, wIP
2017-11-17 09:52:48 -02:00
Tainan Felipe
0c37aa96df
hchange of slide for slideLabel
2017-11-17 08:27:12 -02:00
Gabriel Carvalho de Campes
36c9d85749
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
2017-11-16 09:13:47 -02:00
Anton Georgiev
b6befb3ae0
Merge pull request #4601 from Tainan404/notification-chat-message
...
Add toast notification for new chat messages and uncomment settings for chat notifications.
2017-11-14 13:50:25 -02:00
