BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,180 Commits 13 Branches 260 Tags 1.1 GiB
81cfadbaf0
Commit Graph

151 Commits

Author SHA1 Message Date
Joao Siebel
60f25939c0 Add configuration for max length typed answer in poll 2021-04-29 13:54:39 -03:00
Ramon Souza
91661acb78 add bars to chat poll results 2021-04-15 15:32:53 -03:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll 2021-03-29 11:54:44 -04:00
Ramon Souza
6a2496fcb3 Merge remote-tracking branch 'upstream/develop' into improve-poll-function 2021-03-24 14:22:43 -03:00
Michael Zinsmeister
5fb33d5224 merge upstream develop branch into current 2021-03-23 18:01:11 +01:00
Simon Hirtreiter
07b8946b39 Merge commit develop into multiple-choice-poll 2021-03-23 09:38:45 +01:00
Maxim Khlobystov
5adb3429eb Make typed poll responses grouping case insensitive 2021-03-23 06:30:37 +00:00
Ramon Souza
70ab1f099a show poll question in chat 2021-03-18 13:13:57 -03:00
Anton Georgiev
5284a39323
Merge pull request #11671 from ramonlsouza/poll-chat-escape 
Escaping user typed poll results
 2021-03-17 16:53:19 -04:00
Ramon Souza
8a2ddd5b9f escape all <br/> 2021-03-17 11:44:09 -03:00
Ramon Souza
e450173bd0 escaping typed poll response before displaying results in chat 2021-03-17 08:26:12 -03:00
Michael Z
4d3bda1306
Merge branch 'develop' into multiple-choice-poll 2021-03-16 18:38:48 +01:00
Ramon Souza
ca345de246 add check after extractCredentials is used 2021-03-16 13:15:41 -03:00
Michael Zinsmeister
214b236701 Merge with upstream 2021-03-07 15:12:49 +01:00
Ramon Souza
043fa4bac8 fix user-sent poll result messages 2021-02-19 10:57:11 -03:00
Michael Zinsmeister
c06f7ba82c Improve log message 2021-02-11 11:13:57 +01:00
Maxim Khlobystov
ff4260dc98 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into updating-poll-ui 2021-02-08 21:41:43 +00:00
Michael Zinsmeister
eaa6f0260c Fix poll results and add locale entries 2021-02-08 10:57:39 +01:00
Simon Hirtreiter
7fde9519d4 modify poll response to use array 2021-02-04 17:54:50 +01:00
Michael Zinsmeister
462f963d08 backend mutiple choice 2021-02-04 16:13:07 +01:00
Simon Hirtreiter
4c2d2d8244 update ui for multiple choice 2021-02-04 15:43:04 +01:00
Simon Hirtreiter
1c4186d7fd update bbb-html5 for multiple choice 
Signed-off-by: Simon Hirtreiter <s.hirtreiter@hm.edu>
 2021-02-04 14:59:16 +01:00
