Commit Graph

34 Commits

Author SHA1 Message Date
Klaus Klein
1db64e2bb7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl
* 'master' of https://github.com/bigbluebutton/bigbluebutton:
  HTML5 - removed 'lockedLayout' variable
  Update README.md
  Improved the detection if IP addresses in bbb-conf
  Removing event listeners in handleHide
  Fixed click listeners' initialization
  Bump version number to 1.1.0
  Update BigBlueButton.html
  remove new lines being rendered in log/development.log
  remove new operator
  add suggested changes
  HTML5 - put the order at media class
  HTML5 - removed unused media query
  HTML5 - removed unused media query
  HTML5 - fixed order and slide control position
  change file permission to 644
  fix new lint issues
  set files permission to 644
  Fix client lint issues except those which are comment related
  HTML5 - fixed fixed closed-caption display
  HTML5 - fixed closed-caption display
2017-06-01 16:38:58 -03:00
Klaus Klein
de3a5e9cb6 Mostly working, still problems with user subs 2017-06-01 10:12:11 -03:00
Klaus Klein
a4c8ff493a Code refactored 2017-05-31 14:54:43 -03: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
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
perroned
587627562c Fixes some api structure 2016-05-10 10:23:22 -05:00