Oswaldo Acauan
b7823c406c
Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods
2018-07-24 17:20:37 -03:00
João Francisco Siebel
9e2d517052
add user verification and narrow down search
2018-04-25 11:29:55 -03:00
João Francisco Siebel
742303015d
handle only HTML5 direct messages ignoring flash messages
2018-04-24 15:42:59 -03:00
Tainan Felipe
be0ce09af0
pass message for allowed functions
2018-04-23 09:30:14 -03:00
Tainan Felipe
a5ddb4bd17
rename function of skipFlashDirectEvent to processForHTML5ServerOnly
2018-04-13 16:26:58 -03:00
Tainan Felipe
d9f90943ee
Skip direct messages of flash client
2018-04-12 13:25:54 -03:00
Oleksandr Zhurbenko
0c8f1a3bfd
Adjusted multi-user for 2.1
2018-04-09 16:18:49 -07:00
Tainan Felipe
4bda76c5bb
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
2017-10-12 15:36:52 -03:00
Tainan Felipe
e74c44dd9d
fix errors linter
2017-10-12 14:02:46 -03:00
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
251bd22738
PR review fixes
2017-09-06 12:36:52 -07: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
KDSBrowne
1ba4be58fd
removed unused functions
2017-08-28 09:14:18 -07:00
Oleksandr Zhurbenko
cd4150ebf5
Adjusted permissions for the multi-user cursorMove
2017-08-09 20:59:53 -07:00
Klaus
86d3e27d47
Merged info with anton's branch
2017-07-03 12:05:35 -03:00
Oswaldo Acauan
e6412275a6
Linter auto fix
2017-06-02 19:25:02 +00:00
Oswaldo Acauan
c7b62a209c
Refactor Meeting API
2016-10-21 16:27:47 +00:00
Oswaldo Acauan
6676feb933
Fix bug on the clearChats and addChat modifiers
2016-10-21 11:56:03 +00:00
Oswaldo Acauan
79cdf636eb
Rewrite Redis related classes
2016-10-18 12:03:51 +00:00
Laily Ajellu
f0cdbfaf2e
Fixed merge conflicts
2016-08-23 16:45:28 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
Anton Georgiev
6a984c2b68
adding captions support in html5 (part1)
2016-07-14 12:03:30 -07:00
Oleksandr Zhurbenko
bcfa3d41ec
Linting
2016-07-08 16:13:26 -07:00
Gabriel Carvalho de Campes
537d8753fe
Merge remote-tracking branch 'origin/master' into router-changes
...
* origin/master:
upgrade sip.js to 0.7.5
Moved polling files back to components folder
Fixed a small issue with reduce() in the poll annotation
Made polling buttons accessible
Updated packages and fixed some of the warnings introduced by React 15.2.0
Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
Centering polling buttons
Title and calculated styling for the polling UI
Mark open chat as active
Remove some old code
Changes the way user actions are rendered
Replaced polling under the whiteboard
Solve issues from github comments
Remove color-generator because it is not being used
polish code
Updates the userlist
Conflicts:
bigbluebutton-html5/imports/ui/components/app/container.jsx
2016-07-08 11:59:05 +00:00
Gabriel Carvalho de Campes
6c4eae35bb
Adds link to meteor issue on comment, remove unused import
2016-07-07 16:15:12 +00:00
Gabriel Carvalho de Campes
e8f1a877c4
Remove logs, and add some removed code back
2016-07-07 14:46:18 +00:00
Gabriel Carvalho de Campes
ac3353d855
Changes Router in order for the livereloading to work again
2016-07-07 14:01:40 +00:00
Oleksandr Zhurbenko
83fff53269
Replaced polling under the whiteboard
2016-06-29 15:00:06 -07:00
Oleksandr Zhurbenko
390935e304
Changed 'let' to 'const' where it was possible and adjusted imports
2016-06-27 14:48:46 -07:00
Oleksandr Zhurbenko
8b4747a89d
Fixed all the 120+ linter warnings
2016-06-27 11:24:37 -07:00
Anton Georgiev
9cf03a8ce8
move helpers; extract nodejsApp
2016-06-01 17:18:13 +00:00