Anton Georgiev
244a239810 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 2020-12-01-merge 2020-12-01 20:02:50 +00:00
Joao Siebel
ccda3b3a34 WIP remove callback from update methods 2020-11-26 13:23:57 -03:00
Joao Siebel
11f1a1ac47 Merge remote-tracking branch 'upstream/v2.2.x-release' into remove-callbacks 2020-11-25 10:54:18 -03:00
Joao Siebel
a244fc1acf WIP remove callback from remove operations 2020-11-24 17:44:13 -03:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Anton Georgiev
21644a1a43 Remove string interpolation for server debug and verbose logs 2020-11-23 14:35:59 -05:00
Joao Siebel
bcc1d6c880 WIP remove callback from mongo operations 2020-11-23 10:13:46 -03:00
KDSBrowne
2468ac225c return null in publishVote if user already voted 2020-11-05 17:02:31 +00:00
KDSBrowne
5076a2accd fix typo / use operator / add log 2020-11-05 14:19:36 +00:00
KDSBrowne
d2cb02b3bd prevent users from being able to send more than 1 poll vote 2020-10-28 18:33:09 +00:00
Joao Siebel
be8421db3c Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-21 13:57:17 -03:00
KDSBrowne
73f890c9d8 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling 2020-10-21 16:05:03 +00:00
KDSBrowne
e99292836f fix Match error: Expected object, got undefined in publishVote 2020-09-28 19:28:35 +00:00
KDSBrowne
d32155cc5f add new poll type | allow typed responses | update UI 2020-09-21 12:07:36 +00:00
Joao Siebel
4be9bc4c94 Adjust publishers to use auth-token-validation collection 2020-09-01 13:31:11 -03:00
Anton Georgiev
1fa426058f corrected issues related to publishing and methods 2020-02-13 14:19:29 -05:00
Anton Georgiev
a8f4827af8 utilize Meteor connection id instead of trusting client side meetingId, userId 2020-02-06 15:48:16 -05:00
Anton Georgiev
892336632f added "fields:{...}", removed most mapUser 2019-08-28 16:32:55 -04:00
Chad Pilkey
e720bcf60c fix html5 server exceptions 2019-07-06 22:48:33 +00:00
KDSBrowne
558e25ec9b fix published poll toast notifications for old polls 2019-05-22 14:44:17 +00:00
Anton Georgiev
a278594602 do not publish undefined poll 2019-05-09 18:47:38 +00:00
Anton Georgiev
eda28fff24 refrain from logging on several lines 2019-03-08 21:12:00 +00:00
Anton Georgiev
31acde212f reduce log noise for common benign events 2019-03-08 16:00:16 +00:00
KDSBrowne
a33e85b0a8 exclude dail in users from polls 2019-03-01 07:12:12 +00:00
Anton Georgiev
afa1a64e79 improve format of callbacks on collection document removal 2018-12-14 20:19:10 +00:00
João Francisco Siebel
076864ffd0 merge with master 2018-11-09 13:54:33 -02:00
João Francisco Siebel
016efcc0eb Remove ACL from client side. close #6138 2018-11-05 17:30:37 -02:00
KDSBrowne
38ae789b4a fix userlist poll heading remaining after presenter toggle 2018-10-31 17:28:35 +00:00
KDSBrowne
89a885b2df rename selectors and change to const 2018-10-31 14:03:48 +00:00
KDSBrowne
ee41c0bd93 adjust variable names / remove duplicate return 2018-10-30 13:17:40 +00:00
KDSBrowne
6c377b97bf add formatted strings 2018-10-15 19:05:50 +00:00
KDSBrowne
a955a7c0f1 replace createContainer with withTracker 2018-10-11 03:01:59 +00:00
KDSBrowne
5654f08b43 clean up code 2018-10-10 18:25:35 +00:00
KDSBrowne
7673adee1b implement live results for poll 2018-10-10 15:52:39 +00:00
KDSBrowne
0f277a66d1 replace if condition in map() with filter() 2018-10-03 11:51:04 +00:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +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
Oleksandr Zhurbenko
4af6d30f6a Switched from the broken 4commerce:env-settings package to native Meteor.settings 2018-01-07 16:24:05 -08:00
Anton Georgiev
38c87c7f75 poll voted - drop requesterId and rename event 2017-12-12 11:19:24 -05:00
Tainan Felipe
873d227819 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-13 10:35:38 -03:00
Oleksandr Zhurbenko
430ddc0d3b Removing unnecessary 2x from the collections, publishers, subscriptions and logs 2017-10-12 12:07:02 -07:00
Tainan Felipe
4bda76c5bb Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-12 15:36:52 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
337f53e72b Moved files up to api/ 2017-10-11 18:09:35 -07:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
KDSBrowne
df76d33cba set files permission to 644 2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c Fix client lint issues except those which are comment related 2017-05-16 08:37:17 -07:00
Klaus Klein
e244459514 Fix lint issues 2017-04-12 17:37:37 -03:00
Klaus Klein
63b58a7f79 Fix lint issues 2017-04-12 17:33:14 -03:00
Klaus Klein
3cd497fbbe Fix poll options remain visible on html5, closes #3806 HTML5 2017-04-12 14:00:16 -03:00
Oleksandr Zhurbenko
d8542490c7 Corrected the fix 2017-03-13 15:33:06 -07:00
Oleksandr Zhurbenko
d7b5ae3c36 Fixed permissions and some exceptions 2017-03-13 12:15:58 -07:00
gcampes
f75c73b4e6 Polish breakout rooms code 2016-11-24 17:22:04 -02:00
Gabriel Carvalho de Campes
85013eac1f Fix issues from merge 2016-11-16 15:44:05 -02:00
Gabriel Carvalho de Campes
caabead5e0 Removes unused code 2016-11-14 16:25:23 -02:00
Gabriel Carvalho de Campes
242b2f756f change publishVote method and polish poll api code 2016-10-21 16:56:42 -02:00
Gabriel Carvalho de Campes
8036678aae Changes code based on feedback 2016-10-21 15:42:43 -02:00
Gabriel Carvalho de Campes
0a873c302c Changes poll api to the correct conventions 2016-10-21 15:11:28 -02:00
Gabriel Carvalho de Campes
a7335633d4 Refactor Poll API 2016-10-21 11:21:09 -02:00
Lajellu
8e7b1d6317 HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07:00
Oleksandr Zhurbenko
3d0132685f Fixed a bug with Polls deletion from all meetings 
Which happened when we published a poll, cleared a collection, and then received a poll_stopped_message
 2016-06-27 11:30:37 -07:00
Oleksandr Zhurbenko
40cedc28bc Fixed a bug with the deletion of the Poll 
It was always undefined here
 2016-06-27 09:31:15 -07:00
Oleksandr Zhurbenko
0d1ad108f0 Fixed polling for the HTML5 viewers 2016-06-15 14:04:25 -07:00
Anton Georgiev
9cf03a8ce8 move helpers; extract nodejsApp 2016-06-01 17:18:13 +00:00
perroned
e8229b1851 Some linting 2016-05-19 19:27:49 +00:00
Anton Georgiev
eea6bc0829 adjust path of collections 2016-05-16 20:26:24 +00:00
Anton Georgiev
8d52dc1b40 Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
	bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
	bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
	bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
	bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
	bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
	bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
	bigbluebutton-html5/imports/startup/server/eventHandlers.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-16 19:54:51 +00:00
Anton Georgiev
cbef1c4abd split emitter.on; move to api 2016-05-16 19:12:49 +00:00
perroned
4adad8bb32 Changes credential passing to 1 object 2016-05-16 13:12:27 -05:00
Anton Georgiev
a263c1388b lint mostly 2016-05-16 14:35:59 +00:00
perroned
6a9ccb355f Updates callServer arguments and passes credential object 2016-05-13 11:17:00 -05:00
perroned
d966aee2d7 Fixing paths for structure 2016-05-12 14:50:02 -05:00
perroned
3b8c9c2971 Changing structure to /api/list/index.js 2016-05-12 14:04:00 -05:00
Anton Georgiev
6a92c9400b restructure modifiers and methods 2016-05-12 17:43:59 +00:00
Anton Georgiev
699fde7344 accommodate for poll and deskshare 2016-05-10 20:25:24 +00:00
perroned
57add2fa50 rename poll -> polls.js 2016-05-10 10:34:13 -05:00