Commit Graph

895 Commits

Author SHA1 Message Date
Anton Georgiev
351a0e43cb Merge pull request #4470 from KDSBrowne/xx-07-allow-html5-modorator
[HTML5] -Allow HTML5 Moderator
2017-10-11 09:04:54 -03:00
Oleksandr Zhurbenko
bbe1f99527 Improvements 2017-10-10 16:20:52 -07:00
Oleksandr Zhurbenko
8b5a53a59a Moved pencil_chunk_size to the config
... And adjusted the way we fetch annotation statuses from the config
2017-10-10 14:50:11 -07:00
Oswaldo Acauan
80a318309c Implement multi queues and async messages on Redis class 2017-10-10 14:43:42 -03:00
Maxim Khlobystov
d1f6d7c4e0 Replaced double quotes with single ones in the YAML file. 2017-10-06 18:05:30 +00:00
KDSBrowne
d89f0e511f Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator 2017-10-06 11:02:17 -07:00
Maxim Khlobystov
5f79db2554 Fixed the issue with the Bulgarian locale always displaying as a default one in the Settings modal. 2017-10-06 16:29:52 +00:00
KDSBrowne
4191ce56ed set allowHTML5Moderator to true 2017-10-06 06:27:45 -07:00
Oleksandr Zhurbenko
76bcdd55d6 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-10-03 10:34:10 -07:00
Oswaldo Acauan
89c2947d78 Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge 2017-09-29 17:32:31 -03:00
Oswaldo Acauan
2a7fd5ba4d Rename share method to set to match akka 2017-09-29 10:01:01 -03:00
Oswaldo Acauan
e699c342b6 Add missing suported mimes 2017-09-29 09:31:38 -03:00
Oleksandr Zhurbenko
e0a7bfc9fa Refactored whiteboard-toolbar 2017-09-22 23:27:55 -07:00
Oswaldo Acauan
cca1e58167 Move default presentation name to config file 2017-09-22 17:49:11 -03:00
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03:00
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03:00
Oswaldo Acauan
c0307e36a6 Presentation Uploader to 2.0 2017-09-07 15:18:14 -03:00
Oleksandr Zhurbenko
65da71c12a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-05 18:53:51 -07:00
Augusto Bennemann
5ec827e17d HTML5 video with kurento (port) 2017-09-01 12:26:57 -03:00
Oswaldo Acauan
6070a4ea25 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x 2017-08-31 09:49:59 -03:00
Oleksandr Zhurbenko
d5f07a574c Fixed publishShape message for 4 common shapes
Line, Rectangle, Triangle, Ellipse
2017-08-18 19:47:31 -07:00
JaeeunCho
73b6054b42 [HTML5] implemented promote/demote user 2017-08-18 11:23:05 -07:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
JaeeunCho
1dff7f0ef2 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-14 12:56:56 -07:00
Klaus
e996bea1e9 Handling separate redis channel 2017-08-14 15:55:17 -03:00
JaeeunCho
b20ea78e2a fixed conflict 2017-08-10 14:34:21 -07:00
JaeeunCho
8590d2f414 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-08 12:31:56 -07:00
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
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
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
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
9bc9116e5c handling a few messages 2017-07-31 08:10:52 -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
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
7cf05cdbf5 Add public history clear eventHandler and method 2017-07-21 11:39:40 -03:00
Oswaldo Acauan
c6f517b3cb Fix selector and get welcomeMessage from meeting object 2017-07-18 10:25:11 -03:00
Klaus
b630fcd632 Fix presenter assign 2017-07-17 09:00:18 -03: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
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
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
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
Anton Georgiev
3dc21e2cae increase the connectionTimeout value for production 2017-05-11 15:20:59 -04:00
Klaus Klein
b2195da345 Fix client reconnection timeout 2017-05-05 11:30:15 -03:00
Oswaldo Acauan
71fc15a803 Add presenter upload capabilities 2017-05-03 13:36:16 -03: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
gcampes
ded1de0b40 Adds localization dropdown 2017-04-06 09:36:59 -03:00
gcampes
3ea21df973 Fix closed captions settings issue 2017-04-06 08:46:15 -03:00
gcampes
acb8b1155b Merge conflicts 2017-03-20 15:00:04 -03: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