BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,048 Commits 13 Branches 260 Tags 1.1 GiB
bd0cffcdeb
Commit Graph

825 Commits

Author SHA1 Message Date
Anton Georgiev
725583335b Merge branch 'meteor-disconnection-handling' into meteor-new-auth 2014-10-09 20:08:27 +00:00
Anton Georgiev
c7d3d9b9db minor fix for public chat messages 2014-10-09 20:05:29 +00:00
Anton Georgiev
79c40f3c31 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-disconnection-handling 2014-10-09 19:56:30 +00:00
perroned
5beacad9f0 Fixed up some methods that weren't updated to use new id method. 2014-10-09 10:43:22 -07:00
perroned
dbd3478605 Cleaned up a bit. 2014-10-09 10:38:06 -07:00
perroned
9247921b1c Fixed muting and unmuting of users. 2014-10-09 10:27:44 -07:00
perroned
7d1afee614 Fixed joining and leaving audio. Muting remaining. 2014-10-09 09:48:27 -07:00
perroned
bc3e0f0ab3 Now use DBID for webrtc calls, and call server methods with updated params. 2014-10-09 09:39:58 -07:00
perroned
f010decbe9 Changed webrtc call to use nginx websocket. 2014-10-09 09:35:39 -07:00
perroned
17b468bc05 Made some code faster in places where we only need the size of the records returned. Take the count directly from the cursor returned instead of turning the cursor into an array first and taking the length. 2014-10-09 06:58:48 -07:00
perroned
dde59de62c Cleaned up UI with a message when you cannot chat with anyone. 2014-10-09 06:45:49 -07:00
Anton Georgiev
add73d17e2 identify disconnection 2014-10-08 22:05:57 +00:00
Anton Georgiev
631435e57e reduce clutter in js console 2014-10-08 21:57:33 +00:00
perroned
ab81ad8440 Removed backslash making a non standard escape character 2014-10-08 13:09:28 -07:00
Anton Georgiev
1a91092c82 cleaning up 2014-10-07 23:22:28 +00:00
Anton Georgiev
76a7e34357 fixed starting a private chat via clicking on the name in Options 2014-10-07 23:16:47 +00:00
Anton Georgiev
da846ac2d5 now the private chat messages are displayed 2014-10-07 23:09:33 +00:00
Anton Georgiev
4a93388c4d private chat using dbid 2014-10-07 23:08:48 +00:00
Anton Georgiev
9a901d56d7 version and date already set here: https://github.com/antobinary/bigbluebutton/blob/exploring-grunt/labs/meteor-client/app/client/main.coffee#L81-L82 2014-10-07 21:47:13 +00:00
Anton Georgiev
7ce7b96acf remove user after bbb-app's acknowledgement 2014-10-07 20:53:25 +00:00
Anton Georgiev
9261898476 fixed logging out 2014-10-07 20:34:03 +00:00
Anton Georgiev
7dccc09608 handle user_left_message 2014-10-07 20:08:36 +00:00
Anton Georgiev
846a59d4c8 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth 2014-10-07 19:52:51 +00:00
Anton Georgiev
866bd4e539 minor things 2014-10-07 19:52:30 +00:00
perroned
2bca7df34d Fixed lowering and raising hands to use database id. 2014-10-07 12:28:54 -07:00
Anton Georgiev
aa270da0d2 fix footer version, date 2014-10-07 18:05:37 +00:00
Anton Georgiev
319a1247a1 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth 
Conflicts:
	labs/meteor-client/app/client/globals.coffee
	labs/meteor-client/app/client/views/chat/chat_bar.coffee
	labs/meteor-client/app/collections/chat.coffee
	labs/meteor-client/app/collections/meetings.coffee
	labs/meteor-client/app/collections/presentations.coffee
	labs/meteor-client/app/collections/shapes.coffee
	labs/meteor-client/app/collections/slides.coffee
	labs/meteor-client/app/collections/users.coffee
 2014-10-07 17:45:47 +00:00
