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 |
|