KDSBrowne
0838e21674
change css classes to SASS placeholders
2017-10-03 11:00:04 -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
KDSBrowne
3eed1ec1c0
remove voice user check in userEjected.js
2017-10-03 08:45:36 -07:00
KDSBrowne
fdb38bb89c
remove console logs
2017-10-03 08:28:49 -07:00
KDSBrowne
9bad8d8d5d
add kickVoiceUser and fix presenter assign bug
2017-10-03 08:25:56 -07:00
Richard Alam
5dcb173ff9
Merge branch 'riadvice-2x-client-theme' into v2.0.x-release
2017-10-02 18:02:02 -07:00
Richard Alam
8ae38b6f5a
- format
2017-10-02 18:01:33 -07:00
Richard Alam
5b05df9562
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
2017-10-02 17:44:58 -07:00
KDSBrowne
67a621c6c5
add focus-border-offset css variable
2017-10-02 13:39:04 -07:00
KDSBrowne
0b50594b91
remove cal funtion
2017-10-02 13:36:37 -07:00
KDSBrowne
97aca5ee91
re apply userlist focus styles
2017-10-02 12:49:26 -07:00
KDSBrowne
10f95f11e1
fix merge conflicts
2017-10-02 12:37:51 -07:00
Richard Alam
e066b7de3b
Merge pull request #4444 from kepstin/bbb-20-rec-fixes
...
Correctly handle a recording start being the last event in a recording.
2017-10-02 14:17:08 -04:00
Ghazi Triki
ab93ae6c22
Fix send breakout room join url for late joiners.
2017-10-02 18:56:36 +01:00
Anton Georgiev
5c071756a0
Merge pull request #4438 from KDSBrowne/xx-04-logoutURL-issue
...
[HTML5] - logoutRouteHandler Fix
2017-10-02 13:33:54 -04:00
Anton Georgiev
48dfc178ba
Merge pull request #4423 from oswaldoacauan/presentation-manager-merge
...
[HTML5 2.0] Presentation Manager
2017-10-02 13:31:28 -04:00
Calvin Walton
e37db34eb4
Correctly handle a recording start being the last event in a recording.
...
In some unusual cases, the recording start can be the last event in the
events file, or at least have the same timestamp as such.
Add some code to check the array bounds and break if needed, so we
don't check the timestamp on the (non-existant) event after the last
event.
2017-10-02 12:31:31 -04:00
Oswaldo Acauan
230a2d5263
Fix silent changes caused by the old pr revert
2017-10-02 11:12:58 -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
KDSBrowne
bc0647ad50
fix merge conflicts
2017-09-29 12:04:27 -07:00
KDSBrowne
3b6aed34ae
check for voice user and remove if exists
2017-09-29 11:58:24 -07:00
Anton Georgiev
7c5683c866
Merge pull request #4291 from Klauswk/html5-refactor-userlist
...
[HTML5 2.0] Refactor UserList Components
2017-09-29 14:08:12 -04:00
Oswaldo Acauan
4063ae548b
Remove debug code
2017-09-29 14:47:16 -03:00
Oswaldo Acauan
f8421d4a62
Fix setPresentation on newly uploaded files
2017-09-29 14:44:18 -03:00
Ghazi Triki
f15da651c8
Correctly display users breakout rooms in users list.
2017-09-29 18:24:17 +01:00
Fred Dixon
67aec4e814
Testing builds after the switch to v2.0.x-release
2017-09-29 13:10:05 -04:00
Richard Alam
ffb58bf086
Merge pull request #4443 from ritzalam/merge-2x-mconf-to-master
...
Merge 2x-mconf branch into master
2017-09-29 12:55:22 -04:00
KDSBrowne
b2d78b4f8a
remove unused callback function
2017-09-29 09:21:04 -07:00
Richard Alam
a2d403e9fd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-2x-mconf-to-master
2017-09-29 08:41:30 -07:00
Anton Georgiev
35ed73c9ae
Merge pull request #4442 from bigbluebutton/revert-4371-presentation-uploader-2x
...
Revert "[HTML5 2.0] Presentation Manager"
2017-09-29 11:38:20 -04:00
Anton Georgiev
dbd00f3445
Revert "[HTML5 2.0] Presentation Manager"
2017-09-29 11:35:05 -04:00
KDSBrowne
6bb93ff6fd
clean up css, remove duplications
2017-09-29 07:54:24 -07:00
Oswaldo Acauan
c186840c3c
Fix current presentation being unset
2017-09-29 11:13:54 -03:00
Oswaldo Acauan
0e10fa2aa6
Fix typo
2017-09-29 11:10:35 -03:00
Oswaldo Acauan
43685f84d3
Fix intl propType and linter
2017-09-29 11:03:08 -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
19e3075dec
Add missing body check
2017-09-29 10:50:46 -03:00
Oswaldo Acauan
a5135f28e6
Renamte presentationChange handler
2017-09-29 10:50:05 -03:00
Oswaldo Acauan
c8042ce65b
Rename handlers from change to set to match akka
2017-09-29 10:42:17 -03:00
Oswaldo Acauan
54efe44345
Rename share method to set to match akka
2017-09-29 10:29:55 -03:00
Oswaldo Acauan
2a7fd5ba4d
Rename share method to set to match akka
2017-09-29 10:01:01 -03:00
Oswaldo Acauan
979514f7f1
Fix dropzone not being shown after a file drop
2017-09-29 09:50:20 -03:00
Oswaldo Acauan
d4af5bb028
Remove constraint for not deleting the current presentation
2017-09-29 09:49:42 -03:00
Oswaldo Acauan
7f5d5b8064
Change defaultFileName check to match config
2017-09-29 09:44:36 -03:00
Oswaldo Acauan
15b10b2374
Remove constraint for not deleting the current presentation
2017-09-29 09:43:49 -03:00
Oswaldo Acauan
bc6283e722
Remove constraint for not deleting the current presentation
2017-09-29 09:41:45 -03:00
Oswaldo Acauan
27b89361c0
Add missing check
2017-09-29 09:40:40 -03:00
Oswaldo Acauan
e699c342b6
Add missing suported mimes
2017-09-29 09:31:38 -03:00
Oswaldo Acauan
3e24a5e2a4
Update chat styles
2017-09-29 09:13:49 -03:00