perroned
9ede339463 Fixed bug so now your name is highlighted and displayed to you in the participants window. 2014-10-07 09:37:37 -07:00
perroned
6d7c3bd72a Exclude yourself from list of participants you can chat with. 2014-10-07 09:36:10 -07:00
perroned
b1100641e5 Fixed function for identifying the current user. 2014-10-07 09:35:45 -07:00
perroned
ea60cef89b Added comment for something we need to fix later. 2014-10-07 09:30:04 -07:00
perroned
b4e6ec2e5d More appropriate message when error in retrieving meeting name. 2014-10-07 09:12:53 -07:00
perroned
fb8cabc445 Fixed login procedure, with help from Anton. 2014-10-07 08:47:46 -07:00
perroned
25cb1b80a0 fixed typo. 2014-10-07 08:44:30 -07:00
perroned
20c7ac5d17 Added a comment explaining a confusing bit of code. 2014-10-07 08:41:18 -07:00
perroned
e65cfb4fba Fixed issue when selecting public chat because it has no unique identifier. 2014-10-07 08:12:53 -07:00
perroned
f745320ece small changes 2014-10-07 06:27:17 -07:00
perroned
5e6981b2ad Exclude another field. 2014-10-07 06:26:38 -07:00
perroned
47b2c8314c removed useless security check. 2014-10-03 11:09:44 -07:00
perroned
06b09e744f Remove sample data. 2014-10-03 10:34:52 -07:00
perroned
d813870f52 Temporary function to retrieve user info. 2014-10-03 10:32:44 -07:00
perroned
9baeb15927 Extra check on incoming messages. 2014-10-03 10:32:14 -07:00
perroned
f66b2e8f26 Now translates chat messages between html5 and flash, adding case for public messages. 2014-10-03 10:31:45 -07:00
perroned
f56a7159db Temporary spot to get user credentials. 2014-10-03 10:30:39 -07:00
perroned
4cc36eeed8 Send message proper args 2014-10-03 10:27:24 -07:00
perroned
63744a1857 Fixed issue where we couldn't return the time for the user. 2014-10-03 10:26:01 -07:00
Anton Georgiev
ea2dd0ff5a fix path to files 2014-10-02 18:23:10 +00:00
Anton Georgiev
c0cd044937 remove old file 2014-10-02 17:15:04 +00:00
Anton Georgiev
7656bd6ba2 grunt materials 2014-10-02 17:14:41 +00:00
Anton Georgiev
c18bc6bf87 missed 2014-10-02 16:18:33 +00:00
Anton Georgiev
3905e45de7 moving the meteor files into an app folder so that grunt can reside in the root without breaking meteor 2014-10-02 16:16:34 +00:00
perroned
50f4a48727 Prevent redis class from performing lots of un-needed and wasteful checks. 2014-10-02 07:44:53 -07:00
perroned
297d8bf9c9 Added another check reducing wasteful and redundant object checks. 2014-10-02 07:40:18 -07:00
perroned
0cafbba7f7 Added a single field check to remove lots of un-needed, wasteful code. 2014-10-02 07:37:51 -07:00
perroned
20a32fa16e Added some comments, added more fields for updateVoiceUser, fixed up some code. 2014-10-02 07:15:45 -07:00
Maxim Khlobystov
51cbf15365 Added background colour to the whiteboard. 2014-10-01 20:09:15 -07:00
perroned
922caa921f Updated collections to only publish public fields. 2014-10-01 11:07:02 -07:00
perroned
15614fccdb Added ability to translate chat messages between flash and html5. 2014-10-01 11:02:29 -07:00
perroned
f0f01fe486 Distinguishing between server invokeable and server action methods. Removing authentication for private server action methods. 2014-09-30 10:12:47 -07:00
perroned
35c4e9645b Moving more functions to be private. 2014-09-30 10:02:36 -07:00
perroned
58e62e4511 Adding more security to server methods. 2014-09-30 06:56:10 -07:00
Anton Georgiev
3f45b6fc18 the footer grabs data from config.coffee 2014-09-25 20:02:38 +00:00
perroned
8f36a7817e Securing client access to server-side slide modifications. 2014-09-25 12:59:26 -07:00
Anton Georgiev
d5d6761831 temporarily hide the webcam button (until we actually start dealing with webcams) 2014-09-25 19:51:06 +00:00
Anton Georgiev
351f175796 do not send a message to the user. It will open a tab for them before you have even started typing your message 2014-09-25 19:47:00 +00:00
perroned
a9cf977654 Adding in commented code for securing presentations. If uncommented no slides or presentations can be used until the user is properly supplied with credentials on log in (still figuring that out). 2014-09-25 12:20:00 -07:00
Anton Georgiev
7beffc1ac7 Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into chat-tab-flashing 2014-09-25 19:00:57 +00:00
Anton Georgiev
b506b6a412 cleaning up and changing the color for new chat message notification 2014-09-25 18:58:32 +00:00
perroned
d141729d89 Moving more methods to server side only. 2014-09-25 11:47:43 -07:00
Anton Georgiev
49461f4bb3 implemented visual notification for unread chat messages 2014-09-25 18:35:04 +00:00
Maxim Khlobystov
156e84cb70 Made zoom level consistent between slides and encapsulated some duplicate code. 2014-09-25 11:34:08 -07:00
perroned
06b9919afd Moved redis publishing functionality to non-client-callable server side format. 2014-09-25 11:29:43 -07:00
Anton Georgiev
137cee3bc5 recover the displaying of the optionBar 2014-09-25 18:17:39 +00:00
Anton Georgiev
1f41635d8b fixed closing private chat tabs. Some cleaning up 2014-09-25 17:57:58 +00:00
Maxim Khlobystov
feba2731e5 Fixed missing cursor on resized whiteboard. 2014-09-25 10:43:09 -07:00
perroned
f98686abc0 Securing more methods. 2014-09-25 10:37:07 -07:00
Anton Georgiev
de672cd6ca recording tabs in a clientside only collection. 2014-09-25 17:24:42 +00:00
perroned
7486acd1f8 Many more changes to functions to user different ids, and server methods more secured. 2014-09-25 10:21:46 -07:00
perroned
ac542d0f87 More changes to server side methods. 2014-09-25 09:19:02 -07:00
perroned
6ab262f368 Changing ids and validating method callers. 2014-09-25 08:54:14 -07:00
Maxim Khlobystov
46026e330b Fixed zooming and panning so that it works properly with any adjusted size of slides. 2014-09-25 08:30:48 -07:00
perroned
715686f34e Moving files to the server to restrict client access. 2014-09-25 07:45:13 -07:00
Maxim Khlobystov
6566347ae1 Fixed the issue with whiteboard borders for the very first slide user sees after opening a new presentation. 2014-09-24 14:38:33 -07:00
perroned
a0ffb6e48d Working on lower and raise hand. 2014-09-24 12:55:55 -07:00
Anton Georgiev
ab0e746ee1 move tab related code in chat_bar.coffee 2014-09-24 19:44:18 +00:00
Maxim Khlobystov
6efe4ccfb5 Fixed whiteboard scaling. 2014-09-24 10:26:24 -07:00
perroned
8c908204bc Change newline character. 2014-09-24 09:48:25 -07:00
perroned
efbd3f1e94 More switching 2014-09-24 09:46:19 -07:00
perroned
52f0b771fe Switching userIds to _ids in chat. 2014-09-24 09:42:02 -07:00
perroned
f6421c08fa Merge conflicts 2014-09-24 08:46:57 -07:00
Anton Georgiev
5876d5ef9a found when a given chat tab should be flashing 2014-09-24 00:18:27 +00:00
Anton Georgiev
18c876b69c mute/unmute yourself from the userlist icons 2014-09-23 20:56:57 +00:00
Anton Georgiev
a84e48f9b2 lower your own hand from the userlist icon if it [your hand] has been raised 2014-09-23 20:40:59 +00:00
Anton Georgiev
866f9d5d77 simplify how get_all_meetings_request is sent 2014-09-23 20:15:03 +00:00
Anton Georgiev
81427b7968 cosolidate validateAuthToken 2014-09-23 19:59:56 +00:00
Anton Georgiev
9bc23c9510 restructuring the serverside. All publishing should go through "publish" 2014-09-23 19:55:25 +00:00
Anton Georgiev
a9697d96cc ask the user to confirm before logging out 2014-09-23 19:02:31 +00:00
Anton Georgiev
7d9f25fd9b fix logging out, which I broke earlier today with the moving of some code into users.coffee 2014-09-23 18:59:58 +00:00
Anton Georgiev
0e9bf62d48 fix indentation 2014-09-23 18:27:59 +00:00
Anton Georgiev
d31124239e split the welcome message into multiple lines 2014-09-23 18:03:59 +00:00
Anton Georgiev
0dbeb75148 remove excess logging 2014-09-23 17:20:18 +00:00
Anton Georgiev
288bcc88db updating the user related methods 2014-09-23 15:58:13 +00:00
Anton Georgiev
e67cc4f68b move user-related meteor methods out of redispubsub 2014-09-23 15:45:01 +00:00
Maxim Khlobystov
e3f98d488d Merge branch 'testing-version-002' of https://github.com/antobinary/bigbluebutton into meteor-client-whiteboard 2014-09-23 08:40:47 -07:00
Anton Georgiev
47e3b4eded send a user_left_voice_request when the html5 user clicks on Leave Audio. Right now we just leave it to webrtc to notify the server 2014-09-23 15:22:55 +00:00
Maxim Khlobystov
5e6c6a4739 Improved zooming performance by getting rid of multiple MongoDB observe handlers. 2014-09-22 17:07:01 -07:00
Maxim Khlobystov
9de4e24a26 Fixed ascending scaling for portrait slides on window resize. 2014-09-22 15:29:37 -07:00
Maxim Khlobystov
13166247a0 Added presentation's filename to the whiteboard title. 2014-09-22 15:11:24 -07:00
Anton Georgiev
32f1473ba0 Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into testing-version-002 
Conflicts:
	labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee
 2014-09-22 21:51:09 +00:00
