perroned
|
abe150cd88
|
Added some whitespace
|
2014-06-24 11:20:18 -07:00 |
|
perroned
|
ddde558da2
|
Fixed up collection declarations
|
2014-06-24 11:18:25 -07:00 |
|
perroned
|
34e62b838e
|
Moved function
|
2014-06-24 11:11:51 -07:00 |
|
perroned
|
13df1b475b
|
Working on chat UI
|
2014-06-24 11:11:26 -07:00 |
|
perroned
|
7412774b5c
|
Added chatbar CSS
|
2014-06-24 11:10:43 -07:00 |
|
perroned
|
28d7358f67
|
Moved a file to the global namespace
|
2014-06-24 11:10:02 -07:00 |
|
perroned
|
067463b866
|
beginning work on the chat UI
|
2014-06-24 06:46:42 -07:00 |
|
perroned
|
30694171f5
|
Altered some values for default view
|
2014-06-24 06:46:14 -07:00 |
|
perroned
|
c282b46b4c
|
Cleaning up the code a bit, placed rendering logic inside individual templates to be a bit neater
|
2014-06-23 12:54:17 -07:00 |
|
perroned
|
ac61ea7a24
|
Added sample whiteboard entry
|
2014-06-23 12:51:54 -07:00 |
|
perroned
|
c76378edff
|
Added logout page
|
2014-06-23 12:11:57 -07:00 |
|
Anton Georgiev
|
31ff2121ab
|
logging out
|
2014-06-23 17:55:54 +00:00 |
|
Anton Georgiev
|
43c1eae0e5
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
|
2014-06-23 17:48:59 +00:00 |
|
Anton Georgiev
|
5532f3c766
|
implementing user logout
|
2014-06-23 17:48:11 +00:00 |
|
perroned
|
cf2215db07
|
Adding some functionality for logout button
|
2014-06-23 10:44:09 -07:00 |
|
perroned
|
6005ea000e
|
Fixed kicking users... for now, until things change again
|
2014-06-23 10:20:08 -07:00 |
|
perroned
|
63a3a4c737
|
Created a helper and rewrote logic to determine if user is sharing audio/video
|
2014-06-23 09:58:30 -07:00 |
|
perroned
|
32ddd86438
|
Fixed spelling issue
|
2014-06-23 06:24:12 -07:00 |
|
perroned
|
70714bd320
|
Fixed some helpers and templates to match data format
|
2014-06-23 06:22:30 -07:00 |
|
perroned
|
466787ab47
|
Added new line feeds to files
|
2014-06-23 06:21:03 -07:00 |
|
perroned
|
b63a1cb549
|
Fixed setPresenter helper
|
2014-06-23 06:17:19 -07:00 |
|
perroned
|
bf1a65541d
|
updated user retrieval
|
2014-06-23 06:16:24 -07:00 |
|
perroned
|
e53ced5200
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-06-20 12:36:00 -07:00 |
|
Anton Georgiev
|
a102a501ed
|
insert more info about the user in the collection
|
2014-06-20 19:30:37 +00:00 |
|
Anton Georgiev
|
33597fcbe5
|
added a field username to the Users collection
|
2014-06-20 15:22:04 +00:00 |
|
Anton Georgiev
|
dd8d10260b
|
following the model meetingId, userId
|
2014-06-20 14:44:32 +00:00 |
|
perroned
|
01b7fc9111
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
Conflicts:
labs/meteor-client/client/views/users/user_list.coffee
labs/meteor-client/server/insert-startup-data.js
|
2014-06-20 07:32:12 -07:00 |
|
Anton Georgiev
|
82b8f9d134
|
Meteor.users -> Meteor.Users the collection should start with a capital letter
|
2014-06-19 21:29:52 +00:00 |
|
Anton Georgiev
|
d963078423
|
get_users_reply populates the collection of users
|
2014-06-19 21:16:48 +00:00 |
|
Anton Georgiev
|
6d98622d38
|
handling user_left_message - removing the user from the Meteor.users collection
|
2014-06-19 20:25:27 +00:00 |
|
perroned
|
4e3dc04573
|
Removed 'sign in as...' buttons
|
2014-06-19 11:13:52 -07:00 |
|
Anton Georgiev
|
0f4ac2a32a
|
moved the subscription code so it is executed on connect and not on client startup
|
2014-06-19 18:13:12 +00:00 |
|
perroned
|
1da3dfe3a5
|
Using realistic data
|
2014-06-19 10:52:41 -07:00 |
|
perroned
|
124068a590
|
Use data from session now
|
2014-06-19 10:52:08 -07:00 |
|
Anton Georgiev
|
d6e873c013
|
working with coffeescript
|
2014-06-19 16:57:43 +00:00 |
|
Anton Georgiev
|
8d5f3170cc
|
we now subscribe to stay up to date only with our meeting's users
|
2014-06-19 15:36:51 +00:00 |
|
Anton Georgiev
|
eb5703b5d8
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
labs/meteor-client/lib/router.coffee
|
2014-06-19 15:24:20 +00:00 |
|
Anton Georgiev
|
af122d2629
|
work in progress on subscribing a client for the users changes for a single meeting only
|
2014-06-19 15:19:32 +00:00 |
|
perroned
|
3f93644255
|
Added server code for calling client function
|
2014-06-19 07:46:26 -07:00 |
|
perroned
|
529f573d20
|
Added client function for receiving data from server
|
2014-06-19 07:45:58 -07:00 |
|
Anton Georgiev
|
67d1a1f947
|
sending meeting info to the client
|
2014-06-19 14:27:14 +00:00 |
|
perroned
|
eeb4558f92
|
Beginning chat system
|
2014-06-19 06:29:48 -07:00 |
|
perroned
|
49a0b715b7
|
Re-enabled server's startup code
|
2014-06-19 06:28:34 -07:00 |
|
perroned
|
79e5ae19a2
|
Added sample chat data
|
2014-06-19 06:27:44 -07:00 |
|
perroned
|
f285638184
|
toggling chat
|
2014-06-19 06:27:27 -07:00 |
|
perroned
|
ee3a2bf481
|
toggling chat
|
2014-06-19 06:27:04 -07:00 |
|
perroned
|
abeab42623
|
toggling chat
|
2014-06-19 06:26:46 -07:00 |
|
perroned
|
a38a1f7ca3
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-06-19 06:13:56 -07:00 |
|
Anton Georgiev
|
10c075719b
|
cleaning up
|
2014-06-18 21:20:32 +00:00 |
|
Anton Georgiev
|
accaa62a29
|
use iron-router only. The UI is displayed AND redis is working on the serverside!
|
2014-06-18 20:11:29 +00:00 |
|
perroned
|
eab639e134
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-06-18 10:54:03 -07:00 |
|
perroned
|
29488daa9e
|
Added chat data:
|
2014-06-18 10:53:57 -07:00 |
|
perroned
|
a04041ded2
|
chat collection
|
2014-06-18 10:53:30 -07:00 |
|
Anton Georgiev
|
ec875e3c1c
|
joining the router for server and client side
|
2014-06-18 17:34:08 +00:00 |
|
Anton Georgiev
|
10363effc9
|
join the routing of client and server side
|
2014-06-18 17:31:42 +00:00 |
|
Anton Georgiev
|
795171bd71
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
labs/meteor-client/.meteor/packages
labs/meteor-client/smart.json
labs/meteor-client/smart.lock
|
2014-06-17 17:45:50 +00:00 |
|
Anton Georgiev
|
fe464d53af
|
cleaning up
|
2014-06-17 17:04:58 +00:00 |
|
perroned
|
6e1ec8f200
|
Updated more buttons to templates. Still trying to clean up code
|
2014-06-17 08:47:26 -07:00 |
|
perroned
|
18e729eaf1
|
Fixed some queries
|
2014-06-17 08:46:49 -07:00 |
|
Anton Georgiev
|
59fbf2ad52
|
able to add a user to a collection on user_joined_message.
|
2014-06-17 15:22:12 +00:00 |
|
perroned
|
1280a4dccf
|
Changed button html to template
|
2014-06-17 08:08:34 -07:00 |
|
perroned
|
9f34755d88
|
Updated query based on available data
|
2014-06-17 08:08:07 -07:00 |
|
perroned
|
904caa7212
|
Added a few required fields
|
2014-06-17 08:07:36 -07:00 |
|
perroned
|
1f88a590c1
|
Made a helper for buttons. Code is more proper, more readable, shorter and concise, easier to maintain
|
2014-06-17 07:02:52 -07:00 |
|
perroned
|
77c70dd801
|
Changed parameters to work with new templates
|
2014-06-17 07:01:54 -07:00 |
|
perroned
|
096892264d
|
Formatting data into table cells
|
2014-06-16 12:11:55 -07:00 |
|
perroned
|
c52bef4e3c
|
Formatting data into table cells
|
2014-06-16 12:11:22 -07:00 |
|
perroned
|
c12942aa45
|
Added scrolling in user's list
|
2014-06-16 11:31:44 -07:00 |
|
perroned
|
39335dfb03
|
Added scrolling CSS for user's list. Though, Still not beautiful
|
2014-06-16 11:31:14 -07:00 |
|
perroned
|
abdf769a2f
|
Using bootstrap classes for layouts
|
2014-06-16 10:47:55 -07:00 |
|
perroned
|
4352bc2721
|
Restructured page layouts. There has to be a better way to do this. Spacebars is a pain
|
2014-06-16 10:47:16 -07:00 |
|
perroned
|
c20e7e2d1b
|
Shortened some code. Added special handlers allowing for mods to edit another's user's data
|
2014-06-16 10:45:17 -07:00 |
|
perroned
|
d821a1a8be
|
Few changes to make things proper
|
2014-06-16 10:44:18 -07:00 |
|
perroned
|
a99346d385
|
UI tweak highlights which component is active
|
2014-06-13 12:34:52 -07:00 |
|
perroned
|
52f8acbbae
|
A bit easier to notice what is active and inactive
|
2014-06-13 12:34:20 -07:00 |
|
Anton Georgiev
|
a73bafe41e
|
did some refactoring - we now use a RedisPubSub class
|
2014-06-13 19:27:26 +00:00 |
|
perroned
|
2bc7ad3c5d
|
updating ignore files
|
2014-06-13 12:00:14 -07:00 |
|
perroned
|
bfaf9a63c7
|
Users list fixed. Fixed an indentation issue where the body of a function was stand-alone and not actually part of the function prototype. Darn Coffeescript
|
2014-06-13 11:24:59 -07:00 |
|
perroned
|
6e427efbfa
|
Hooked up some main screen toggles
|
2014-06-13 11:20:36 -07:00 |
|
perroned
|
ec0c61ab73
|
Added a file for functions and helpers on the client. All functions inside are available for all client templates and from other java functions. Only available/global to the CLIENT, however.
|
2014-06-13 11:19:50 -07:00 |
|
perroned
|
1948e7c7a2
|
Removed uneeded functions to a different more appropriate scope
|
2014-06-13 11:17:58 -07:00 |
|
perroned
|
1fdbe98db4
|
Added new CSS classes to allow for Meteor button selectors
|
2014-06-13 11:17:21 -07:00 |
|
perroned
|
65fa7b5ac0
|
Prototyping main page. Reflects users choices for navbar, etc.
|
2014-06-13 11:16:14 -07:00 |
|
Anton Georgiev
|
dfb95d6688
|
fixed the meetingID; we got valid=true for validate_auth-token_reply
|
2014-06-13 18:10:49 +00:00 |
|
Anton Georgiev
|
ebdda24f8a
|
sending validate_auth_token message
|
2014-06-13 18:01:32 +00:00 |
|
perroned
|
d0747c9418
|
Added iron router
|
2014-06-13 09:22:30 -07:00 |
|
Anton Georgiev
|
8b82e03bda
|
the :4000 landing page redirects to the meteor app. We extract the meeting_id, user_id, username, auth_token inside the Meteor app. Added router.
|
2014-06-12 23:22:58 +00:00 |
|
Anton Georgiev
|
46b8f8a923
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
labs/meteor-client/smart.json
labs/meteor-client/smart.lock
|
2014-06-12 20:22:42 +00:00 |
|
Anton Georgiev
|
b6e534f287
|
adding .gitignore
|
2014-06-12 19:52:59 +00:00 |
|
Anton Georgiev
|
cde9a73c6a
|
include deps
|
2014-06-12 19:51:20 +00:00 |
|
perroned
|
8cabd766dc
|
Some prettying up a bit with bootstrap
|
2014-06-12 12:12:09 -07:00 |
|
perroned
|
a6fed17cb4
|
Some package files
|
2014-06-12 12:10:50 -07:00 |
|
Anton Georgiev
|
41f6c5c3d5
|
Merge branch 'meteor-rebuild-server' of github.com:antobinary/bigbluebutton into meteor-rebuild-server
|
2014-06-12 17:19:48 +00:00 |
|
perroned
|
ef0272f768
|
Fixing up users collection to use meteor's built in users collection, fixed up some meteor-coffeescript compatability issues
|
2014-06-12 08:12:25 -07:00 |
|
perroned
|
21d9c7799f
|
Migrating to coffeescript
|
2014-06-12 07:08:55 -07:00 |
|
perroned
|
2978ba1eed
|
Fixed a bug with presenters and deletion
|
2014-06-12 06:18:40 -07:00 |
|
Anton Georgiev
|
c9f8683e0b
|
Merge remote-tracking branch 'perroned/prototype-metor-client' into meteor-rebuild-server
|
2014-06-11 19:45:02 +00:00 |
|
Anton Georgiev
|
0f680bd4d5
|
cleaning up
|
2014-06-11 19:38:47 +00:00 |
|
Anton Georgiev
|
fc9c2adf3e
|
still have to connect bunyan
|
2014-06-11 19:26:46 +00:00 |
|
perroned
|
e609d2df9f
|
Fixed up some permissions issues
|
2014-06-11 11:56:04 -07:00 |
|
perroned
|
740a3056e0
|
Implementing pseudo log in, to alter view based on user'
|
2014-06-11 11:52:58 -07:00 |
|
Anton Georgiev
|
22a31392f4
|
I think I resolved the coffeescript class structure problem
|
2014-06-11 17:56:07 +00:00 |
|
Anton Georgiev
|
1ccc24d71c
|
subscribing and publishing (simple version)
|
2014-06-11 17:12:51 +00:00 |
|
Anton Georgiev
|
46a231c3c0
|
config is found, redis is found
|
2014-06-11 16:11:23 +00:00 |
|
perroned
|
b86c9c8cce
|
Added user toggles. And made them only accessible to individual user (i.e. moderator should only be able to turn off a students webcam and mic, not on
|
2014-06-11 09:11:07 -07:00 |
|
perroned
|
26c7050283
|
Trying to implement css/less from html5, cleaned up code a bit, added functionality to buttons
|
2014-06-11 08:21:09 -07:00 |
|
perroned
|
4e30f69e81
|
Added a few buttons that would show up for moderators or presenters
|
2014-06-10 12:59:58 -07:00 |
|
perroned
|
19ba6f37e2
|
Just a few comments
|
2014-06-10 12:26:42 -07:00 |
|
perroned
|
cb8b0d0e11
|
basic functionality for users
|
2014-06-10 12:19:20 -07:00 |
|
perroned
|
4e19f83006
|
Merge branch 'prototype-meteor-client' of https://github.com/bigbluebutton/bigbluebutton into prototype-metor-client
|
2014-06-09 08:02:43 -07:00 |
|
Anton Georgiev
|
ebb0424856
|
Merge branch 'prototype-meteor-client' of https://github.com/bigbluebutton/bigbluebutton into prototype-meteor-client
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
|
2014-06-09 14:51:59 +00:00 |
|
Richard Alam
|
b19053980a
|
- set user id
|
2014-06-06 15:51:12 -07:00 |
|
Richard Alam
|
1f9fe5cac7
|
- meteor
|
2014-06-06 15:19:09 -07:00 |
|
perroned
|
ae1c01e194
|
Removing useless code
|
2014-06-03 12:26:59 -07:00 |
|
perroned
|
b8eafc5312
|
Forgot to put meeting name back into url for last commit
|
2014-06-03 12:25:43 -07:00 |
|
perroned
|
22db0d8dc9
|
Fixed meeting name so it shows up in chat, added it to the url
|
2014-06-03 11:48:02 -07:00 |
|
perroned
|
70da7d1deb
|
test
|
2014-06-03 11:45:05 -07:00 |
|
Anton Georgiev
|
dbbe0d251e
|
missed this during the merge from perroned
|
2014-05-28 15:25:29 +00:00 |
|
Anton Georgiev
|
392238fa31
|
Merge branch 'merge-polling-with-master' of github.com:perroned/bigbluebutton into merge-polling-with-master
Conflicts:
labs/demos/lib/handlers.coffee
|
2014-05-27 17:56:38 +00:00 |
|
perroned
|
4d476cec37
|
"Changed AgnularJs Link
Made the http link use config IP in settings"
|
2014-05-27 08:12:12 -07:00 |
|
Anton Georgiev
|
ae6fba2053
|
the usernames in the userlist are no longer surrounded by quotation marks
|
2014-05-26 14:45:10 +00:00 |
|
Anton Georgiev
|
f78264e9da
|
a joining user is displayed in the user list
|
2014-05-21 15:57:10 +00:00 |
|
Anton Georgiev
|
32fea5be69
|
when redirected from the login page, go straight into sessionView
|
2014-05-15 15:54:39 +00:00 |
|
Anton Georgiev
|
bc09084ec2
|
moving the handler for /html5.client in its own method
|
2014-05-14 20:54:43 +00:00 |
|
Anton Georgiev
|
32b5f70b08
|
the landing page passes some credentials to HTML5's Node app
|
2014-05-14 19:28:45 +00: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 |
|
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 |
|
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 |
|
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 |
|
Anton Georgiev
|
d14d5d56d5
|
initial commit
|
2014-05-09 14:55:25 +00:00 |
|
Anton Georgiev
|
b1beaf07ed
|
added instructions for running a test file
|
2014-05-05 18:01:39 +00:00 |
|
Anton Georgiev
|
bf2d447558
|
added a sample test for recordings for a specific meetingid
|
2014-05-05 17:56:06 +00:00 |
|
xaker1
|
8c83e1a0d3
|
Add send XML in createMeetingWithXmlResponseArray
|
2014-05-03 22:29:59 +04:00 |
|
xaker1
|
bf46d1b8cd
|
Conclusion correct errors in function _requiredParam
|
2014-05-03 22:12:13 +04:00 |
|
Richard Alam
|
2c5dabd459
|
- trying out json2xml conversion
|
2014-05-03 10:38:20 -07:00 |
|