Commit Graph

16721 Commits

Author SHA1 Message Date
Maxim Khlobystov
177a348813 Move the Meteor configs, such as the root URL and production home directory, to NPM
This commit allows NPM to run the client in development and production modes using all the Meteor-related configs.

Run client in development:
NODE_ENV=development npm start
or
npm start

Run client in production:
NODE_ENV=production npm start

The default rootURL is http://127.0.0.1/html5client. This can be changed in .npmrc.
If prodHome is specified in .npmrc, then its value is used as Meteor's $HOME.
2017-06-15 04:20:52 +00:00
Maxim Khlobystov
be8bd7ac76 Split the start script into two commands: development and production
This commit slightly modifies the start script: we don't need to jump to another directory to run start.sh. It also introduces two modes of running the client via npm scripts: default mode (development) and production mode. I only introduce the npm scripts setup, the modes don't differ from each other yet.
2017-06-15 01:35:12 +00:00
Richard Alam
4339a48aae - handle validate token 2017-06-14 14:40:34 -07:00
Richard Alam
f430c7dce3 - create classes for guest policy 2017-06-14 14:17:54 -07:00
Richard Alam
596800e8d9 - breakdown handlers 2017-06-14 13:49:28 -07:00
JaeeunCho
3bcae276e1 HTML5 - fixed setPresenter error through HTML5 2017-06-14 13:31:49 -07:00
Ghazi Triki
1e3f91bb6e Improve code and replace deprecated parts. 2017-06-14 15:11:38 +01:00
Ghazi Triki
6eae6ce66a Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 2017-06-14 08:55:24 +01:00
Richard Alam
326ba5e481 - put message into it's own hdlr 2017-06-13 19:26:04 -07:00
Richard Alam
91c14fae53 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into refactor-akka-fsesl-for-new-messages 2017-06-13 18:10:25 -07:00
Richard Alam
e7bbfd3098 Merge pull request #4012 from riadvice/remove-css-warnings
Remove client css warnings
2017-06-13 21:07:01 -04:00
Richard Alam
23cf2266e4 - create classes for models in client 2017-06-13 17:51:04 -07:00
Richard Alam
2c4fe3f3b8 - create users state classes 2017-06-13 14:54:11 -07:00
Richard Alam
b677b4490f - partially convert some messages 2017-06-13 14:42:02 -07:00
Ghazi Triki
ed939d74a7 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
2017-06-13 17:58:46 +01:00
Oswaldo Acauan
c21abbeb58 Fix merge conflicts 2017-06-13 12:16:58 +00:00
Ghazi Triki
6df7ecf943 Keep swf cache for incremental build. 2017-06-13 12:57:16 +01:00
Ghazi Triki
b59903e714 Suppress css compile-time warnings. 2017-06-13 12:34:51 +01:00
Richard Alam
0c189059ff - see if we can simplify routing of deserialized message
- user TypeTag instead of Manifest
2017-06-12 18:15:17 -07:00
Richard Alam
080441e27b Merge pull request #4008 from ritzalam/refactor-akka-fsesl-for-new-messages
Refactor akka fsesl for new messages
2017-06-12 17:28:49 -04:00
Richard Alam
b192327d7e - put back old voice conf message as duplicate so we can have a working client 2017-06-12 14:24:23 -07:00
Richard Alam
55209b0685 - simplify deserializing of messages 2017-06-12 14:12:28 -07:00
Fred Dixon
0bae307f5e Fixed formatting of README.md 2017-06-12 17:02:12 -04:00
Ghazi Triki
0478a3f658 First pass moving breakout rooms messages to v2 format. 2017-06-12 20:32:10 +01:00
Richard Alam
ea39c516f8 - create new users class in client 2017-06-12 12:25:58 -07:00
Richard Alam
c0cc7138b3 - add new user joined voice event message 2017-06-12 11:39:53 -07:00
KDSBrowne
5963b1a49f fix lint issue 2017-06-11 20:47:17 -07:00
Fred Dixon
cc99cd20b5 Create README.md
Minor updates to the README.md
2017-06-11 21:18:26 -04:00
Richard Alam
de0001bb74 - webcam streams model 2017-06-11 18:07:19 -07:00
KDSBrowne
9eaa19e8c7 fix lint issue 2017-06-10 12:29:36 -07:00
KDSBrowne
b80fb29fb2 switch to callback ref 2017-06-10 12:21:13 -07:00
KDSBrowne
c32f614bc8 add new line to end of file 2017-06-10 12:04:52 -07:00
KDSBrowne
cb96a26717 remove string concatenation 2017-06-10 11:56:14 -07:00
Richard Alam
a9528b3172 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into refactor-akka-fsesl-for-new-messages 2017-06-10 11:28:12 -07:00
Richard Alam
bf8840448b Merge pull request #4010 from capilkey/multiuser-whiteboard-fixes
Rework setting the whiteboardId to display
2017-06-10 14:26:48 -04:00
KDSBrowne
01a250e5b7 fix console error with FindDOMNode() on unmounted component 2017-06-10 11:22:54 -07:00
Richard Alam
35b449b199 - create new status models 2017-06-10 11:11:22 -07:00
Richard Alam
e69b451a7b - cleanup 2017-06-09 13:30:52 -07:00
Chad Pilkey
28101e5623 moved setting the whiteboard id to display out of preswindow 2017-06-09 15:30:20 -04:00
KDSBrowne
ae883f1065 remove console log 2017-06-09 12:08:52 -07:00
KDSBrowne
0fc81cf63d clean up key events 2017-06-09 12:04:21 -07:00
Richard Alam
4727eb8e8e - send messages from fs to akka apps 2017-06-09 11:04:17 -07:00
KDSBrowne
65bf70b293 add overflow: visible to show userlist item dropdown menu chevron 2017-06-09 09:27:18 -07:00
Richard Alam
1ce425b647 Merge pull request #4004 from ritzalam/implement-recording-of-new-messages
Use redis scala for recording events into redis
2017-06-09 10:16:35 -04:00
Fred Dixon
b963f4a5ee Create README.md 2017-06-09 06:03:24 -04:00
Richard Alam
ea909f7a25 Merge pull request #4007 from capilkey/multiuser-whiteboard-fixes
Multi-user whiteboard fixes
2017-06-08 20:56:25 -04:00
Richard Alam
1ccf71cad7 - add new voice conf messages 2017-06-08 17:55:27 -07:00
Chad Pilkey
b4429fbf2d remove mconf branding that shouldn't be there 2017-06-08 18:39:45 -04:00
Chad Pilkey
894b5bcab6 remove unneeded redraw of the annotation history 2017-06-08 18:39:22 -04:00
Chad Pilkey
e1a50bed32 stop sending redundant slide pos updates 2017-06-08 18:38:43 -04:00