Gabriel Carvalho de Campes
|
cf73251feb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-26 16:26:19 -02:00 |
|
Anton Georgiev
|
967be17440
|
Merge pull request #4521 from Tainan404/fix-presenter-modal-bug
[HTML5] Fix presentation upload modal bug
|
2017-10-24 17:02:47 -02:00 |
|
gcampes
|
d32330b208
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-24 11:19:58 -02:00 |
|
Tainan Felipe
|
8e2f29e667
|
changed assign of the function
|
2017-10-24 08:52:44 -02:00 |
|
Tainan Felipe
|
98b23640fd
|
solve bug no disppear modal presentation-upload
|
2017-10-12 21:12:00 -03: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 |
|
gcampes
|
fafbba06cb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-12 13:58:39 -03:00 |
|
gcampes
|
6b44504e5d
|
Adds timeout to transfer, fix css, remove logs
|
2017-10-12 11:49:50 -03:00 |
|
Oleksandr Zhurbenko
|
015ca3d719
|
Changed imports and removed 'initializeCursor.js' since it's not needed
|
2017-10-11 19:00:28 -07:00 |
|
gcampes
|
3cba60201e
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-11 18:22:36 -03:00 |
|
gcampes
|
02cdcb2562
|
changes to styles and texts in audio flow
|
2017-10-10 15:03:29 -03:00 |
|
Tainan Felipe
|
5393051d9d
|
fix errors linter
|
2017-10-10 10:06:34 -03:00 |
|
Oswaldo Acauan
|
38c8ff4abc
|
Update emoji menu to use emoji constants
|
2017-10-06 13:49:46 -03:00 |
|
Oswaldo Acauan
|
29117285ef
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into qa-design
|
2017-10-06 11:59:07 -03: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 |
|
gcampes
|
6d0d6f6651
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor
|
2017-09-29 10:52:12 -03:00 |
|
Oswaldo Acauan
|
bb94ed6b25
|
Remove unused defaultProps
|
2017-09-29 10:51:41 -03:00 |
|
Oswaldo Acauan
|
4ac554af56
|
Fix typo
|
2017-09-29 10:51:17 -03:00 |
|
Oswaldo Acauan
|
0300b854d5
|
Update emoji icon status when selected
|
2017-09-28 15:58:25 -03:00 |
|
Anton Georgiev
|
fe7130473d
|
Merge pull request #4418 from KDSBrowne/xx-02-mute-show-bug
[HTML5] - Mute button fix
|
2017-09-26 16:30:38 -04:00 |
|
gcampes
|
152527d1ab
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor
|
2017-09-26 14:25:11 -03:00 |
|
KDSBrowne
|
32187d446a
|
rename service import and remove constants
|
2017-09-25 18:18:08 -07:00 |
|
gcampes
|
62fe06516f
|
Change audio modal styles and structure. WIP
|
2017-09-25 17:28:36 -03:00 |
|
KDSBrowne
|
00ac3b1a54
|
move functions to service and rename callback
|
2017-09-25 08:39:56 -07:00 |
|
KDSBrowne
|
baa1f0955e
|
change function signature line length
|
2017-09-25 07:13:14 -07:00 |
|
Oswaldo Acauan
|
36699bedb1
|
Merge remote-tracking branch 'upstream/master' into presentation-manager-merge
|
2017-09-22 15:11:48 -03:00 |
|
KDSBrowne
|
83adf4200f
|
remove unneeded if condition
|
2017-09-21 08:03:42 -07:00 |
|
KDSBrowne
|
c6647dfc95
|
mute button wont render for listenOnly users
|
2017-09-20 17:42:35 -07:00 |
|
gcampes
|
ea637a1e49
|
first changes to audio components and services. WIP
|
2017-09-19 16:31:04 -03: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 |
|
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
|
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
|
3f773684bc
|
[HTML5] changed string id to camelCase
|
2017-08-10 10:34:34 -07:00 |
|
Klaus
|
0807960da4
|
Fix missing method for mute user
|
2017-08-04 17:05:18 -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 |
|
Klaus
|
11cf4b8d78
|
A few fixes on client
|
2017-08-01 10:41:24 -03:00 |
|
Klaus
|
9d42ca9bd7
|
Move from users to voice-users
|
2017-08-01 10:10:12 -03:00 |
|
Klaus
|
eea2c0ee8b
|
Refactor user
|
2017-07-26 11:09:07 -03:00 |
|
Oleksandr Zhurbenko
|
23263c997b
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-07-17 16:01:05 -07:00 |
|
Klaus
|
87943cb3f8
|
Change relative path of the sass to absolute
|
2017-07-17 15:21:45 -03:00 |
|
Oleksandr Zhurbenko
|
82a1ad2c8a
|
Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x
|
2017-07-14 15:43:41 -07:00 |
|
Klaus
|
54234cecac
|
Handling emoji messages
|
2017-07-13 10:15:42 -03: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 |
|
Oleksandr Zhurbenko
|
cb25c7641b
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
|
2017-06-27 12:41:12 -07:00 |
|
Anton Georgiev
|
91cfc02d13
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages
|
2017-06-26 17:21:42 -04:00 |
|
Klaus
|
b3865ef90d
|
Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis
|
2017-06-20 14:11:19 -03:00 |
|
Klaus Klein
|
c627deca36
|
Move api to api/1.1
|
2017-06-19 08:57:32 -03:00 |
|
KDSBrowne
|
b80fb29fb2
|
switch to callback ref
|
2017-06-10 12:21:13 -07:00 |
|