BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,243 Commits 13 Branches 260 Tags 1.1 GiB
3366bc32b0
Commit Graph

53 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
2de02c4f8d Linting 2018-01-07 16:25:56 -08:00
Oleksandr Zhurbenko
4af6d30f6a Switched from the broken 4commerce:env-settings package to native Meteor.settings 2018-01-07 16:24:05 -08:00
Tainan Felipe
6845aed0e0 localize message from when clear the chat 2017-11-21 16:31:53 -02: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
Anton Georgiev
18d9fb947e Merge pull request #3986 from OZhurbenko/fix-chat-links 
HTML5 - Chat links fix
 2017-06-06 09:49:32 -04:00
Oleksandr Zhurbenko
47c1ac6083 Fixed links in the chat 2017-06-03 12:11:49 -07: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
b432ffd68b Change to fetch from chat system id, issue #3792 HTML5 2017-04-10 11:04:27 -03:00
Klaus Klein
6727f14ab7 Fix multiple welcome messages, issue #3792 HTML5 2017-04-10 09:55:22 -03:00
Oleksandr Zhurbenko
07502ca172 Linting 2017-03-13 15:35:04 -07: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
Oswaldo Acauan
2cf4bd3f5a Merge conflicts 2016-11-10 15:13:02 +00:00
Oswaldo Acauan
e1421566be Merge branch 'master' into refactor-meetings-api 
* master: (22 commits)
  - fix check for breakout room  - insert breakout metadata into events.xml  - delete breakout metadata from redis
  Rename meteor method on the client
  HTML5 - fixed linebreak with lint
  HTML5 - fixes fullscreen toggle to un-fullscreen
  Monitoring for number of user is not triggered for breakout rooms.
  Updated bbb-record rules to detect recording directories.
  Added new property redirectOnJoin to CreateBreakoutRoomsRequest.
  Added redirect property to RequestBreakoutJoinURL.
  Fix handler for 'get_whiteboard_shapes_reply' not calling the cb
  Store breakout meeting info in redis under "meeting:breakout" key instead of "meeting:info"
  Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
  Re-enable recording option for breakout rooms.
  Store breakout room externalMeetingID to be used for generating join URL.
  Store breakout room sequence in akka-apps and bbb-web.
  Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller.
  Deleted unused imports from bigbluebutton-apps and bigbluebutton-web
  Replace the deprecated shaHex DigestUtils by sha1Hex.
  Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms.
  Breakout rooms are now sorted by their sequence number.
  Added sequence property breakout room.
  ...
 2016-10-24 11:14:14 +00:00
Oswaldo Acauan
8874c15e9f Rename meteor method on the client 2016-10-21 18:47:33 +00:00
Oswaldo Acauan
8e27e35e07 Rever wrong changes on chat handler parameters 2016-10-21 17:10:27 +00:00
Oswaldo Acauan
d1786d61a6 Revert wrong changes on chat handler name 2016-10-21 17:08:43 +00:00
Oswaldo Acauan
c590f3ffd9 Merge branch 'rewrite-queue-handler' into refactor-meetings-api 
* rewrite-queue-handler:
  Remove left over debug
  Fix chat being always inserted when the server start
  Add debug message when handler is completed with errors
 2016-10-21 16:57:01 +00:00
Oswaldo Acauan
85a1a44cc9 Remove left over debug 2016-10-21 16:55:54 +00:00
Oswaldo Acauan
e67c127e8f Fix chat being always inserted when the server start 2016-10-21 16:54:17 +00:00
Oswaldo Acauan
c7b62a209c Refactor Meeting API 2016-10-21 16:27:47 +00:00
Oswaldo Acauan
6676feb933 Fix bug on the clearChats and addChat modifiers 2016-10-21 11:56:03 +00:00
Oswaldo Acauan
a76ab6e7e6 Refactor API Slides 2016-10-21 11:41:17 +00:00
Oswaldo Acauan
b04e071389 Revert Meteor version to stable release 2016-10-19 17:54:09 +00:00
Oswaldo Acauan
077cf8471c Change filenames based on slack feedback 2016-10-19 17:49:38 +00:00
Oswaldo Acauan
1d30281cf2 Refactor server Chat API 2016-10-19 12:18:47 +00:00
Laily Ajellu
f0cdbfaf2e Fixed merge conflicts 2016-08-23 16:45:28 -07:00
Lajellu
8e7b1d6317 HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07:00
Oleksandr Zhurbenko
331ad1e3c4 Fixed a bug when we couldn't retrieve the initial Chat history 
Happened when meeting and chat messages appeared before the Meteor joined
 2016-07-18 10:42:53 -07:00
Oswaldo Acauan
d1f2614d00 Fix merge conflicts 2016-07-05 16:50:14 +00:00
Oswaldo Acauan
55538202d6 Change chat message timestamp from string to int 2016-07-04 18:34:36 +00:00
Oleksandr Zhurbenko
8b4747a89d Fixed all the 120+ linter warnings 2016-06-27 11:24:37 -07:00
Richard Alam
424de0f2f9 Merge pull request #3161 from antobinary/captions 
recover caption funct; prepare akka-apps for captions on bbb-html5
 2016-06-02 17:02:03 -04:00
Oswaldo Acauan
b77b8ce971 Fix Welcome message not being parsed 2016-06-02 16:34:17 -03:00
Oswaldo Acauan
f204e6007a Sanitize chat messages client and server-side 2016-06-02 16:08:17 -03:00
Oswaldo Acauan
d642cb1c99 Add chat send message functionality 2016-06-02 15:40:27 -03:00
Anton Georgiev
9cf03a8ce8 move helpers; extract nodejsApp 2016-06-01 17:18:13 +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
perroned
98aae7aade Changes collection imports 2016-05-16 13:05:44 -05:00
Anton Georgiev
a263c1388b lint mostly 2016-05-16 14:35:59 +00:00