Commit Graph

236 Commits

Author SHA1 Message Date
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
06b09e744f Remove sample data. 2014-10-03 10:34:52 -07:00
perroned
4cc36eeed8 Send message proper args 2014-10-03 10:27:24 -07:00
perroned
58e62e4511 Adding more security to server methods. 2014-09-30 06:56:10 -07:00
perroned
715686f34e Moving files to the server to restrict client access. 2014-09-25 07:45:13 -07:00
perroned
a0ffb6e48d Working on lower and raise hand. 2014-09-24 12:55:55 -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
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
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
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
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
Anton Georgiev
4e439b7f0e displays listen_only users. Added tooltips to listen_only and muted 2014-09-19 21:23:58 +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
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
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
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
Maxim Khlobystov
fe526f5277 Encapsulated some duplicate code. 2014-09-15 09:46:02 -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
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
ecb83c9e53 Added the ability to add new lines to messages. 2014-09-04 11:54:46 -07:00
perroned
bdeb664875 Added tooltips for icons in the users list. 2014-09-04 11:08:08 -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
078fbc938e minor fix 2014-08-21 18:06:34 +00: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