Commit Graph

62 Commits

Author SHA1 Message Date
Lyubomir Marinov 2f01746c55 Remove duplication, simplify, comply with coding style 2017-01-10 13:06:18 -06:00
Ilya Daynatovich ad9bdf4dd2 Fix url params stripping 2017-01-04 19:01:25 +02:00
Ilya Daynatovich c2757469a5 Merge branch 'master' into BeatC-moving-conference-init-to-react-1 2017-01-04 17:53:13 +02:00
Ilya Daynatovich a99bbe67ab Clean up Conference component 2017-01-04 17:47:27 +02:00
Ilya Daynatovich e716c1738c Fix lint errs 2017-01-04 17:46:47 +02:00
Ilya Daynatovich 3190bfa058 Move redundant code from app.js 2017-01-04 17:45:52 +02:00
Ilya Daynatovich c570b80d7b moved app initialization to react app 2017-01-04 17:45:52 +02:00
damencho 6006333ccf Adds an option to show watermark only for guests. 2017-01-03 17:30:57 -06:00
Дамян Минков 677eef12dd Updates use of showJitsiWatermark. 2016-12-30 12:07:54 -06:00
Ilya Daynatovich 5bb53ba036 Fix issue with watermarks 2016-12-30 13:34:03 +02:00
Ilya Daynatovich 984a6519fc Move welcome page logic from jquery to react 2016-12-15 07:55:43 -06:00
Ilya Daynatovich c3428e8213 Split React components out of index.html 2016-11-24 02:21:02 -06:00