Klaus
|
745b9070f6
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-07-26 11:11:40 -03:00 |
|
Klaus
|
eea2c0ee8b
|
Refactor user
|
2017-07-26 11:09:07 -03:00 |
|
Richard Alam
|
db8487dc0c
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-07-25 17:06:20 -07:00 |
|
Richard Alam
|
a1ff444760
|
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
|
2017-07-25 16:57:26 -07:00 |
|
Ghazi Triki
|
a31452c17f
|
Update glow effect colour.
|
2017-07-25 23:11:12 +01:00 |
|
Anton Georgiev
|
69824f5be2
|
Merge pull request #4107 from Klauswk/fix-presenter-rule
[HTML5 2.0] Fix presenter assigning
|
2017-07-25 15:02:14 -04:00 |
|
Klaus
|
9cd3ac3f87
|
Merge branch 'bbb-2x-mconf' into fix-presenter-rule
|
2017-07-25 13:43:26 -03:00 |
|
Klaus
|
22d80b605f
|
Fix presenter assign
|
2017-07-25 13:21:07 -03:00 |
|
Anton Georgiev
|
1bdeb248c1
|
Merge pull request #4117 from Klauswk/html5-2x-fix-audio
[HTML5 2.0] Fix join audio on the HTML5 client 2.0
|
2017-07-25 10:30:43 -04:00 |
|
Ghazi Triki
|
2939ed3a53
|
Update TilteWindow close button skin.
|
2017-07-25 15:29:14 +01:00 |
|
Ghazi Triki
|
f086fb1abe
|
Fix FileUploadWindow and make it close when clicking on the close button.
|
2017-07-25 15:28:52 +01:00 |
|
Klaus
|
51f7161e45
|
Flat breakouts
|
2017-07-25 10:51:33 -03:00 |
|
Fred Dixon
|
b13390f44c
|
Merge pull request #4138 from bigbluebutton/bump-version
Update index.html
|
2017-07-25 07:23:45 -06:00 |
|
Fred Dixon
|
ff365120cc
|
Update index.html
Bump version to 2.0-dev
|
2017-07-25 07:23:26 -06:00 |
|
Ghazi Triki
|
528acab82e
|
Updated toolbar logo to make aligned with meeting name label.
|
2017-07-25 14:10:44 +01:00 |
|
Klaus
|
b1bb4a6866
|
Flat poll
|
2017-07-25 09:26:45 -03:00 |
|
Ghazi Triki
|
dc014b1a11
|
Fix PopUpButtonSkin border colors.
|
2017-07-25 11:58:54 +01:00 |
|
Ghazi Triki
|
d4d737dfd2
|
Implement new design for quick links buttons.
|
2017-07-25 11:35:54 +01:00 |
|
Ghazi Triki
|
e8fa7b0d49
|
Updated main toolbar help icon style.
|
2017-07-25 10:54:18 +01:00 |
|
Richard Alam
|
c71c018e1f
|
Merge branch 'capilkey-hide-unneeded-components' into bbb-2x-mconf
|
2017-07-24 18:16:37 -07:00 |
|
Richard Alam
|
df99ac9689
|
Merge branch 'hide-unneeded-components' of https://github.com/capilkey/bigbluebutton into capilkey-hide-unneeded-components
|
2017-07-24 18:06:30 -07:00 |
|
Richard Alam
|
14218464b9
|
Merge pull request #4136 from ritzalam/put-back-old-messages
Fix compile issue with bbb-video and video-broadcast app
|
2017-07-24 21:05:31 -04:00 |
|
Richard Alam
|
5afcbe539b
|
- put back old messages as they are still used by video-broadcast and bbb-video. We
can remove them once we've worked on those 2 apps.
|
2017-07-24 18:02:45 -07:00 |
|
Klaus
|
916713b1df
|
Add safe true, preventing mess with the arrays, and refactored the shapes
|
2017-07-24 17:32:35 -03:00 |
|
Chad Pilkey
|
6be3863f33
|
hide some unrequired UI elements
|
2017-07-24 15:42:29 -04:00 |
|
Klaus
|
97b38fb0e6
|
Presentation reflects akkaApps
|
2017-07-24 15:46:53 -03:00 |
|
Richard Alam
|
76a497ba3a
|
Merge branch 'antobinary-late-joiner-webrtc-screenshare-updates' into bbb-2x-mconf
|
2017-07-24 10:59:59 -07:00 |
|
Klaus
|
78a6fee038
|
Slides reflecting akkaApps
|
2017-07-24 14:50:44 -03:00 |
|
Richard Alam
|
636ceea82c
|
Merge branch 'late-joiner-webrtc-screenshare-updates' of https://github.com/antobinary/bigbluebutton into antobinary-late-joiner-webrtc-screenshare-updates
|
2017-07-24 10:50:25 -07:00 |
|
Richard Alam
|
29a8539b12
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-07-24 10:48:55 -07:00 |
|
Richard Alam
|
73ca0da708
|
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
|
2017-07-24 10:41:36 -07:00 |
|
Ghazi Triki
|
a6d8cbdd92
|
Minor updates to icons.
|
2017-07-24 18:34:20 +01:00 |
|
Anton Georgiev
|
76f42d420a
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into late-joiner-webrtc-screenshare-updates
|
2017-07-24 13:26:56 -04:00 |
|
Anton Georgiev
|
0c8941185c
|
drop unnecessary class WebRTCConnection
|
2017-07-24 13:25:47 -04:00 |
|
Ghazi Triki
|
cd478ecb49
|
Fix borderThickness property name.
|
2017-07-24 14:10:14 +01:00 |
|
Ghazi Triki
|
fed90fdf90
|
Update top toolbar buttons with new colour styles with the correct states.
|
2017-07-24 12:58:28 +01:00 |
|
Richard Alam
|
e35f2fd1d3
|
Merge pull request #4128 from ritzalam/recording-status-change
- receive recording status messages from server
|
2017-07-22 09:58:00 -04:00 |
|
Richard Alam
|
544943b16b
|
- receive recording status messages from server
|
2017-07-22 06:56:37 -07:00 |
|
Anton Georgiev
|
de272d316c
|
Merge pull request #4120 from Klauswk/html5-2x-fix-public-messages
[HTML5 2.0] Fix Welcome Messages
|
2017-07-22 06:28:23 -04:00 |
|
Richard Alam
|
9861b9b229
|
Merge pull request #4127 from ritzalam/record-messages-2x
record message
|
2017-07-21 23:28:45 -04:00 |
|
Richard Alam
|
10c4846b92
|
- provide a way to filter messages we want to record
|
2017-07-21 20:25:41 -07:00 |
|
Chad Pilkey
|
3eeb8e2444
|
Merge pull request #4125 from capilkey/cleanup-old-1.1-apps
Cleanup old 1.1 user messages
|
2017-07-21 16:06:08 -04:00 |
|
Chad Pilkey
|
d68229f182
|
fix the resize and move data storage
|
2017-07-21 15:53:43 -04:00 |
|
Chad Pilkey
|
c8f38ebae1
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps
|
2017-07-21 14:30:51 -04:00 |
|
Chad Pilkey
|
043c55e0bf
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps
|
2017-07-21 13:55:06 -04:00 |
|
Ghazi Triki
|
b82e04fb7d
|
Updated style with new colours and fixed some icons.
|
2017-07-21 15:03:24 +01:00 |
|
Ghazi Triki
|
ef4da9e29d
|
Fix glow filter for MuteMeButton.
|
2017-07-21 15:01:18 +01:00 |
|
Richard Alam
|
d1cc692791
|
Merge branch 'ritzalam-work-on-meeting-lifcycle-2' into bbb-2x-mconf
|
2017-07-20 18:19:16 -07:00 |
|
Richard Alam
|
ba2e99ed0e
|
Merge branch 'work-on-meeting-lifcycle-2' of https://github.com/ritzalam/bigbluebutton into ritzalam-work-on-meeting-lifcycle-2
|
2017-07-20 18:19:00 -07:00 |
|
Richard Alam
|
80c903f009
|
Merge branch 'antobinary-late-joiner-webrtc-screenshare' into bbb-2x-mconf
|
2017-07-20 17:53:08 -07:00 |
|