Anton Georgiev
|
b2b1321460
|
worked on validate auth_token
|
2014-05-16 19:11:03 +00:00 |
|
Anton Georgiev
|
6ecbd8d1f3
|
restricted CORS
|
2014-05-16 18:34:54 +00:00 |
|
Anton Georgiev
|
c5f5b635b5
|
receives validate_auth_token_reply
|
2014-05-15 20:42:54 +00:00 |
|
Anton Georgiev
|
9d51489c32
|
Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master
|
2014-05-15 18:44:09 +00:00 |
|
Anton Georgiev
|
d56c2c66ba
|
validate token
|
2014-05-15 18:43:17 +00:00 |
|
Anton Georgiev
|
32fea5be69
|
when redirected from the login page, go straight into sessionView
|
2014-05-15 15:54:39 +00:00 |
|
Richard Alam
|
70f8df6f50
|
Merge branch 'merge-global-audio' into merge-polling-with-master
|
2014-05-14 21:03:13 +00:00 |
|
Richard Alam
|
dffd727674
|
Merge pull request #327 from gugat/tobitmaps
convert graphics to bitmap
|
2014-05-14 17:00:39 -04:00 |
|
Richard Alam
|
3f75bf0177
|
- cleanup
|
2014-05-14 20:56:54 +00:00 |
|
Richard Alam
|
e46280c1bd
|
- filter out global audio user so we won't display it on the user's list
|
2014-05-14 20:56:18 +00:00 |
|
Anton Georgiev
|
bc09084ec2
|
moving the handler for /html5.client in its own method
|
2014-05-14 20:54:43 +00:00 |
|
Richard Alam
|
95f4746326
|
Merge branch 'merging-global-audio' of github.com:mconf/bigbluebutton into merge-global-audio
|
2014-05-14 20:47:25 +00:00 |
|
Anton Georgiev
|
32b5f70b08
|
the landing page passes some credentials to HTML5's Node app
|
2014-05-14 19:28:45 +00:00 |
|
Felipe Cecagno
|
b6855a95fa
|
looks like it's working fine now, still need more testing with a large number of users; also GLOBAL_AUDIO_7* shouldn't appear in the users window
|
2014-05-14 15:58:00 -03:00 |
|
Felipe Cecagno
|
8573537873
|
still working on improving the global audio code quality, trying to make it work properly, not there yet; we're probably going to create a new CallAgent for the user who listens to the global audio, because the implementation is still not straightforward
|
2014-05-14 14:55:08 -03:00 |
|
Anton Georgiev
|
2f41719ef0
|
tidying up
|
2014-05-14 16:00:32 +00:00 |
|
Anton Georgiev
|
82bc00cad1
|
the username is passed in correctly
|
2014-05-14 15:44:59 +00:00 |
|
Gustavo Salazar
|
748f3728ec
|
convert graphics to bitmap if pdf-swf conversion fails
|
2014-05-13 18:34:56 -05:00 |
|
Anton Georgiev
|
f76fedee6a
|
under construction, the html5 page"s html prints instead of displaying
|
2014-05-13 19:43:47 +00:00 |
|
Anton Georgiev
|
69b9ec6493
|
attempts to use the npm "cors"
|
2014-05-13 17:35:18 +00:00 |
|
Anton Georgiev
|
a45ce41d2f
|
html5 joinapi
|
2014-05-12 21:09:40 +00:00 |
|
Anton Georgiev
|
c0b60e211b
|
update README
|
2014-05-12 17:51:34 +00:00 |
|
Anton Georgiev
|
29cbc584ae
|
update README
|
2014-05-12 17:49:20 +00:00 |
|
Anton Georgiev
|
30c1fb41a5
|
added the salt to config.json
|
2014-05-12 17:45:48 +00:00 |
|
Richard Alam
|
42fcfe1055
|
Merge branch 'merging-global-audio' of github.com:mconf/bigbluebutton into merge-global-audio
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
|
2014-05-12 10:39:25 -07:00 |
|
Anton Georgiev
|
daed029107
|
Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master
|
2014-05-12 17:31:35 +00:00 |
|
Anton Georgiev
|
95a609af72
|
added Richard's bbbapi and testapi to create and join a meeting. Logs URLs but hits Error 404
|
2014-05-12 17:02:18 +00:00 |
|
Anton Georgiev
|
26a0d0bf60
|
use PORT from the config file
|
2014-05-12 15:56:14 +00:00 |
|
Anton Georgiev
|
f4f9da8522
|
introducing config.json for IP:PORT
|
2014-05-12 15:40:48 +00:00 |
|
Anton Georgiev
|
c6e55d39d7
|
resolving path error
|
2014-05-12 14:53:53 +00:00 |
|
Anton Georgiev
|
efcada9692
|
restructuring
|
2014-05-12 14:42:06 +00:00 |
|
Anton Georgiev
|
0d31de23fd
|
Rename app-local.coffee to index.coffee
|
2014-05-12 10:34:46 -04:00 |
|
Anton Georgiev
|
66bcba19d1
|
moved
|
2014-05-12 10:34:06 -04:00 |
|
Anton Georgiev
|
f35eb3dc02
|
restructuring
|
2014-05-12 14:31:52 +00:00 |
|
Richard Alam
|
aafc3846c6
|
Merge pull request #325 from gugat/bbb_version_eventsxml
bbb version in events.xml
|
2014-05-12 09:51:55 -04:00 |
|
Felipe Cecagno
|
c5da1134f0
|
more cleanup and refactoring; global audio is still buggy - at some point it duplicates a global audio consumer internally, and when the consumer disconnects, bbb-voice sends him two disconnects, which breaks the logic inside the phone module; also, when it happens, the global audio stream is never closed anymore
|
2014-05-12 00:54:02 -03:00 |
|
Felipe Cecagno
|
eb0a56bb13
|
refactoring part of the global audio server-side implementation
|
2014-05-11 22:31:35 -03:00 |
|
Richard Alam
|
8d0ad3ce19
|
- see if builds get triggered
|
2014-05-11 13:08:05 -07:00 |
|
Richard Alam
|
90d5c2ac79
|
- remote log jars to fix compile issue
|
2014-05-11 12:31:29 -07:00 |
|
Richard Alam
|
473c9941b4
|
- handle validate token message from node app
|
2014-05-11 12:30:58 -07:00 |
|
Richard Alam
|
b36c0d4c0c
|
Merge branch 'modify-format-of-json-messages' into merge-polling-with-master
|
2014-05-10 09:09:38 -07:00 |
|
Richard Alam
|
c10bc2a42c
|
- return authToken when redirect=false on JOIN API call
|
2014-05-10 08:59:03 -07:00 |
|
Richard Alam
|
283a3fa3eb
|
- modify messages
|
2014-05-09 17:49:01 -07:00 |
|
Richard Alam
|
f5b77d5292
|
Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master
|
2014-05-09 16:30:42 -07:00 |
|
Richard Alam
|
1e9c6e233e
|
- receive messages in bbb-apps
|
2014-05-09 22:21:07 +00:00 |
|
Richard Alam
|
8dfe46bfba
|
- changing message format between bbb-web and bbb-apps
|
2014-05-09 21:21:21 +00:00 |
|
Anton Georgiev
|
87155023b8
|
asking for username, the username reaches the node app
|
2014-05-09 21:21:16 +00:00 |
|
Anton Georgiev
|
ab03f11727
|
displaying the index page
|
2014-05-09 19:45:38 +00:00 |
|
Richard Alam
|
6403c53f27
|
- send more user messages to redis pubsub
|
2014-05-09 18:45:41 +00:00 |
|
Anton Georgiev
|
d14d5d56d5
|
initial commit
|
2014-05-09 14:55:25 +00:00 |
|