Anton Georgiev
|
6acc236cc8
|
cleaning up
|
2014-08-19 19:09:04 +00:00 |
|
Anton Georgiev
|
a976cd7c2e
|
use the helper code within whiteboard_text
|
2014-08-19 18:46:50 +00:00 |
|
Anton Georgiev
|
a27bd5cd91
|
attempting to avoid the passing of a dom node as an argument
|
2014-08-19 18:45:45 +00:00 |
|
Anton Georgiev
|
4935e147d2
|
adding textFlow
|
2014-08-19 16:54:19 +00:00 |
|
Anton Georgiev
|
40afd09431
|
adding textShapes
|
2014-08-19 16:54:01 +00:00 |
|
Anton Georgiev
|
df1a015041
|
accommodate textShapes
|
2014-08-19 16:53:16 +00:00 |
|
perroned
|
25c1cbc10b
|
Moved some things around and cleaned up
|
2014-08-19 08:52:24 -07:00 |
|
perroned
|
578d91a0d7
|
fixed issues using wrong data
|
2014-08-19 08:43:48 -07:00 |
|
perroned
|
11b8a51e27
|
Added new case for breaklines
|
2014-08-19 08:37:16 -07:00 |
|
perroned
|
002370c70a
|
Santizing and styling user input in chat messages
|
2014-08-19 08:27:32 -07:00 |
|
perroned
|
747c155a09
|
Added colors for messages.
|
2014-08-19 07:10:23 -07:00 |
|
perroned
|
87b67a5223
|
resized some things
|
2014-08-18 10:29:38 -07:00 |
|
perroned
|
7738b246aa
|
Id for lowering hand now person doing it
|
2014-08-18 08:15:46 -07:00 |
|
perroned
|
7a895f5edc
|
Merge remote-tracking branch 'anton/creating-better-templates' into creating-better-templates
|
2014-08-18 08:11:36 -07:00 |
|
perroned
|
c4da201431
|
Moved buttons around to match layout
|
2014-08-18 08:10:57 -07:00 |
|
Anton Georgiev
|
f10101c23c
|
Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates
|
2014-08-18 15:05:32 +00:00 |
|
Anton Georgiev
|
f506c964a8
|
userRaiseHand and userLowerHand is functioning
|
2014-08-18 15:01:16 +00:00 |
|
perroned
|
3562a9ca34
|
removed useless file (not needed); users cannot edit anything
|
2014-08-18 07:55:59 -07:00 |
|
perroned
|
a9c938754a
|
Removed insecure package for beta release
|
2014-08-18 07:32:24 -07:00 |
|
perroned
|
2b57a6e0a6
|
Fixed some duplicate code and reordered things
|
2014-08-18 07:29:02 -07:00 |
|
perroned
|
877015d6c9
|
Proper name overflowing solution.
|
2014-08-18 07:16:07 -07:00 |
|
perroned
|
41e0c8cf4c
|
Added tooltip for user names in the user list, added hand raise status.
|
2014-08-18 05:54:12 -07:00 |
|
Anton Georgiev
|
5d0744afc4
|
raise/lower hand event is published in pubsub. now we are missing the java handling...
|
2014-08-15 21:08:12 +00:00 |
|
perroned
|
a86c84bb08
|
Fixing up UI for long names in uders list
|
2014-08-15 13:25:28 -07:00 |
|
Anton Georgiev
|
e68766fc92
|
raise/lower hand incoming messages are now handled
|
2014-08-15 20:18:53 +00:00 |
|
perroned
|
6064671a5b
|
Fixed issue with messages not showing up
|
2014-08-15 12:30:44 -07:00 |
|
perroned
|
c46c9f2b61
|
Voice bridge pin
|
2014-08-15 12:20:41 -07:00 |
|
perroned
|
56df4efd66
|
Fix removed font size
|
2014-08-15 12:18:23 -07:00 |
|
perroned
|
e1e12fe3c6
|
Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates
Conflicts:
labs/meteor-client/client/views/chat/chat_bar.html
|
2014-08-15 12:17:37 -07:00 |
|
perroned
|
0c845d5c0b
|
Made neater after remove bootstrap2 package
|
2014-08-15 12:14:10 -07:00 |
|
Anton Georgiev
|
0775d645c5
|
change presenter works
|
2014-08-15 19:01:38 +00:00 |
|
perroned
|
55f36c24f2
|
Removed unused code and fixed UI issue with chat greeting
|
2014-08-15 11:30:43 -07:00 |
|
perroned
|
98e591b748
|
Merge remote-tracking branch 'anton/creating-better-templates' into creating-better-templates
Conflicts:
labs/meteor-client/client/main.coffee
|
2014-08-15 11:27:40 -07:00 |
|
perroned
|
0563a5b37c
|
Options now shows currently used font size
|
2014-08-15 11:20:21 -07:00 |
|
Maxim Khlobystov
|
3064bea6d2
|
Slightly changed the chat message getter code to be more efficient.
|
2014-08-15 11:13:28 -07:00 |
|
Maxim Khlobystov
|
43b93ff080
|
No repeating timestamps in successive messages from the same user.
|
2014-08-15 11:00:15 -07:00 |
|
perroned
|
bd829c312f
|
You can now change the font size of messages in the options bar
|
2014-08-15 10:17:51 -07:00 |
|
perroned
|
3c41b62492
|
Removed duplicate bootstrap packages, fixing up UI issues now to compensate
|
2014-08-15 09:37:43 -07:00 |
|
perroned
|
85e9d888d1
|
Fixed ,ajor issues with duplication of button handler preventing audio calls from being made
|
2014-08-15 09:26:17 -07:00 |
|
Anton Georgiev
|
8999dfb77b
|
Merge branch 'more-whiteboard-shapes' of https://github.com/lfzawacki/bigbluebutton into creating-better-templates
|
2014-08-15 15:52:47 +00:00 |
|
Anton Georgiev
|
71a062af95
|
Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates
Conflicts:
labs/meteor-client/client/globals.coffee
labs/meteor-client/client/main.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.html
labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
|
2014-08-15 15:49:18 +00:00 |
|
Anton Georgiev
|
029b26ab32
|
cleaning up and minor fix to slideshow error - whiteboard_paper's last function which is still under development
|
2014-08-15 15:22:39 +00:00 |
|
Anton Georgiev
|
6633a30d7d
|
fix drawListOfShapes(shapes) and some cleaning up
|
2014-08-15 15:11:31 +00:00 |
|
Anton Georgiev
|
498725fdba
|
removing single shape and removing all shapes from slide
|
2014-08-15 15:04:35 +00:00 |
|
perroned
|
7eb22d415f
|
Fixed some UI overflowing issues
|
2014-08-15 06:58:33 -07:00 |
|
Maxim Khlobystov
|
9ec52a50d0
|
Username doesn't repeat in successive messages (it is displayed only once).
|
2014-08-14 17:28:01 -07:00 |
|
perroned
|
8764bdab26
|
Fixed overflowing messages, and navbar
|
2014-08-14 12:22:51 -07:00 |
|
Lucas Zawacki
|
7168439869
|
Drawing ellipses
|
2014-08-14 15:53:47 -03:00 |
|
Lucas Zawacki
|
b5067d8a37
|
Drawing lines on whiteboard
|
2014-08-14 15:11:56 -03:00 |
|
Lucas Zawacki
|
b06c00a458
|
Drawing triangles on whiteboard
|
2014-08-14 15:11:18 -03:00 |
|
perroned
|
753ec4dd1b
|
Added recording status and matching icons
|
2014-08-14 10:26:15 -07:00 |
|
Maxim Khlobystov
|
e16ec283fe
|
Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into meteor-client-messages-better-templates
Conflicts:
labs/meteor-client/client/globals.coffee
labs/meteor-client/client/views/chat/chat_bar.coffee
labs/meteor-client/client/views/chat/chat_bar.html
|
2014-08-14 10:20:21 -07:00 |
|
perroned
|
a83e2fb947
|
Fixed some private chat things
|
2014-08-14 07:48:08 -07:00 |
|
perroned
|
59bcb84b9d
|
Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates
Conflicts:
labs/meteor-client/client/globals.coffee
labs/meteor-client/client/main.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.html
labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
|
2014-08-13 13:56:04 -07:00 |
|
perroned
|
d079f5cb72
|
Remove greeting in private message, made it simpler
|
2014-08-13 12:48:44 -07:00 |
|
perroned
|
9a2990fe4a
|
Only send initial message once
|
2014-08-13 12:16:27 -07:00 |
|
perroned
|
b830735e08
|
scrolling window for chat tabs
|
2014-08-13 11:42:31 -07:00 |
|
perroned
|
d74116be1d
|
Fixing up private chat UI and message filtering issues and making private chat more efficient and got it into a working state again
|
2014-08-13 11:30:55 -07:00 |
|
Anton Georgiev
|
52e542adfc
|
now we only draw on DRAW_END - no more fuzzy shapes on the html5 whiteboard due to slow drawing
|
2014-08-12 21:56:45 +00:00 |
|
Anton Georgiev
|
2ef0dbb232
|
working on handling slow drawing of shapes
|
2014-08-12 21:50:10 +00:00 |
|
Anton Georgiev
|
07138bda00
|
working on clearing all shapes from a slide
|
2014-08-12 20:05:34 +00:00 |
|
Anton Georgiev
|
9d5000e636
|
Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates
Conflicts:
labs/meteor-client/client/globals.coffee
labs/meteor-client/client/main.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.html
labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
|
2014-08-12 18:53:50 +00:00 |
|
Anton Georgiev
|
8706792903
|
cleaning up
|
2014-08-12 17:44:32 +00:00 |
|
perroned
|
f880aceba3
|
Fixed up UI stuff, fixed up joining call/muting audio/detecting speaking
|
2014-08-12 09:25:15 -07:00 |
|
Anton Georgiev
|
1e465d66e8
|
we have a moving cursor
|
2014-08-12 16:18:29 +00:00 |
|
Anton Georgiev
|
8e0fc0cf15
|
working on displaying the presenter's cursor/pointer
|
2014-08-11 20:54:16 +00:00 |
|
perroned
|
446f4e5ad9
|
Added menu buttons back to options tab, fixed message scrolling
|
2014-08-11 12:43:49 -07:00 |
|
perroned
|
6db655e1df
|
Fixing chat ui
|
2014-08-11 12:32:42 -07:00 |
|
Anton Georgiev
|
04494aa8a4
|
cleaning up
|
2014-08-11 18:46:10 +00:00 |
|
Anton Georgiev
|
3070bc6682
|
shapes seem to be drawn at the right time. we don"t loop excessively
|
2014-08-11 18:41:03 +00:00 |
|
perroned
|
d6bcf90b3e
|
Lots of UI stuff
|
2014-08-11 09:21:14 -07:00 |
|
Anton Georgiev
|
49b44d3533
|
in the process of separating "shape"
|
2014-08-11 15:56:46 +00:00 |
|
Anton Georgiev
|
0a59398781
|
the server is common for all meetings. We should not clear the collections upon a user's departure. Fixed an error where after logout an html5 user would not be able to enter into a running meeting
|
2014-08-11 15:10:01 +00:00 |
|
Anton Georgiev
|
d1b7a72c0a
|
fixing separation of public from private chat. Now things look alright on the Flash side
|
2014-08-11 14:58:58 +00:00 |
|
perroned
|
ef0168fbf4
|
Added footer, fixed navbars
|
2014-08-08 12:30:28 -07:00 |
|
perroned
|
9aa7e182ec
|
Organized code :)
|
2014-08-08 09:04:04 -07:00 |
|
perroned
|
510905d000
|
Cleaning up UI
|
2014-08-08 08:18:38 -07:00 |
|
perroned
|
8060b0b20d
|
Fixed navbar and removed some unused things
|
2014-08-08 08:12:02 -07:00 |
|
perroned
|
43f3a041f8
|
Outlined changes that need to be made to prevent users from having multiple sessions.
|
2014-08-08 06:09:39 -07:00 |
|
perroned
|
72cd8c1050
|
Made prettier, cleaned up code, removed things in code and UI that arent needed
|
2014-08-07 13:29:13 -07:00 |
|
perroned
|
eb5ef9cd08
|
Unifying layouts and modules. Making everything look better and look the same. Reducing code and making it easier to add modules.
|
2014-08-07 09:02:35 -07:00 |
|
perroned
|
903eda589f
|
Major changes to UI and templates
|
2014-08-06 10:46:54 -07:00 |
|
perroned
|
682762cd21
|
First commit
|
2014-08-06 06:03:03 -07:00 |
|
perroned
|
e122e31521
|
Working on whiteboard positioning
|
2014-08-06 05:57:51 -07:00 |
|
Anton Georgiev
|
fea70bda5f
|
using coffeescript 'comprehension'
|
2014-08-05 21:48:11 +00:00 |
|
Anton Georgiev
|
eea49c7663
|
Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
labs/meteor-client/client/main.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.coffee
labs/meteor-client/client/views/whiteboard/whiteboard.html
|
2014-08-05 21:27:15 +00:00 |
|
Anton Georgiev
|
977a7f137c
|
reworking whiteboard.html, set the whiteboard to be displayed by default
|
2014-08-05 21:18:18 +00:00 |
|
Anton Georgiev
|
204acf3c53
|
cleaning up
|
2014-08-05 21:13:51 +00:00 |
|
Anton Georgiev
|
293bec988e
|
displaying shapes again
|
2014-08-05 21:10:56 +00:00 |
|
Anton Georgiev
|
07cec1d020
|
cleaning up
|
2014-08-05 21:07:33 +00:00 |
|
Anton Georgiev
|
327b547014
|
split the whiteboard template so that when the slide info is loaded/modified we trigger an event and rerender the slide template
|
2014-08-05 21:05:31 +00:00 |
|
perroned
|
ed1ca4651e
|
Added lower hand
|
2014-08-05 11:14:19 -07:00 |
|
Maxim Khlobystov
|
f9a483561e
|
Meteor client detects URLs inside messages received (from either Meteor or Flash). Outgoing messages are being parsed and re-rendered to be compatible with Flash client.
|
2014-08-01 10:38:48 -07:00 |
|
perroned
|
17e4ea629f
|
Fixed some errors
|
2014-08-01 08:01:44 -07:00 |
|
Anton Georgiev
|
c8de68eaca
|
now the slide is displayed when we first load the page
|
2014-08-01 14:54:48 +00:00 |
|
perroned
|
d5ab7d1009
|
Added toggle for whiteboard visibility
|
2014-08-01 06:51:45 -07:00 |
|
perroned
|
aff1b175f6
|
Merge branch 'prototype-metor-client' of https://github.com/perroned/bigbluebutton into prototype-metor-client
|
2014-07-31 13:48:24 -07:00 |
|
perroned
|
24918e943b
|
Supressed a lot of debugging
|
2014-07-31 13:31:50 -07:00 |
|
perroned
|
b3430cc09b
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-07-31 13:22:45 -07:00 |
|
perroned
|
2d101e25e3
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-07-31 12:24:37 -07:00 |
|
Anton Georgiev
|
df0d0668c0
|
cleaning up
|
2014-07-31 19:13:00 +00:00 |
|
Anton Georgiev
|
b0cc462953
|
needed to remove another line of obsolete code causing an error
|
2014-07-31 17:42:46 +00:00 |
|
Anton Georgiev
|
627f46f84e
|
was able to display a rectangle on the slide
|
2014-07-31 17:38:54 +00:00 |
|
Anton Georgiev
|
9205fcef60
|
fixing the calling of displaySlide, displayShapeOnSlide. Removing code referring to globals... (left over from the Express version)
|
2014-07-31 17:34:52 +00:00 |
|
Anton Georgiev
|
7fe1eb8e1e
|
splitting the displaying of slide and shapes into separate functions and calling them via Spacebar
|
2014-07-31 15:16:47 +00:00 |
|
perroned
|
1d7e4aed8d
|
Tidying UI
|
2014-07-31 07:29:45 -07:00 |
|
perroned
|
3d402ef11c
|
Adding user accessibility options
|
2014-07-31 07:11:01 -07:00 |
|
Anton Georgiev
|
fdd7c57d03
|
started work on drawing shapes
|
2014-07-30 21:31:12 +00:00 |
|
perroned
|
a15265b0c5
|
More tooltips :)
|
2014-07-30 13:51:54 -07:00 |
|
perroned
|
92eeb16c4b
|
Added more tooltips
|
2014-07-30 13:24:53 -07:00 |
|
perroned
|
39d47318d6
|
Added some tooltips
|
2014-07-30 13:22:23 -07:00 |
|
Anton Georgiev
|
0c9a17f308
|
remove Draw button
|
2014-07-30 19:42:34 +00:00 |
|
Anton Georgiev
|
69d8e54141
|
fixed the displaying of the current slide - had to regulate which presentation is current=true aside from which slide is current=true
|
2014-07-30 19:35:31 +00:00 |
|
Anton Georgiev
|
e966ae84ca
|
cleaning up
|
2014-07-30 18:29:02 +00:00 |
|
Anton Georgiev
|
d25df88be4
|
rough: displays the slide
|
2014-07-30 17:06:29 +00:00 |
|
Anton Georgiev
|
22ce0dd2bc
|
cleaning up
|
2014-07-30 16:22:22 +00:00 |
|
Anton Georgiev
|
a284517ffe
|
slide.current true is updated in the collection when the slide changes on the Flash client
|
2014-07-30 16:19:11 +00:00 |
|
Anton Georgiev
|
a57e8e61bc
|
got the slideId
|
2014-07-30 15:20:29 +00:00 |
|
Anton Georgiev
|
5f5d18c52d
|
add only unique presentations
|
2014-07-29 21:33:35 +00:00 |
|
Anton Georgiev
|
176f1176c1
|
working on adding presentations to the collection
|
2014-07-29 21:30:16 +00:00 |
|
Anton Georgiev
|
b6d9b45f37
|
adding Presentations collection
|
2014-07-29 20:57:02 +00:00 |
|
Anton Georgiev
|
9af56af4b1
|
add the raphaeljs-package
|
2014-07-29 20:29:53 +00:00 |
|
Anton Georgiev
|
cd7ea270df
|
moved the code from the whiteboard prototype to the html5 client. Now will start integrating it
|
2014-07-29 19:23:16 +00:00 |
|
perroned
|
b16f01f0d4
|
Fix the user being registered as talking if they mute while talking.
|
2014-07-29 12:22:41 -07:00 |
|
perroned
|
1700417958
|
Fix field name being used
|
2014-07-29 12:21:27 -07:00 |
|
perroned
|
042ba3cc00
|
Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client
|
2014-07-29 10:07:12 -07:00 |
|
Anton Georgiev
|
834b48dde3
|
cleaning up
|
2014-07-29 16:02:30 +00:00 |
|
Anton Georgiev
|
821af76933
|
now user.voiceUser.muted changes to true/false as it is supposed to do
|
2014-07-29 15:58:32 +00:00 |
|
Anton Georgiev
|
7a03063d52
|
wait for mute_voice_user_request
|
2014-07-29 15:55:46 +00:00 |
|
Anton Georgiev
|
f10650d8d8
|
fix publishing
|
2014-07-29 15:42:19 +00:00 |
|
perroned
|
bc0b2ccee7
|
Clear private chat messages when conversation is closed.
|
2014-07-29 08:04:55 -07:00 |
|
Anton Georgiev
|
140795f694
|
working on mute/unmute events
|
2014-07-29 15:03:19 +00:00 |
|
perroned
|
9f8729a825
|
Handlebars comment style doesn't work so well.
|
2014-07-29 07:24:21 -07:00 |
|
perroned
|
30d96b8229
|
User raise hand ability since html5 client will be for students/viewers
|
2014-07-29 07:20:51 -07:00 |
|
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 |
|