KDSBrowne
04b948c281
remove unneeded comment
2017-01-09 08:40:16 -08:00
KDSBrowne
2b6400379b
move joinListenOnly from component to container
2017-01-09 08:35:25 -08:00
Lajellu
a7afa00b0f
HTML5 - Emojis - Remove the extra icons added in by the previous merge
2016-12-21 09:01:33 -08:00
Lajellu
9a77ace223
Merge remote-tracking branch 'upstream/master' into completeEmojiIcons
2016-12-21 09:00:12 -08:00
Lajellu
8389d2b2e3
HTML5 - comment out Join Video to fix DOM positioning
...
The reason there was so much space between `Join Audio` and `Status` was that `Join Video` was in between. Join Video was removed
to fix this positioning.
Leave Audio and Join Video icons are being hidden, which still holds the space for that component in the DOM, but does not show
it.
`Join Audio` should not be commented out because the icon is displayed at certain times.
`Join Video` can be commented out for now for UI purposes and put back when it's implemented.
2016-12-20 12:27:16 -08:00
Matthew Marangoni
ba19b1443a
Update new audio and mute icons
2016-12-20 11:45:48 -08:00
Lajellu
b3f1d9f804
HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues
2016-12-20 10:06:01 -08:00
Lajellu
98db4c8eec
HTML5 - fixes merge conflicts bw master and this branch
2016-12-20 09:18:24 -08:00
KDSBrowne
5d328560a1
added suggestion
2016-12-15 08:15:04 -08:00
KDSBrowne
a4fc8440ea
cleaned up
2016-12-14 16:02:08 -08:00
KDSBrowne
ae70ce1116
temporarily hide the Cam button
2016-12-14 11:55:35 -08:00
Matthew Marangoni
0daa2798d5
updated with master/fixed merge conflicts
2016-12-09 12:39:48 -08:00
Matthew Marangoni
7e68432c29
Merge remote-tracking branch 'upstream/master' into html5-stun-audio
2016-12-09 12:30:33 -08:00
Matthew Marangoni
76f5de8722
mute button container and component improvements
2016-12-08 10:11:49 -08:00
Anton Georgiev
aaecd871b6
Merge pull request #3491 from KDSBrowne/Audio-Components-Breakdown
...
Added audio-setting components
2016-12-07 10:34:49 -05:00
Matthew Marangoni
6f300b4832
isolated mute button, reduced button movement on actions bar, improved join listen only
2016-12-06 13:15:23 -08:00
Oswaldo Acauan
7971541282
Update emoji icons to reflect the names on the font release v7
2016-12-05 18:49:34 -02:00
Oswaldo Acauan
09f97377a8
Remove extra div from actions-bar
2016-12-05 18:41:24 -02:00
Oswaldo Acauan
4c55ea5732
Match actions-bar and navbar paddings
2016-12-05 18:36:57 -02:00
KDSBrowne
d220c17bba
removed component name duplication
2016-12-05 09:07:25 -08:00
Anton Georgiev
c98813e7b3
Merge pull request #3460 from mmarangoni/html5-stun-audio
...
Mute, Unmute, Leave Audio
2016-11-18 17:03:13 -05:00
Matthew Marangoni
c9221c94f3
removed unecessary import statements
2016-11-18 13:35:02 -08:00
Matthew Marangoni
aa65afffa4
adjusted to meet component/container structure conventions and simplify code
2016-11-18 13:24:59 -08:00
Matthew Marangoni
0abcc06bfc
linting fixes & updated based on feedback
2016-11-15 13:00:28 -08:00
KDSBrowne
cba6e75735
cleaning up
2016-11-14 18:48:56 -08:00
Matthew Marangoni
807f434d72
fixed an error with exit audio
2016-11-11 14:11:00 -08:00
Matthew Marangoni
482fc97388
Added mute/unmute/join listen only/leave audio features to join audio modal
2016-11-11 13:09:34 -08:00
KDSBrowne
2296a122f5
Actions button only available to Presentor
2016-11-07 10:19:00 -08:00
Matthew Marangoni
7fb492894e
Added exiting audio
2016-10-25 14:16:40 -07:00
Matthew Marangoni
0d3f231ac1
Merge remote-tracking branch 'upstream/master' into html5-stun-audio
2016-10-24 09:08:13 -07:00
JaeeunCho
6d1823f2c7
HTML5 - fixed linebreak with lint
2016-10-17 14:29:00 -07:00
Anton Georgiev
11f0c2da03
Merge pull request #3401 from KDSBrowne/Localization-update
...
Localization update #1
2016-10-13 10:44:13 -04:00
Matthew Marangoni
918ae83fc8
Added initial Join Audio modal
2016-10-11 12:04:50 -07:00
Lajellu
1f114eb908
Merge remote-tracking branch 'origin/EmojiReworked' into EmojiReworked
2016-10-06 13:44:03 -07:00
Lajellu
63c9f94b54
HTML5 - changes status names, and user list sorting logic to match flash client
2016-10-06 13:42:37 -07:00
KDSBrowne
b811f01ad1
Fixed lint issues
2016-10-03 08:10:20 -07:00
KDSBrowne
d2cc6e1b18
Localization update
2016-10-02 08:46:15 -07:00
Anton Georgiev
27c1896629
Merge branch 'EmojiReworked' of github.com:lajellu/bigbluebutton into merge-pr
2016-09-28 23:47:28 +00:00
JaeeunCho
3962349517
HTML5 - Settings : changed to label
2016-09-26 14:55:33 -07:00
Lajellu
7d724022e4
HTML5 - changes folder name emojiMenu to emoji-menu for uniform style in project
2016-09-26 14:06:41 -07:00
Lajellu
c68ad3240d
HTML5 - adds Emoji showing up on user list
2016-09-26 13:29:44 -07:00
JaeeunCho
b0947c85c1
HTML5 - Settings : added description messages and changed to label
2016-09-22 13:51:00 -07:00
JaeeunCho
f64d4b5221
HTML5 - Actions button : change lab to label and location
2016-09-21 12:22:48 -07:00
JaeeunCho
cd38051d5e
HTML5 - Actions button : change lab to label and location
2016-09-21 12:15:32 -07:00
JaeeunCho
ce9f1c3dce
HTML5 - Actions button : add messages
2016-09-21 11:29:31 -07:00
Lajellu
88b05d2cb9
HTML5 - adds Emoji considering dropdown rewrite by Oswaldo
2016-09-21 11:03:18 -07:00
JaeeunCho
cbf8e88e68
HTML5 Actions button
2016-09-13 12:46:12 -07:00
Oleksandr Zhurbenko
d9ddbfbda6
Cleanup, linting, fixed css modules' imports
2016-08-20 18:14:12 -07:00
Oleksandr Zhurbenko
d510907179
Upgraded Meteor to 1.4
2016-07-27 14:50:35 -07:00
Oswaldo Acauan
9b53090c81
Change Auth service to be a singleton class
2016-07-11 13:45:24 +00:00
Oswaldo Acauan
1c0132ed5b
Merge after git conflict/lost object
2016-07-11 12:34:58 +00:00
Oleksandr Zhurbenko
8b4747a89d
Fixed all the 120+ linter warnings
2016-06-27 11:24:37 -07:00
Oswaldo Acauan
29c09afee9
Add basic nav-bar styles
2016-05-20 13:29:55 -03:00
Oswaldo Acauan
0e9b8f7eff
Add basic styles for actions-bar
2016-05-20 13:17:21 -03:00
Oswaldo Acauan
99c2e94c80
Remove unnecessary extension on imports
2016-05-20 10:46:30 -03:00
Oswaldo Acauan
d81cb28f35
Add new component button and some basic styles
2016-05-20 10:37:19 -03:00
Oswaldo Acauan
2d57d7cbed
Rename Actionsbar and Navbar to ActionsBar and NavBar
2016-05-04 11:48:53 -03:00