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

360 Commits

Author SHA1 Message Date
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
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
perroned
a0163e5117 Fixed meeting recording status. 2014-09-04 09:32:24 -07:00
perroned
29cdfe1530 Added code for getting proper voice bridge pin 2014-09-04 07:48:50 -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
70a3553ae9 cleaning up 2014-09-02 15:19:50 +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
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
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
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
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
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
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
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