Anton Georgiev
6a2c6f2848 force more of the username to be displayed 2014-09-22 21:47:05 +00:00
Maxim Khlobystov
d86257bee2 Beginning work on whiteboard scaling. 2014-09-22 14:13:10 -07:00
Maxim Khlobystov
3b7f9f254a Fixed the issue with multiple cursors (window resizing or undoing annotation). 2014-09-22 14:00:50 -07:00
Anton Georgiev
d5f4a1630e Merge branch 'meteor-client-whiteboard' of github.com:gthacoder/bigbluebutton into merge-whiteboard-changes 2014-09-22 20:14:14 +00:00
Anton Georgiev
c47c7f78cb giving current_time another try// using it as a timestamp in the chat window in HTML5 2014-09-22 19:56:54 +00:00
Anton Georgiev
626e91fe1c Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merge-danny-ui 
Conflicts:
	labs/meteor-client/client/views/chat/chat_bar.coffee
	labs/meteor-client/client/views/users/user_item.html
 2014-09-22 19:35:53 +00:00
Maxim Khlobystov
a51d4874a4 Fixed the issue with redisplaying shapes that occured while changing slides or undoing annotation. 2014-09-21 16:36:50 -07:00
Maxim Khlobystov
50301a9ce9 Reverted the changes related to multiple cursors. 2014-09-21 16:24:06 -07:00
Anton Georgiev
4e439b7f0e displays listen_only users. Added tooltips to listen_only and muted 2014-09-19 21:23:58 +00:00
Anton Georgiev
3e193fe51a simplify the handling of voice events, reusing some code 2014-09-19 19:51:02 +00:00
Anton Georgiev
7df7e19dde handle user_left_voice_message. Implemented a function updateVoiceUser where we will reuse some code 2014-09-19 19:39:59 +00:00
Anton Georgiev
dd4615f573 reuse the code for getting the time a user joined 2014-09-19 18:29:06 +00:00
Anton Georgiev
558c5efa1a reverting the changes related to using curr_time for sorting chat messages 2014-09-19 18:21:26 +00:00
Anton Georgiev
bb43a38bed send voiceBridge and duration in get_all_meetings_reply. We need the voiceBridge to join audio 2014-09-19 17:55:59 +00:00
Anton Georgiev
9831e532c5 now using voiceConf from Meteor.Meetings 2014-09-19 15:35:08 +00:00
Anton Georgiev
cad3409cce use the time of joining for the sorting of all chat messages 2014-09-18 23:55:53 +00:00
Anton Georgiev
3ab7d6470d the actual setting of from_time for the greeting message 2014-09-18 23:42:31 +00:00
Anton Georgiev
4381b0528f still dealing with whitespace issues 2014-09-18 23:02:53 +00:00
Anton Georgiev
77a383f497 in the process of adjusting the greeting message to use the time the user entered the meeting 2014-09-18 22:38:54 +00:00
Anton Georgiev
86e36d375e needed to fix indentation before modifying the file, kept getting errors 2014-09-18 22:36:33 +00:00
Anton Georgiev
d8057fddcb try using header.current_time instead of message.from_time whenever possible. We"ll see if it improves how we sort the chat messages 2014-09-18 21:55:53 +00:00
Maxim Khlobystov
938f883b63 Fixed multiple cursors issue on clicking 'Clear All Annotations' (cursor is being removed now). 2014-09-18 08:39:38 -07:00
Anton Georgiev
b17b2b1b99 Merge branch 'meteor-client-whiteboard' of https://github.com/gthacoder/bigbluebutton into testing-version-001 2014-09-17 22:04:43 +00:00
Lucas Zawacki
51dabcfdf5 Refactor whiteboard paper to use less variables 2014-09-17 17:24:13 -03:00
Lucas Zawacki
079c44a367 Add whiteboard pencil based on line tool 2014-09-17 17:04:30 -03:00
perroned
f45ee807e8 Working on presenter tool for muting all users. 2014-09-17 10:51:10 -07:00
perroned
6526cdaa8b Beginning work on stats for # of hands raised. 2014-09-16 12:29:17 -07:00
perroned
e6e66ece42 Removed border code. Doesn't seem to be used/needed anymore. Causes shapes and DOM elements to be created repeatedly. 2014-09-16 07:35:26 -07:00
Maxim Khlobystov
fe526f5277 Encapsulated some duplicate code. 2014-09-15 09:46:02 -07:00
Maxim Khlobystov
e852cceeac Zooming is now applied to paths and all the geometric shapes too. 2014-09-12 13:26:25 -07:00
Maxim Khlobystov
84bddefcbc Fixed browser compatibility issue with running preservation of aspect ratio. 2014-09-12 10:43:19 -07:00
Maxim Khlobystov
022760f255 Added fixed borders adjustable for slide dimensions (fixed the issue with non-standard slides (i.e. A4)). 2014-09-11 16:10:51 -07:00
perroned
b4ed2bac5b Removed resizing for chat box for now. Made error message clearer. 2014-09-11 11:17:31 -07:00
perroned
72f857e76a Fixed title. 2014-09-11 10:37:09 -07:00
perroned
b4414c8c0a Important changes, removed the unnecessary timestamp code, and fixed messages beeing joined when they should sandwich messages from another user. 2014-09-11 10:02:29 -07:00
perroned
4407b9c24b Readded scrolling on chatbar render. 2014-09-11 09:52:33 -07:00
perroned
ddec586d2e Cleaned a few UI things. 2014-09-11 09:37:41 -07:00
perroned
753c80f34e Made extra dummy entry smaller. 2014-09-11 09:31:13 -07:00
perroned
708427422b Comments explaining scrolling. 2014-09-11 09:28:41 -07:00
perroned
61d2a959c8 Fixed message, yet again. 2014-09-11 09:26:06 -07:00
perroned
cea9a226e6 Turns out timing code is still needed for some things. 2014-09-11 08:04:12 -07:00
perroned
350ea3b196 commented out unnessecary time stamp code, group messages within same minute and same user. 2014-09-11 07:35:34 -07:00
Maxim Khlobystov
c1443c45e0 Removed repeating code statement. 2014-09-10 18:12:36 -07:00
Maxim Khlobystov
4e5871dd8e Cleaned up. 2014-09-10 17:48:34 -07:00
Maxim Khlobystov
c37c5c6601 Implemented slide zooming and panning (horizontally and vertically). 2014-09-10 17:02:13 -07:00
perroned
b4b72095ae Cleaned up code a bit. 2014-09-10 13:23:38 -07:00
perroned
74c1363992 Fixed up greeting, added comments for future direction, addressed issue. 2014-09-10 13:05:15 -07:00
perroned
c3a3cd6e83 Working on merging chat messages from the same user. 2014-09-10 12:48:23 -07:00
perroned
314821a243 Merge remote-tracking branch 'maxim/meteor-client-whiteboard' into creating-better-templates 2014-09-10 10:34:52 -07:00
Maxim Khlobystov
22ac4c6598 Proper handling of slide dimensions (natural size). 2014-09-09 09:30:02 -07:00
perroned
cd80d881ad Merge remote-tracking branch 'maxim/meteor-client-whiteboard' into creating-better-templates 2014-09-09 05:37:02 -07:00
Maxim Khlobystov
5ef2913da4 Fixed ellipses on a whiteboard. 2014-09-07 13:34:59 -07:00
Maxim Khlobystov
02678f9c32 Merge branch 'merging-html5-with-master' of https://github.com/antobinary/bigbluebutton into meteor-client-whiteboard 2014-09-04 14:42:14 -07:00
perroned
ecb83c9e53 Added the ability to add new lines to messages. 2014-09-04 11:54:46 -07:00
Maxim Khlobystov
3278da5505 Rounded linecap was added to whiteboard lines. 2014-09-04 11:31:47 -07:00
perroned
bdeb664875 Added tooltips for icons in the users list. 2014-09-04 11:08:08 -07:00
perroned
ce31260a7c Fixed navbar button for hiding/showing navbar. 2014-09-04 10:57:28 -07:00
Anton Georgiev
0e670a05d8 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merging-html5-with-master 2014-09-04 17:15:13 +00:00
Anton Georgiev
fd85a30ff2 handling recording_status_changed_message 2014-09-04 17:13:23 +00:00
perroned
1ddd2e439c Changed title 2014-09-04 10:06:36 -07:00
perroned
37577b3ce4 Fixed server version 2014-09-04 09:46:02 -07:00
Anton Georgiev
1ed41ceb59 splitting "recorded" into "currentlyBeingRecorded" and "intendedForRecording" 2014-09-04 16:34:18 +00:00
perroned
a0163e5117 Fixed meeting recording status. 2014-09-04 09:32:24 -07:00
Anton Georgiev
206a2e23ea Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merging-html5-with-master 2014-09-04 15:04:42 +00:00
perroned
29cdfe1530 Added code for getting proper voice bridge pin 2014-09-04 07:48:50 -07:00
Anton Georgiev
4a88ebdcaf support voice_conf and duration in meeting_create_message. put empty strings for these params in get_all_meetings_reply 2014-09-04 14:47:32 +00:00
perroned
c6a91079bd Added newline and fixed operator. 2014-09-04 07:37:36 -07:00
perroned
acc85a1bf8 Fixed errors when data doesn't load properly. 2014-09-04 06:45:17 -07:00
perroned
65024217a7 Navbar elements do not rely on data being present anymore. So now if there is a connection or data issue the UI doesn't misbehave and disappear. 2014-09-03 13:11:56 -07:00
perroned
12eb51523d Changing the way UI relies on data. 2014-09-03 13:02:00 -07:00
perroned
8c00dcc56d Removed not needed code. Changing UI elements' dependencies to data always being available. 2014-09-03 12:22:08 -07:00
perroned
867928a0b6 Merge remote-tracking branch 'anton/merging-html5-with-master' into creating-better-templates 2014-09-03 10:44:33 -07:00
Anton Georgiev
f5fd9ee664 log when meeting_created_message was received 2014-09-03 15:09:34 +00:00
Anton Georgiev
149b21936d not sure if I should commit these 2014-09-02 15:59:50 +00:00
Anton Georgiev
70a3553ae9 cleaning up 2014-09-02 15:19:50 +00:00
Anton Georgiev
27e05e112a some work on presentation_page_resized_message 2014-09-02 15:19:21 +00:00
perroned
2a6d7b7578 Fixing some UI sizing and overflowing issues. 2014-08-22 11:46:50 -07:00
Anton Georgiev
6776c17ca7 update whiteboard_text 2014-08-22 15:26:37 +00:00
Anton Georgiev
bebe541cbf colorful shapes (cont'd) 2014-08-21 22:31:32 +00:00
Anton Georgiev
8839613e0a Merge branch 'meteor-client-messages-better-templates' of github.com:gthacoder/bigbluebutton into colorful-shapes 2014-08-21 22:17:18 +00:00
Anton Georgiev
ad4413db48 fixed the sorting of chat messages 2014-08-21 16:03:31 -04:00
Maxim Khlobystov
3538ce9509 Stroke color and width are displayed properly on HTML5 client's side. 2014-08-21 12:36:50 -07:00
Anton Georgiev
126b0eb127 removed unused properties from config 2014-08-21 19:07:02 +00:00
Anton Georgiev
f1055361c9 Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into merging-html5-with-master 2014-08-21 18:26:00 +00:00
Anton Georgiev
e93819e3af cleaning up 2014-08-21 18:24:01 +00:00
Anton Georgiev
078fbc938e minor fix 2014-08-21 18:06:34 +00:00
Anton Georgiev
9435b5ee7b (un)muting in Flash is displayed in HTML5 2014-08-21 18:06:08 +00:00
perroned
8a26a7b2a7 Hide settings icon 2014-08-21 08:11:31 -07:00
perroned
64ff5f1da2 Unified color conversion methods combining both to make it better, placed it in globals.coffee as a coffeescript function, and added a global handlebars helper that calls it too. 2014-08-21 07:40:19 -07:00
perroned
f0738dda62 Fixed up issue where closing tags for anchor links were not properly ended causing all following text to be swallowed up in the link text. 2014-08-21 07:12:38 -07:00
perroned
dd9267fab0 Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates 2014-08-21 06:49:20 -07:00
Maxim Khlobystov
75d9c03b48 Tags and line breaks inside the chat messages have been replaced with the ASCII equivalents (keeping links clickable). 2014-08-20 22:14:15 -07:00
Anton Georgiev
d59e3366dc fixed the auto display of shapes 2014-08-20 21:17:52 +00:00
Anton Georgiev
f9261d9696 fix indentation 2014-08-20 21:17:18 +00:00
Anton Georgiev
c746cd30f5 fix typo 2014-08-20 20:43:29 +00:00
perroned
3caebfc1f4 Fixed error message when there are 0 messages in chat, and prevented unsafe data from being inserted into the DOM. 2014-08-20 08:02:48 -07:00
Anton Georgiev
a63ea5875e increased the size of the cursor to make it more visible 2014-08-19 21:20:11 +00:00
Anton Georgiev
de15efbc74 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-19 20:28:12 +00:00
Anton Georgiev
0cb9dc4668 cleaning up 2014-08-19 20:27:44 +00:00
perroned
47bbfad399 Working on whiteboard sizing 2014-08-19 13:22:29 -07:00
Anton Georgiev
6fcaf6537b cleaning up 2014-08-19 19:53:27 +00:00
Anton Georgiev
24fb6c55bb Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-19 19:40:54 +00:00
Anton Georgiev
3edc80bc63 improve the calculation for the relative location of the shape 2014-08-19 19:39:17 +00:00
Anton Georgiev
35086951e5 cleaning up 2014-08-19 19:36:45 +00:00
Anton Georgiev
639f672e29 fixed an issue where textShapes would disappear after page refresh 2014-08-19 19:09:37 +00:00
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