Klauswk
0ce41afabb
Merge branch 'bbb-2x-mconf' into html5-toggle-mute
2017-08-08 13:59:00 -03:00
Oswaldo Acauan
716ee5902f
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
2017-08-08 11:52:26 -03:00
Klaus
0807960da4
Fix missing method for mute user
2017-08-04 17:05:18 -03:00
Oswaldo Acauan
0022c121d3
Fix chat bug and styles
2017-08-04 14:58:55 -03:00
Oleksandr Zhurbenko
227f9d540f
Added permissions to Move Cursor presenter action
2017-08-03 14:18:01 -07:00
Oleksandr Zhurbenko
43566245ac
Added permissions to Undo and Clear All presenter actions
2017-08-03 14:09:19 -07:00
Anton Georgiev
6afb7ca8b3
Merge pull request #4124 from Klauswk/html5-2x-chat-options
...
[HTML5 2.0] Add public chat new options
2017-08-03 14:33:32 -04:00
Anton Georgiev
1d465909e8
Merge pull request #4198 from KDSBrowne/x2.0.1-transifex-fetch-translation
...
[HTML5 2.0] - Transifex script & Translations.
2017-08-03 14:21:48 -04:00
Oswaldo Acauan
14f586faad
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
2017-08-03 09:23:12 -03:00
Klaus
e02e5d75ce
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-08-03 09:17:50 -03:00
Oleksandr Zhurbenko
fa1458c3eb
Handling and publishing multi-user mode switch
2017-08-02 18:24:38 -07:00
KDSBrowne
daa1439099
add script to pull translation from transifex
2017-08-02 11:11:33 -07:00
Klaus
63fee3b615
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-08-02 11:36:16 -03:00
Klaus
d45ae64558
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
2017-08-02 11:29:33 -03:00
Oleksandr Zhurbenko
b207a1275e
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-01 13:49:46 -07:00
Oswaldo Acauan
df35a22676
Merge branch 'bbb-2x-mconf' into userlist-2x-design
2017-08-01 14:29:12 -03:00
JaeeunCho
08818948ac
changed logout-confirmation and en.json
2017-08-01 09:09:06 -07:00
JaeeunCho
04636ca25b
[HTML5] added endMeeting by moderator
2017-08-01 08:53:05 -07:00
Klaus
9d42ca9bd7
Move from users to voice-users
2017-08-01 10:10:12 -03:00
Klaus
1ff3df770a
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user
2017-07-31 17:01:04 -03:00
Anton Georgiev
7b40122c89
Merge pull request #4121 from mmarangoni/call-manager
...
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04:00
Klaus
9bc9116e5c
handling a few messages
2017-07-31 08:10:52 -03:00
Oswaldo Acauan
dca47fcbb6
Add missing locales
2017-07-28 10:51:18 -03:00
Klaus
e43a44e828
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-07-28 08:47:56 -03:00
Klauswk
e751bcdadf
Merge branch 'bbb-2x-mconf' into slides-refactor-2x
2017-07-27 17:27:35 -03:00
Klaus
c13155aa6a
Move shapes to annotations
2017-07-27 09:35:55 -03:00
Matthew Marangoni
0ab3bcc599
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
2017-07-26 10:59:05 -07:00
Anton Georgiev
5ca6f63d7e
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into html5-2x-fix-audio
2017-07-26 13:49:57 -04:00
Klaus
745b9070f6
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
2017-07-26 11:11:40 -03:00
Oleksandr Zhurbenko
6ea4d39da9
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-07-25 15:08:29 -07:00
Klaus
9cd3ac3f87
Merge branch 'bbb-2x-mconf' into fix-presenter-rule
2017-07-25 13:43:26 -03:00
Oleksandr Zhurbenko
5aed767436
Moved SwitchSlide method to 2.0
2017-07-24 14:04:49 -07:00
Anton Georgiev
b7d6427e63
rename deskshare to screenshare and adjust condition for viewing
2017-07-24 15:29:34 -04:00
Klaus
78a6fee038
Slides reflecting akkaApps
2017-07-24 14:50:44 -03:00
Klaus
5c2369b992
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
2017-07-24 11:00:30 -03:00
Klaus
39288e6e70
Add clear history, copy and save as chat options
2017-07-21 13:27:28 -03:00
Klaus
7cf05cdbf5
Add public history clear eventHandler and method
2017-07-21 11:39:40 -03:00
Matthew Marangoni
f521ef0402
Merge remote-tracking branch 'upstream/master' into call-manager
2017-07-19 11:55:45 -07:00
Matthew Marangoni
1feb7629d6
detailed errors and error codes are displayed in the audio notifications when an audio failed case is received
2017-07-18 17:04:12 -07:00
Anton Georgiev
2d4db1c9de
Merge pull request #4113 from oswaldoacauan/fix-meeting-add
...
[HTML5 2.0] Fix meeting add
2017-07-18 10:02:08 -04:00
Oswaldo Acauan
c6f517b3cb
Fix selector and get welcomeMessage from meeting object
2017-07-18 10:25:11 -03:00
Klaus
3af281d648
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
2017-07-17 13:33:45 -03:00
Klaus
b630fcd632
Fix presenter assign
2017-07-17 09:00:18 -03:00
Oswaldo Acauan
5353a3a80d
Add guest policy to html5
2017-07-14 11:18:07 -03:00
JaeeunCho
1a1fb6dc57
HTML5 - fixed errors when the meeting is ended by apimate
2017-07-05 07:59:18 -07:00
Anton Georgiev
2e0f6d8610
trigger syncing with state from akka-apps
2017-06-30 11:19:11 -04:00
Anton Georgiev
724e21a0d6
we do not have 1.0 user messages coming from bbb so use 2.0 only
2017-06-27 18:14:53 -04:00
Anton Georgiev
91cfc02d13
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages
2017-06-26 17:21:42 -04:00
Anton Georgiev
16168ddd5b
Merge pull request #3997 from Klauswk/DetectSystemLang
...
[HTML5] Add support to default system/browser language
2017-06-26 16:18:22 -04:00
Anton Georgiev
1d1a4c31f9
Merge pull request #4016 from MaximKhlobystov/grunt-to-npm-scripts-move
...
[HTML5 Client] Transition from Grunt to NPM Scripts
2017-06-26 16:11:09 -04:00
Klaus Klein
ca09b69555
Merge branch 'Acl' into Refactor2x
...
* Acl:
Add check to undefined role
Lint to eslint
Missing merge file
Fix lint problems
Change Acl lookup
Change ACL to be more extensible
Fix a few review comments
Acl refactor working
Mostly working, still problems with user subs
Code refactored
2017-06-19 11:28:17 -03:00
Klaus Klein
d88d4fb0bc
Add stuff from 2.x
2017-06-19 10:13:35 -03:00
Maxim Khlobystov
237bcd7f9b
Remove the old Meteor shell configs
...
Those values are now in .npmrc file.
2017-06-15 05:15:26 +00:00
KDSBrowne
c32f614bc8
add new line to end of file
2017-06-10 12:04:52 -07:00
KDSBrowne
cb96a26717
remove string concatenation
2017-06-10 11:56:14 -07:00
KDSBrowne
c189faceff
fix merge conflicts
2017-06-08 11:00:06 -07:00
Oswaldo Acauan
ccb6fd2a53
Fix merge conflicts
2017-06-07 12:01:18 +00:00
Klaus Klein
0d9525164f
Add support to default system/browser language
2017-06-06 09:33:53 -03:00
KDSBrowne
1cfc37eac9
remove unneeded localized strings
2017-06-05 12:33:45 -07:00
Klaus Klein
a96393e23c
Change Acl lookup
2017-06-05 11:16:19 -03:00
Klaus Klein
9b41e3a475
Merge remote-tracking branch 'upstream/master' into Acl
...
* upstream/master:
HTML5 - added new line at the end of the file
Add check for min/max length for chat message
HTML5 - fixed setting's dropdown re-render issue
2017-06-05 08:37:17 -03:00
Klaus Klein
fc73992a63
Fix a few review comments
2017-06-01 17:40:55 -03:00
Klaus Klein
8a31d29e17
Acl refactor working
2017-06-01 14:32:04 -03:00
Oswaldo Acauan
3702da3e08
Add check for min/max length for chat message
2017-06-01 14:24:29 +00:00
Klaus Klein
a4c8ff493a
Code refactored
2017-05-31 14:54:43 -03:00
KDSBrowne
58c777b456
fix locale string format
2017-05-23 14:49:02 -07:00
Anton Georgiev
746ef9478c
Merge pull request #3939 from KDSBrowne/userlist-accessibility
...
[HTML5] - Userlist accessibility improvement
2017-05-17 11:52:52 -04:00
KDSBrowne
a2520dbbbc
change format for other locales
2017-05-17 08:35:24 -07:00
KDSBrowne
2f79f3ff20
change locale stringformat
2017-05-16 17:02:27 -07:00
KDSBrowne
dd1e830dc2
fix merge conflicts
2017-05-12 10:52:12 -07:00
KDSBrowne
1940d49c4b
fix aria labeling
2017-05-12 10:45:41 -07:00
Anton Georgiev
b9f75f88ae
Merge pull request #3928 from JaeeunCho/locked_status
...
HTML5 - added locked status for users
2017-05-12 12:56:53 -04:00
Anton Georgiev
3dc21e2cae
increase the connectionTimeout value for production
2017-05-11 15:20:59 -04:00
JaeeunCho
bd923e0f39
HTML5 - added locked status for users
2017-05-10 14:00:03 -07:00
Klaus Klein
b2195da345
Fix client reconnection timeout
2017-05-05 11:30:15 -03:00
Anton Georgiev
935219148a
Merge pull request #3871 from Klauswk/LeaveButtonOnErrorScreen
...
Add leave button to error screen
2017-05-03 12:58:28 -04:00
Oswaldo Acauan
ff5d3d1211
Merge remote-tracking branch 'upstream/master' into presentation-uploader
...
* upstream/master: (83 commits)
resolve issues with modal on breakouts
Update generate_css_dpi.sh comments.
Added multi-resolution generated css files for the mobile client.
Added a shell script to generate multi-dpi css files for the mobile client.
Fix origin on pencil cursor
Fix a missing bracket in mobile demo
Delete services directory.
New cursors for flash client
update mobile demo to support https
Set icon-44.png to its true size and set value for allowBrowserInvocation in Main-app.xml
Delete services/bbb-web-api project.
Delete bbb-web-api project.
Renamed clours for mobile application styles.
Handle audio on refactored modal (#2 )
Put all toolbar logic in TopToolbarMediatorAIR to avoid double mediator registration.
fix lint issues
Fix the audio-modal
fix tabIndex for the settings closed caption submenu
remove extra list separator
fix console errors for missing key and invalid prop
...
2017-05-03 13:36:54 -03:00
Oswaldo Acauan
71fc15a803
Add presenter upload capabilities
2017-05-03 13:36:16 -03:00
Klaus Klein
5a37750bf6
Change leave button label
2017-05-03 13:19:45 -03:00
KDSBrowne
eef9fd782a
fix merge conflict
2017-05-01 12:23:01 -07:00
Anton Georgiev
85d6f7aa6e
add label descriptions for cancel and save
2017-04-28 15:13:42 -04:00
Anton Georgiev
5d0022f214
localize user popup menu
2017-04-28 14:28:55 -04:00
Anton Georgiev
5abf6413a8
localize controls in Settings menu
2017-04-28 11:56:27 -04:00
Anton Georgiev
121cb47093
localize mute, unmute buttons
2017-04-28 11:34:20 -04:00
Anton Georgiev
d9cf45152d
pulled translations from transifex
2017-04-27 18:00:36 -04:00
Anton Georgiev
9684195c5f
minor changes in strings
2017-04-27 17:23:43 -04:00
Anton Georgiev
684f87e77a
demote html5 moderator user to viewer based on flag
2017-04-27 16:07:27 -04:00
KDSBrowne
737da5937d
add aria descriptionfor current status
2017-04-27 08:57:41 -07:00
KDSBrowne
230bc1f11c
fix merge conflicts
2017-04-26 07:14:25 -07:00
KDSBrowne
9203cc60e3
add localized messages
2017-04-24 19:08:18 -07:00
Anton Georgiev
835acfa195
Merge pull request #3835 from KDSBrowne/accessibility-05-update
...
[HTML5] - Accessibility update 05
2017-04-24 15:34:05 -04:00
KDSBrowne
1e07098527
add messages for settings application submenu
2017-04-21 12:04:46 -07:00
KDSBrowne
97402b4628
add aria-label to chat log
2017-04-20 06:53:03 -07:00
KDSBrowne
cc04f96955
add suggested changes
2017-04-19 10:10:17 -07:00
KDSBrowne
a4fcffaa9a
add DropdownListTitle component
2017-04-19 08:28:13 -07:00
gcampes
9f39f9ce6a
merge conflicts
2017-04-18 16:14:39 -03:00
gcampes
eda7648043
Merge remote-tracking branch 'upstream/master' into settings-localization-dropdown
...
* upstream/master: (51 commits)
Fix lint issues
Fix lint issues
Fix a few lint problems
fix missing import causing breakouts to not work
Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded.
Fix poll options remain visible on html5, closes #3806 HTML5
- user internal userId instead of external userId in register user message
remove unnecessarily added svgs
updated icons to v11, adjusted few icons
Fix merge algoritm problem
set chat input color to gray (text-color)
Fixed user leave problem on private chat, close #3799 HTML5
align emojis horizontally
Check userId when validating token
Cleanup - remove extra > on meeting name on getRecording API response
Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint.
fix event name causing issues with listenOnly status
Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used.
improved logic for updating message-list
Change to fetch from chat system id, issue #3792 HTML5
...
2017-04-17 15:49:35 -03:00
KDSBrowne
ca09907d47
add formatted messages
2017-04-17 11:19:27 -07:00
KDSBrowne
4ac45b30f9
add aria label for userlist btn notification
2017-04-17 10:00:15 -07:00
KDSBrowne
4a480f77eb
fix aria labels for hide and close chat btns
2017-04-14 16:18:40 -07:00
KDSBrowne
e316f38cda
fix merge conflicts
2017-04-11 07:07:49 -07:00
KDSBrowne
cd014929fe
add defined messages
2017-04-10 13:27:29 -07:00
KDSBrowne
3ff1096cf4
fix merge conflict
2017-04-06 07:11:57 -07:00
gcampes
ded1de0b40
Adds localization dropdown
2017-04-06 09:36:59 -03:00
Anton Georgiev
fe998aacd3
Merge pull request #3769 from Gcampes/settings-refactor
...
[HTML5] Adds settings service
2017-04-06 08:31:59 -04:00
gcampes
3ea21df973
Fix closed captions settings issue
2017-04-06 08:46:15 -03:00
KDSBrowne
e932f707a9
clean up code
2017-04-05 15:35:09 -07:00
KDSBrowne
e01f34cf23
fix merge conflicts
2017-04-05 09:56:41 -07:00
gcampes
f0ac39f420
Merge remote-tracking branch 'upstream/master' into settings-refactor
...
* upstream/master: (63 commits)
add styles for separator
In whiteboard text tool, a single click while editing a text sends it without creating a new text zone.
Fixed https://github.com/bigbluebutton/bigbluebutton/issues/3777
- escape all user passed strings
- display length of recording in minutes instead of milliseconds
- fix window size - run dos2unix to remove ^M but it formatted the whole file :(
- add dimension of screen share
add formatted message for close chat link
add formatted message for userlist toggle btn label
remove unused import
fix DropdownListSeparator to work with NVDA
remove local storage usage and add separator
change role from section to region
add menu item separation NVDA fiendly
add formatted messages and remove generic divs
remove direct DOM manipulation
remove span element
add aria-label for unread messages
add missing import to fix JoinAudio Btn
fix lint issues
...
2017-04-05 13:56:07 -03:00
KDSBrowne
940905e4b7
add aria-label to status btn
2017-04-03 10:34:37 -07:00
KDSBrowne
8ec0c6bb04
change formatted msg and remove duplicate div
2017-03-30 10:25:29 -07:00
KDSBrowne
767c9181f9
add desc to give context to unread message count
2017-03-30 06:42:11 -07:00
KDSBrowne
00f77d1fd4
add formatted message for close chat link
2017-03-29 08:35:07 -07:00
KDSBrowne
4cbf7bedbb
add formatted message for userlist toggle btn label
2017-03-29 08:22:26 -07:00
KDSBrowne
208383d3a5
fix DropdownListSeparator to work with NVDA
2017-03-29 08:09:47 -07:00
KDSBrowne
2fae315db2
add menu item separation NVDA fiendly
2017-03-27 14:41:10 -07:00
KDSBrowne
782deb6525
add formatted messages and remove generic divs
2017-03-27 12:49:46 -07:00
gcampes
c7f7d5b58a
Merge remote-tracking branch 'upstream/master' into settings-refactor
...
* upstream/master: (53 commits)
center modal title
HTML5 - removed unused imports, fixed variable names
Added a missing import
Updated icon sets to the latest
Moved the recording systemd scripts into the core directory
record-and-playback: Split rap-worker into separate workers per step.
cleanup
audio join - apply structure and style from designs
"Video Chat" Layout has a dark background, controls are and title are removed in this layout.
Delete unused layout event class and videconf view.
HTML5 - changed underscore to lodash
revert tabIndex change
add local folder
remove unused imports
move handleExitAudio to service
remove merge conflict
fix more linting issues
lint nav settings dropdown container
remove unused imports
change function name
...
2017-03-24 09:30:41 -03:00
gcampes
8582c18be9
Merge conflicts
2017-03-22 10:00:37 -03:00
KDSBrowne
ceeb66ceed
Merge remote-tracking branch 'upstream/master' into Fullscreen-Label-Change
2017-03-21 08:50:09 -07:00
KDSBrowne
c7c44c4c63
add local folder
2017-03-21 07:46:41 -07:00
gcampes
acb8b1155b
Merge conflicts
2017-03-20 15:00:04 -03:00
Oswaldo Acauan
72dc94ab31
Remove old Kicked screen in favor of the new error screen
2017-03-17 14:38:18 +00:00
Oswaldo Acauan
9c84105319
Add missing packages
2017-03-10 19:18:23 +00:00
Oswaldo Acauan
be7f36e00c
Refactor the i18n server code
2017-03-09 19:50:21 +00:00
Oswaldo Acauan
886edff059
Add missing configuration file
2017-02-06 19:14:48 +00:00
Anton Georgiev
1b950f5e78
limit sound on unread chat via Settings and Config
2017-01-24 17:32:25 -05:00
KDSBrowne
08e6a32e2b
Show audio modal on client load
2017-01-10 15:14:23 -08:00
Anton Georgiev
8608c6b716
comply with feedback - about component
2016-12-08 15:59:52 +00:00
Anton Georgiev
b56ee1e553
add client information in About
2016-12-07 21:14:14 +00:00
Anton Georgiev
3ed395d079
update client information
2016-12-07 20:52:07 +00:00
KDSBrowne
bf3a65ccf2
added 'warn' level to production
2016-12-01 10:59:58 -08:00
KDSBrowne
24643f01dd
using config file for logger level
2016-12-01 08:15:57 -08:00
Matthew Marangoni
d21545c847
added html5 stun request and reply
2016-10-25 07:59:14 -07:00
Oswaldo Acauan
79cdf636eb
Rewrite Redis related classes
2016-10-18 12:03:51 +00:00
KDSBrowne
db461591d4
HTML5 Welcome Chat Message Fixed
2016-09-14 07:26:45 -07:00
Anton Georgiev
cf45e2ab96
remove obsolete package version and environment path
2016-08-24 22:50:57 +00:00
Laily Ajellu
361ce7f19f
HTML5 - adds captions to config file
2016-08-23 16:48:11 -07:00
Laily Ajellu
2105e911ef
HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js
2016-08-23 14:35:28 -07:00
Laily Ajellu
ce50f58c36
HTML5 - removes old settings and changes setting dependant files
2016-08-23 07:35:06 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
