KDSBrowne
0f277a66d1
replace if condition in map() with filter()
2018-10-03 11:51:04 +00:00
KDSBrowne
28d46b7ca8
change formatted message id's / replace reduce with map
2018-10-03 03:24:34 +00:00
KDSBrowne
c2e785b8c4
add poll max custom fields to config
2018-10-02 23:59:45 +00:00
KDSBrowne
26404c87f7
remove button color type 'primary-outlined'
2018-10-02 23:08:32 +00:00
KDSBrowne
8c60d03ccc
add comment to explain regex
2018-10-02 20:45:41 +00:00
KDSBrowne
b241b93b8a
replace indexOf() with includes()
2018-10-02 20:30:32 +00:00
Calvin Walton
c5810ae953
Merge pull request #6113 from jfederico/record-and-playback
...
Added script for sending recording ready notifications
2018-10-02 16:17:22 -04:00
Anton Georgiev
308beb874c
Auth logged in
2018-10-02 19:53:13 +00:00
Tainan Felipe
aa24a4b3b5
change intl label for have concistency with others options
2018-10-02 16:39:09 -03:00
jfederico
90e3c6e360
Added script for recording ready notification
2018-10-02 18:57:15 +00:00
Anton Georgiev
0c8eafc2c8
Merge branch 'remove-react-router' of github.com:antobinary/bigbluebutton into remove-react-router
2018-10-02 14:47:25 +00:00
Tainan Felipe
ac09d4e69a
Add user list item and panel
2018-10-02 10:48:12 -03:00
Tainan Felipe
380b8b77e5
add intl messages
2018-09-28 15:09:15 -03:00
Tainan Felipe
cfd2e3f94b
Add create breakout rooms modal
2018-09-28 11:42:07 -03:00
KDSBrowne
b9736e9c08
fix poll results not displaying correctly for presenter
2018-09-28 14:40:53 +00:00
zhu
39adce2321
Fix compatibility in some old browser
...
Trailing comma in function arguments does not allowed until ECMAScript 2017
2018-09-28 18:30:50 +08:00
zhu
6eba10da3a
Merge branch 'v2.0.x-release' into v2.0.x-release
2018-09-28 18:19:56 +08:00
zhu
7e42bb7f02
Fix create meeting with multi presentations will set all of them to current
2018-09-28 18:04:37 +08:00
KDSBrowne
e1440de236
fix private chat not working
2018-09-27 16:27:05 +00:00
Bobak Oftadeh
f4a6947313
Moved isModerator check to the user-options container
2018-09-26 09:04:53 -07:00
Anton Georgiev
c59e789ac4
Merge pull request #6114 from Tainan404/change-overlay-color
...
Change modal overlay color for client consistency.
2018-09-25 16:48:11 -04:00
Tainan Felipe
33655682f0
change modal overlay color for client consistency
2018-09-25 17:29:54 -03:00
Richard Alam
6c7fb11304
Merge pull request #6095 from jfederico/v2.2-dev
...
Fix meeting tag in recordings migrated from BBB 1.0 and before (fixed #6089 )
2018-09-25 16:20:45 -04:00
Jesus Federico
35b2806b33
Merge pull request #5473 from mesutaydemir/patch-2
...
suggested solution timestamp issue for student role lti integration w…
2018-09-25 16:17:45 -04:00
jfederico
494f9b345a
Added jwt and java_properties gems
2018-09-25 20:11:45 +00:00
Anton Georgiev
e9e21288f3
Merge pull request #6112 from antobinary/fix-6107
...
Maintain array of user roles so they are unique
2018-09-25 15:58:31 -04:00
Anton Georgiev
faac6a0d5d
maintain array of user roles so they are unique
2018-09-25 19:24:43 +00:00
Tainan Felipe
adbf0f0098
Add breakout room button
2018-09-25 14:03:09 -03:00
KDSBrowne
491f841401
prevent user access to poll panel after presenter is lost
2018-09-25 16:54:07 +00:00
Bobak Oftadeh
7ced847512
Manage user button implemented
2018-09-25 09:31:27 -07:00
Tainan Felipe
9e496a0c93
Add fit to width feature
2018-09-25 09:47:49 -03:00
KDSBrowne
cf23293e10
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
2018-09-25 12:44:38 +00:00
João Francisco Siebel
531f739f12
Merge remote-tracking branch 'upstream/master' into ini-configuration-file
2018-09-25 09:42:24 -03:00
João Francisco Siebel
68aa29de68
rename file and add users-settings subscription
2018-09-25 09:37:45 -03:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings
...
Custom user settings
2018-09-25 08:29:48 -04:00
KDSBrowne
86d48298c6
add ability to publish / stop poll
2018-09-24 22:43:54 +00:00
João Francisco Siebel
81e6e815d9
remove .ini file
2018-09-24 14:51:07 -03:00
João Francisco Siebel
296ef8fb88
Merge remote-tracking branch 'upstream/master' into HEAD
2018-09-24 14:46:17 -03:00
Richard Alam
9c8165bfa8
Merge pull request #6103 from riadvice/api-pre-uploade-filename
...
Add `filename` attribute for file pre-upload using an URL
2018-09-24 13:30:34 -04:00
Ghazi Triki
1493470b13
Add filename attribute for file pre-upload using an URL
2018-09-24 16:41:35 +01:00
KDSBrowne
3430321a68
Merge remote-tracking branch 'upstream/master' into start-poll-01
2018-09-23 23:08:24 +00:00
KDSBrowne
8320493e6a
add ability to start custom poll
2018-09-23 23:05:13 +00:00
KDSBrowne
f3bd048d56
clean up code / add formatted messages / fix bugs
2018-09-23 22:57:03 +00:00
João Francisco Siebel
a445e0d2e5
make whiteboard tools list configurable
2018-09-21 16:42:39 -03:00
Richard Alam
9eae47dc82
Merge pull request #6099 from kepstin/bbb-20-rec-fixes
...
Recording fixes for BBB 2.0
2018-09-21 14:38:57 -04:00
Richard Alam
a30f1842ae
Merge pull request #6100 from kepstin/bbb-20-rec-fixes
...
Recording fixes for BBB 2.2
2018-09-21 14:38:40 -04:00
Calvin Walton
7a64756bba
RaP: When generating poll image, grab the presentation name correctly.
...
It was previously trying to get the presentation name from the wrong variable,
which resulted in a nil value (which was treated as a blank string in
filenames). This caused the poll images to not be inside the presentation
subdirectories, and the poll image references in the svg contained a `//`
path, which would break the recording if it was uploaded to e.g. AWS S3.
2018-09-21 14:28:24 -04:00
Richard Alam
909b8672c7
Merge pull request #6096 from riadvice/api-started-screen-sharing
...
Improve client logging for screensharing
2018-09-21 13:21:03 -04:00
João Francisco Siebel
3c3a5ae59a
implement multiUserPenOnly configuration
2018-09-21 13:42:00 -03:00
Anton Georgiev
92732a96e6
WIP removing react-router
2018-09-21 15:43:10 +00:00
