Anton Georgiev
|
7730abbeb8
|
fix for the merge and fix for an issue with get_all_meetings_request not recognized in bbb-apps
|
2014-07-28 21:01:06 +00:00 |
|
Anton Georgiev
|
3075166fa8
|
Merge branch 'meteor-merge-private-chat' into meteor-rebuild-server
Conflicts:
labs/meteor-client/client/views/chat/chat_bar.coffee
|
2014-07-28 19:56:40 +00:00 |
|
perroned
|
248b90f3bb
|
Adding UI for muting functionality
|
2014-07-28 12:24:07 -07:00 |
|
Anton Georgiev
|
17ae9c1d88
|
style change
|
2014-07-28 19:13:36 +00:00 |
|
Maxim Khlobystov
|
3b10e80342
|
XX:00 bug in timestamps was fixed.
|
2014-07-28 11:04:40 -07:00 |
|
perroned
|
7e8cedc4dc
|
Updated UI to now show whether a user is sharing audio and further whether the user is actually speaking or not.
|
2014-07-28 10:43:26 -07:00 |
|
perroned
|
b7a0a1ed31
|
Status bar icon now shows when user is talking. Should be changed to use more pronounced icons.
|
2014-07-28 08:52:50 -07:00 |
|
perroned
|
4be030ef2f
|
Clear user data when they logout
|
2014-07-28 08:00:07 -07:00 |
|
perroned
|
682e4a5dcd
|
Wipe subscriptions after user logout
|
2014-07-25 09:36:31 -07:00 |
|
perroned
|
904d91f2b2
|
Only load collections when the previous was successful, now check if user is validated by checking the integrity of their database entry
|
2014-07-24 13:06:07 -07:00 |
|
perroned
|
3eb2ce47e8
|
Display header only when user is actually inside
|
2014-07-24 13:04:53 -07:00 |
|
perroned
|
48806ca51f
|
Will need to implement this server-side function
|
2014-07-24 13:04:04 -07:00 |
|
perroned
|
47c28469d8
|
Manual merge of meteor-client-change-logout into prototype-metor-client
|
2014-07-24 11:04:12 -07:00 |
|
perroned
|
62dde1fb8c
|
Restructured logout procedure
|
2014-07-24 10:56:31 -07:00 |
|
perroned
|
f826215dd7
|
Now displays when user is actually talking
|
2014-07-24 09:12:27 -07:00 |
|
perroned
|
0b931aa7d8
|
Working on detecting sound while talking
|
2014-07-24 07:43:46 -07:00 |
|
perroned
|
44c16be891
|
Update user list title
|
2014-07-24 07:42:17 -07:00 |
|
perroned
|
49e05abebd
|
Update methods for user sharing audio
|
2014-07-24 07:39:53 -07:00 |
|
Maxim Khlobystov
|
e2fd5f5202
|
Chat message timestamp is fixed (converted from Epoch time to 24-hour clock).
|
2014-07-22 18:38:52 -07:00 |
|
perroned
|
ace02d8cb4
|
Supressed error and make access safer. Still don't know what the proper way to fix this is.
|
2014-07-22 08:15:24 -07:00 |
|
perroned
|
f45abb866b
|
Fixed message scrolling and added some message filtering
|
2014-07-22 06:33:27 -07:00 |
|
perroned
|
387ad47f31
|
Updated method for determining whether user is talking
|
2014-07-22 06:31:32 -07:00 |
|
perroned
|
eb7c8d0507
|
Kicking users now works properly
|
2014-07-21 08:54:38 -07:00 |
|
perroned
|
d6e7ee3944
|
Updated session to coffeescript from js
|
2014-07-21 08:30:21 -07:00 |
|
perroned
|
1113ecc114
|
Fixed logout issue
|
2014-07-18 08:18:27 -07:00 |
|
perroned
|
2461be4edf
|
Merging in persistent sorage solution
|
2014-07-18 07:30:46 -07:00 |
|
perroned
|
5a96d7c370
|
Updated ignore file
|
2014-07-18 07:17:06 -07:00 |
|
perroned
|
3214985e4e
|
Commented code
|
2014-07-18 07:08:59 -07:00 |
|
perroned
|
730616631a
|
Once logged out user cannot return to meeting without the server validating their entrance.
|
2014-07-18 06:41:35 -07:00 |
|
perroned
|
7e4b88a5d1
|
Updated session calls to use amplifies session. data now preserved upon refresh
|
2014-07-17 13:13:06 -07:00 |
|
perroned
|
b1e1f6f96a
|
Collections now remain after refresh
|
2014-07-17 12:45:26 -07:00 |
|
perroned
|
11bb0daf89
|
Fixing up chat tabs... again.
|
2014-07-17 08:25:56 -07:00 |
|
perroned
|
fdc214dd65
|
Removed some clutter, fixing up packages and environment
|
2014-07-16 11:10:27 -07:00 |
|
perroned
|
219b3b70d5
|
Putting voice call functionality into client prototype
|
2014-07-14 07:46:02 -07:00 |
|
perroned
|
56e94e6133
|
Proof of concept prototype successful. Can join audio call using WebRTC in html5 client.
|
2014-07-11 11:58:25 -07:00 |
|
perroned
|
9b3251ba40
|
Added files required for JsSip and new modules which were removed
|
2014-07-11 10:55:02 -07:00 |
|
perroned
|
b72568600d
|
Fixed the view to make private chat sort messages correctly
|
2014-07-11 09:05:30 -07:00 |
|
perroned
|
9d0c06b086
|
Fixed messages to display previous messages from before join, display greeting, then display new messages accordingly
|
2014-07-11 08:53:49 -07:00 |
|
perroned
|
239666d2ef
|
Trying to fix up, still a big mess
|
2014-07-10 07:36:29 -07:00 |
|
perroned
|
4001373438
|
Still trying to get the tabs UI working
|
2014-07-10 06:11:38 -07:00 |
|
Anton Georgiev
|
7ea4571568
|
coffeescript proper style
|
2014-07-09 19:09:10 +00:00 |
|
perroned
|
e91f0e832e
|
Merge branch 'meteor-merge-private-chat' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-07-09 09:08:07 -07:00 |
|
Anton Georgiev
|
884cce7e9b
|
the client will have access only to the meeting they are in so they can see the meeting"s name and record status
|
2014-07-09 16:06:25 +00:00 |
|
perroned
|
328872b222
|
Merge branch 'meteor-merge-private-chat' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-07-09 08:38:25 -07:00 |
|
perroned
|
2797bb15f3
|
Updated bootstrap
|
2014-07-09 08:36:08 -07:00 |
|
Anton Georgiev
|
1c1815fb16
|
missed these changes in the merge
|
2014-07-09 15:26:12 +00:00 |
|
Anton Georgiev
|
3ad1bdd341
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat
Conflicts:
labs/meteor-client/client/globals.coffee
labs/meteor-client/client/views/chat/chat_bar.coffee
labs/meteor-client/collections/collections.coffee
labs/meteor-client/lib/router.coffee
labs/meteor-client/server/publish.coffee
labs/meteor-client/server/server.coffee
|
2014-07-09 15:09:27 +00:00 |
|
perroned
|
af3c7f4896
|
Removed old comment
|
2014-07-09 06:31:04 -07:00 |
|
perroned
|
df4a393b12
|
Added method for getting meeting name
|
2014-07-09 06:28:33 -07:00 |
|
perroned
|
098a4c7f81
|
Added private chat and chat tabs functionality. Tab UI is still buggy.
|
2014-07-09 06:18:52 -07:00 |
|
perroned
|
a304301bd4
|
By default youre in public chat
|
2014-07-09 06:16:17 -07:00 |
|
perroned
|
4460127b6a
|
Method for getting user's name'
|
2014-07-09 06:15:50 -07:00 |
|
Anton Georgiev
|
48010179e5
|
fixed adding to Slides collection
|
2014-07-08 17:15:30 +00:00 |
|
Anton Georgiev
|
abddc57c6f
|
worked on slides collection
|
2014-07-08 15:14:55 +00:00 |
|
Anton Georgiev
|
168eb4e715
|
adding Slides collection
|
2014-07-07 20:58:50 +00:00 |
|
Anton Georgiev
|
7aef935771
|
filter log messages from flooding event types - cursor update, page resizing...
|
2014-07-07 20:51:33 +00:00 |
|
Anton Georgiev
|
86e90bbdef
|
forgot to publish the Shapes collection
|
2014-07-07 20:31:18 +00:00 |
|
Anton Georgiev
|
4adef66799
|
remove redundant meetingId decl
|
2014-07-07 20:21:36 +00:00 |
|
Anton Georgiev
|
498472969e
|
adding a shape to the collection
|
2014-07-07 20:17:09 +00:00 |
|
Anton Georgiev
|
c74737d66c
|
adding a Shapes collection
|
2014-07-07 19:08:24 +00:00 |
|
Anton Georgiev
|
f1416a49a5
|
on get_presentation_info_reply request shapes
|
2014-07-07 18:04:47 +00:00 |
|
Anton Georgiev
|
3d00b2f2b8
|
changed logging style
|
2014-07-07 18:03:33 +00:00 |
|
perroned
|
8bc9ace261
|
Make tabs reappear
|
2014-07-07 08:31:29 -07:00 |
|
perroned
|
adb7dbc77c
|
working on private chat tabs
|
2014-07-07 08:30:17 -07:00 |
|
perroned
|
d0d4227d17
|
Made a tab creation helper
|
2014-07-04 08:00:46 -07:00 |
|
Anton Georgiev
|
c79c17d61a
|
stop sending userName and meetingName via the URL. Now we can obtain them from bbb-apps and the Collections
|
2014-07-03 20:50:24 +00:00 |
|
Anton Georgiev
|
561d099eec
|
display number of meetingsin console.log
|
2014-07-03 20:40:36 +00:00 |
|
Anton Georgiev
|
52202527a8
|
use the user's username when sending a chat message
|
2014-07-03 20:39:47 +00:00 |
|
Anton Georgiev
|
25cbf5af27
|
fix removing users from Users
|
2014-07-03 18:44:05 +00:00 |
|
Anton Georgiev
|
f651744da9
|
handle end of meeting + some cleanup
|
2014-07-03 18:31:32 +00:00 |
|
perroned
|
837edef50b
|
Created array to keep track of tabs
|
2014-07-03 10:56:56 -07:00 |
|
perroned
|
1b01ce8666
|
Added private chat creation and UI
|
2014-07-03 10:56:16 -07:00 |
|
perroned
|
94fe921ad6
|
Added private chat selectors
|
2014-07-03 10:55:32 -07:00 |
|
perroned
|
75bc1500e6
|
Added the default tabs
|
2014-07-03 10:55:06 -07:00 |
|
perroned
|
5d03c2651b
|
Added functions for adding new tabs
|
2014-07-03 10:54:41 -07:00 |
|
Anton Georgiev
|
444aef0b25
|
Meetings collection, adding to it on Server.start
|
2014-07-03 15:52:43 +00:00 |
|
Anton Georgiev
|
39d62e1d4a
|
now get_all_meetings_reply returns info about meetingName and recorded status
|
2014-07-03 15:30:06 +00:00 |
|
Anton Georgiev
|
3fa27ae11a
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
labs/meteor-client/client/globals.coffee
|
2014-07-02 19:10:12 +00:00 |
|
Anton Georgiev
|
c40bcece8f
|
cleaning up
|
2014-07-02 17:57:07 +00:00 |
|
Anton Georgiev
|
22785c12bc
|
cleaning up. The client side can only see one meeting
|
2014-07-02 17:13:00 +00:00 |
|
perroned
|
775d4ef0eb
|
Added comments for future changes - 2
|
2014-07-02 09:23:30 -07:00 |
|
perroned
|
5c326e0cd6
|
Added comments for future changes
|
2014-07-02 09:21:33 -07:00 |
|
perroned
|
a85a706d1d
|
Updated templates to new message format, the chat now displays real messages
|
2014-07-02 09:17:05 -07:00 |
|
perroned
|
d9eb0c8cf2
|
Changes
|
2014-07-02 08:43:56 -07:00 |
|
perroned
|
a8defa1c30
|
Changes
|
2014-07-02 08:41:12 -07:00 |
|
Anton Georgiev
|
5ea58dfb23
|
fixing user logout
|
2014-07-02 15:09:55 +00:00 |
|
Anton Georgiev
|
2b2622ecc9
|
fixing when a chat message is added to a collection
|
2014-07-02 15:08:56 +00:00 |
|
Anton Georgiev
|
773825de73
|
fixing chat so that we only call Meteor.redisPubSub from within RedisPubSub
|
2014-07-02 14:47:22 +00:00 |
|
Anton Georgiev
|
d599a782a3
|
cleaning up
|
2014-06-27 19:47:16 +00:00 |
|
perroned
|
2beb2868b1
|
commented
|
2014-06-27 12:29:07 -07:00 |
|
Anton Georgiev
|
dd85764db9
|
fix user logout
|
2014-06-27 19:16:04 +00:00 |
|
Anton Georgiev
|
2fb970d9cd
|
adjusting the parameter names so that they match what is recognized on the server
|
2014-06-27 19:10:11 +00:00 |
|
Anton Georgiev
|
8c61b3fcdc
|
sending on the chat channel
|
2014-06-27 18:41:25 +00:00 |
|
Anton Georgiev
|
d6851c39a4
|
when we try to send a chat message from the html5 client we now send a send_public_chat_message_request towards bbb-apps
|
2014-06-27 17:53:31 +00:00 |
|
Anton Georgiev
|
9a9c80efab
|
when we press Enter, the chat message enters the collection
|
2014-06-27 17:31:01 +00:00 |
|
perroned
|
d53e340f28
|
Fixed bug in sending message, missing parentheses
|
2014-06-27 10:22:56 -07:00 |
|
Anton Georgiev
|
9ef70b55e9
|
inserting the chat messages we receive from bbb-apps into the Chat collection
|
2014-06-27 16:16:17 +00:00 |
|
Anton Georgiev
|
f0a50ce174
|
introducing Chat collection, clear on start, publish, subscribe, etc
|
2014-06-27 15:37:33 +00:00 |
|
perroned
|
60ac20880c
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-06-27 07:40:36 -07:00 |
|
Anton Georgiev
|
1aacd65e66
|
clear Users data on startup
|
2014-06-27 14:38:08 +00:00 |
|
perroned
|
8a213f6354
|
stress the current user
|
2014-06-27 06:59:31 -07:00 |
|
Anton Georgiev
|
08e446e6a0
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
|
2014-06-26 20:28:54 +00:00 |
|
perroned
|
50e746e5da
|
Fixed bug where help link changed current page, now opens new tab
|
2014-06-26 13:15:31 -07:00 |
|
perroned
|
090c5ae595
|
Fixed issue with no server version being displayed
|
2014-06-26 13:11:31 -07:00 |
|
Anton Georgiev
|
8f11be5a8b
|
dealing with users event
|
2014-06-26 20:11:18 +00:00 |
|
perroned
|
f270f74903
|
Implemented auto scrolling to the bottom of the chat messages window, building chat message to send to server
|
2014-06-26 12:58:58 -07:00 |
|
Anton Georgiev
|
7b5866cf1e
|
we get information about all the meetings on starting up the Meteor server
|
2014-06-26 19:54:24 +00:00 |
|
Anton Georgiev
|
86dfa841bf
|
switched server.js to coffeescript
|
2014-06-26 18:10:15 +00:00 |
|
Anton Georgiev
|
99bd016cab
|
the first thing we do when we start the Meteor server is to grab the list of active meetings from bbb-apps
|
2014-06-26 18:09:39 +00:00 |
|
perroned
|
2123998bcb
|
Changed some toggles, fixed up some UI, more chat functionality
|
2014-06-26 10:13:19 -07:00 |
|
perroned
|
46cdeafabb
|
Cleaned up lots of code, changed toggles to server calls
|
2014-06-26 08:14:43 -07:00 |
|
perroned
|
8971b21a90
|
Added some comments
|
2014-06-26 08:13:29 -07:00 |
|
perroned
|
7ac36b1cf6
|
Tidy up, more chat UI, log out user info to check for duplicates'
|
2014-06-25 11:51:16 -07:00 |
|
perroned
|
efb2177b2b
|
Fixing up some UI
|
2014-06-25 07:04:04 -07:00 |
|
perroned
|
30bae7c80f
|
Recreating chat UI
|
2014-06-25 06:28:15 -07:00 |
|
perroned
|
bbdfc071ef
|
Set a few values that should be retrieved from server later
|
2014-06-25 06:27:12 -07:00 |
|
perroned
|
806bf90b4c
|
Some tidying up and making things more proper
|
2014-06-24 11:39:32 -07:00 |
|
perroned
|
3eb07aec15
|
Fixed a bug when switching panes
|
2014-06-24 11:36:22 -07:00 |
|
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
|
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 |
|
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 |
|
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 |
|