Commit Graph

41 Commits

Author SHA1 Message Date
Ramón Souza
dba04834c7 Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08 2022-02-09 15:52:42 +00:00
Localization Server
0edb4a0677 chore: Pulled the latest 2.4 HTML5 locales from Transifex 2022-02-04 14:04:43 +00:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Localization Server
47ec25cad0 chore: Pulled the latest 2.4 HTML5 locales from Transifex 2022-01-13 21:03:32 +00:00
Ramón Souza
f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial 2022-01-12 16:40:45 +00:00
Localization Server
6e6986b639 chore: Pulled the latest 2.4 HTML5 locales from Transifex 2021-12-20 19:49:48 +00:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Localization Server
6b4e20bed6 chore: Pulled the latest 2.4 HTML5 locales from Transifex 2021-11-10 20:14:56 +00:00
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359
feat: multiple choice poll
2021-10-26 14:42:29 -04:00
Localization Server
deddf9ce9c chore: Pulled the latest 2.4 HTML5 locales from Transifex 2021-10-19 23:10:14 +00:00
Ramón Souza
1cc066366f Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-10-19 16:41:36 +00:00
Anton Georgiev
2e90975f9f chore: Pulled 2.4 HTML5 locales Oct 8, 2021 2021-10-08 15:59:09 +00:00
Anton Georgiev
5eaf10a10c chore: Pulled HTML5 2.4 locales on Sept 27, 2021 2021-09-27 20:23:14 +00:00
Anton Georgiev
4cc67d2dbd chore: Pulled HTML5 2.4 locales on Sept 17 2021-09-17 21:20:52 +00:00
Ramon Souza
0ca1b7896e Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-09-17 09:12:43 -03:00
Ramon Souza
212c79b7b3 update 2.4 locales 2021-08-26 16:02:13 -03:00
Anton Georgiev
097857d799 chore: Pulled partial locales 2.4 HTML5 on Aug 11, 2021 2021-08-12 18:02:26 +00:00
Anton Georgiev
4b91eaf537 Pulled HTML5 2.4 locales on July 30. The rest of the locales need manual fixes 2021-07-31 02:32:20 +00:00
Anton Georgiev
ef4c756a1e
Merge pull request #12733 from antobinary/merge-2.3.5-into-develop
chore: Merge 2.3.5, 2.3.6 into develop
2021-07-06 16:04:37 -04:00
Anton Georgiev
b9cc633286 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop 2021-07-06 19:36:19 +00:00
Anton Georgiev
a5c4f67aec Pulled HTML5 locales on July 2, 2021 2021-07-02 23:36:54 +00:00
Mario Jr
f379d35158 Merge branch 'develop' into feat-add-device-button-selector 2021-06-25 18:47:41 -03:00
Mario Jr
ce076ffaad feat(audio): add a new button for selecting audio device
This commit adds a new small button over the "Phone/audio" button. Currently
this button pops up the device audio selector, which contains the "Leave audio"
option. This commit brings back the "Leave audio" behavior to the phone
button, using a new smaller button to switch between audio devices.

This issue address the problem reported by #12320 and complements the work done
for #9723.

Some technical details:
Added a new component : ButtonEmoji. This allow us to add an emoji inside
another button.
Modified dropdown trigger a bit: if the trigger contains a ButtonEmoji,
then we will use the emoji to trigger the dropdown (instead of the button
itself). This commit doens't change the default behavior of dropdown (when
the trigger doesn't have a ButtonEmoji component), to avoid regressions with
current dropdowns; this will only change it's behavior when used with
the new ButtonEmoji component.
2021-06-22 08:58:52 -03:00
germanocaumo
1fb9870cf7
Apply suggestions from code review
Code style fixes and remove translations other than en to avoid conflicts with transifex.

Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2021-06-17 10:25:03 -03:00
germanocaumo
349af23f0a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls 2021-06-16 21:54:28 +00:00
Anton Georgiev
e1d72bb943 Pulled HTML5 locales, June 14, 2021 2021-06-14 22:25:54 +00:00
tibroc
306beff1d1 add better user explanations and remaining differences to #12435
PR #12435 was slightly different than #12430 but especially had better explanations for users.
This commit incorporates the remaining ideas from that PR.
2021-06-07 11:01:34 +02:00
tibroc
828cf60cb2 Add option to hide individual answers in polls
This patch adds a new option to hide the individual answers to the presenter
when starting a poll. This includes hiding the answers for the presenter and
informing the other users that the current poll is anonymous.

See #9524
2021-06-07 10:56:14 +02:00
Anton Georgiev
4957f0218b chore(locales): Pulled HTML5 locales on May 31, 2021 2021-05-31 23:26:14 +00:00
Anton Georgiev
612b22da06 chore: Pulled HTML5 locales, May 12, 2021 2021-05-12 20:31:28 +00:00
Michael Zinsmeister
5ca831ff86 Merged upstream develop branch 2021-05-01 16:59:20 +02:00
Anton Georgiev
528dba7ed5 Pulled HTML5 locales; Added Afrikaans 2021-04-29 20:33:11 +00:00
Anton Georgiev
ecc9ce5206 Pulled HTML5 locales on Apr 23, 2021 2021-04-23 17:27:35 +00:00
Anton Georgiev
651d09cbd0
Merge pull request #11224 from sapsDev/palm-rejection-develop-v2.3
Fix unintetionally drawing while using an active pencil
2021-04-15 13:34:01 -04:00
Anton Georgiev
4a4efb94f8 Pulled HTML5 locales on Apr 1, 2021 2021-04-01 20:17:45 +00:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll 2021-03-29 11:54:44 -04:00
Anton Georgiev
12644fdcdc Pulled HTML5 locales on March 24, 2021 2021-03-24 19:35:58 +00:00
Jonathan S
ad356e6a55 Add german translation. 2021-03-19 12:35:30 +00:00
Michael Zinsmeister
b99bd3be0c Merged upstream develop branch 2021-03-14 22:17:19 +01:00
Anton Georgiev
59cb2f107f Pulled HTML5 locales on March 12, 2021 2021-03-12 21:17:53 +00:00
Ramón Souza
0105373cee
Applies changes needed to serve locale files as static content (#11234)
* moving locales folder to /public and applying changes needed to serve locales as static files

* better dev/prod check

* transifex pull script changes to match new locales directory + ignore locales with less than 100 lines

* fix local/prod locales path

* merge fallback messages

* applies new locale changes to legacy client

`bbb-html5.nginx` file content should also be changed to the following:

```
location /html5client/locales {
  alias /usr/share/meteor/bundle/programs/web.browser/app/locales;
}

location /html5client/compatibility {
  alias /usr/share/meteor/bundle/programs/web.browser/app/compatibility;
}

location /html5client/resources {
  alias /usr/share/meteor/bundle/programs/web.browser/app/resources;
}

location /html5client/svgs {
  alias /usr/share/meteor/bundle/programs/web.browser/app/svgs;
}

location /html5client/fonts {
  alias /usr/share/meteor/bundle/programs/web.browser/app/fonts;
}

location /html5client {
  # proxy_pass http://127.0.0.1:4100; # use for development
  proxy_pass http://poolhtml5servers; # use for production
  proxy_http_version 1.1;
  proxy_set_header Upgrade $http_upgrade;
  proxy_set_header Connection "Upgrade";
}
```
2021-03-11 06:42:41 -05:00