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
|
fd91be7622
|
allowing single quote in the meeting name so that we can enter the meetings created through the API e.x. Anton's meeting. Still stripping double quote because otherwise the name would be wrapped in double quotes
|
2014-09-19 15:55:56 +00:00 |
|
Anton Georgiev
|
9831e532c5
|
now using voiceConf from Meteor.Meetings
|
2014-09-19 15:35:08 +00:00 |
|
Anton Georgiev
|
c2185c5cdc
|
Merge branch 'testing-version-002' of github.com:antobinary/bigbluebutton into testing-version-002
|
2014-09-18 23:56:17 +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
|
e8c9239861
|
fix typo
|
2014-09-18 19:44:33 -04: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 |
|
Anton Georgiev
|
d6bfa9dbda
|
rework the quote stripping
|
2014-09-18 21:19:51 +00:00 |
|
Anton Georgiev
|
b7fef986d7
|
added a meetingName field so we can now control in which meeting we are entering"
|
2014-09-18 20:47:33 +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 |
|
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
|
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 |
|