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

733 Commits

Author SHA1 Message Date
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
Anton Georgiev
218092a745 the html5 client now starts as an attendee, not as a Moderator 2014-08-15 20:27:10 +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
Chad Pilkey
9a5343aac5 Merge remote-tracking branch 'upstream/master' into fix-chrome-webrtc 2014-08-08 13:19:42 -07: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