JaeeunCho
04636ca25b
[HTML5] added endMeeting by moderator
2017-08-01 08:53:05 -07:00
Anton Georgiev
7b40122c89
Merge pull request #4121 from mmarangoni/call-manager
...
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04: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
9cd3ac3f87
Merge branch 'bbb-2x-mconf' into fix-presenter-rule
2017-07-25 13:43:26 -03:00
Anton Georgiev
b7d6427e63
rename deskshare to screenshare and adjust condition for viewing
2017-07-24 15:29:34 -04:00
Klaus
5c2369b992
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
2017-07-24 11:00:30 -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
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
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
