Commit Graph

18242 Commits

Author SHA1 Message Date
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
a3f74842b4 Bug fixes 2017-09-26 16:45:33 -03:00
Oswaldo Acauan
3a4745d590 Fix error while changing the current presentation 2017-09-25 17:49:54 -03:00
Oswaldo Acauan
cca1e58167 Move default presentation name to config file 2017-09-22 17:49:11 -03:00
Oswaldo Acauan
43c2102adf Fix conversion status messages 2017-09-22 17:45:31 -03:00
Oswaldo Acauan
dd83d213fa Fix missing conversion handlers 2017-09-22 17:43:07 -03:00
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03:00
Anton Georgiev
76ff1b2552 Merge pull request #4371 from oswaldoacauan/presentation-uploader-2x
[HTML5 2.0] Presentation Manager
2017-09-22 13:27:54 -04:00
Richard Alam
47c5f962d7 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-09-22 10:02:55 -07:00
Richard Alam
29facc2efa Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-22 10:02:07 -07:00
Anton Georgiev
a356ef907c Merge pull request #4420 from Gcampes/fix-breakout-logout
[HTML5] Fix breakout logout
2017-09-22 10:58:48 -04:00
gcampes
b17f2ebe41 fix proptypes for intl 2017-09-22 11:33:12 -03:00
Ghazi Triki
9b997392f0 Added new logoutTImer feature. 2017-09-21 20:12:59 +01:00
gcampes
56e9fedb45 removes console.log 2017-09-21 15:51:58 -03:00
gcampes
06400c7034 fix breakout logout 2017-09-21 15:50:21 -03:00
Richard Alam
e8f3205683 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-20 12:50:19 -07:00
Richard Alam
5ee84ae4ba Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-09-20 12:43:37 -07:00
Anton Georgiev
90db7326b8 Merge pull request #4415 from KDSBrowne/x2.0.9-clear-chat-bug
[HTML5] - Fix clear chat feature
2017-09-20 14:13:05 -04:00
Anton Georgiev
3682eb0105 Merge pull request #4417 from antobinary/add-bowser-js
[HTML5 Client] Include bowser.js in html5 client for browser detection in webrtc
2017-09-20 10:28:53 -04:00
Anton Georgiev
7372d708ad include bowser.js in html5 client for browser detection in webrtc 2017-09-20 09:59:11 -04:00
Anton Georgiev
e22da926bb Merge pull request #4414 from KDSBrowne/x2.0.8-stun-turn-delete
[HTML5] - Remove requestStunTurn
2017-09-19 15:53:08 -04:00
Anton Georgiev
bf5bbb1699 Merge pull request #4345 from OZhurbenko/presenter-functionality-2x
HTML5 - Initial Presenter/Multi-user whiteboard support
2017-09-19 15:47:23 -04:00
KDSBrowne
2e1fb712a1 use userId instead of username 2017-09-19 12:01:02 -07:00
KDSBrowne
bd8c57eb45 remove log messages 2017-09-19 11:57:08 -07:00
KDSBrowne
6b6d431a5b switch variable positions in object 2017-09-19 11:55:32 -07:00
Ghazi Triki
b934a3bffa Added a new layout named "Presentation + Users" 2017-09-19 19:36:16 +01:00
KDSBrowne
9b3bb04a90 fix clear chat feature 2017-09-19 10:39:13 -07:00
Ghazi Triki
1d3fd41d5b Update chat save format. 2017-09-19 18:30:26 +01:00
Anton Georgiev
feba68d1a9 Merge pull request #4408 from antobinary/logging-options
[Flash Client 2.0] Add client log on layout change
2017-09-19 13:22:29 -04:00
Ghazi Triki
54823e8ca6 Add a new option to enable/disable quote display. 2017-09-19 18:00:37 +01:00
Ghazi Triki
97c06e2e5c Update loading text. 2017-09-19 17:32:05 +01:00
Ghazi Triki
b40f335fe7 Select only quote in loading screen. 2017-09-19 17:07:14 +01:00
KDSBrowne
4388fc4b0f remove requestStunTurn 2017-09-19 08:42:10 -07:00
Ghazi Triki
31815b5ee0 Improved loading screen by adding quotes. 2017-09-19 15:19:56 +01:00