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

1826 Commits

Author SHA1 Message Date
Anton Georgiev
137cee3bc5 recover the displaying of the optionBar 2014-09-25 18:17:39 +00:00
Anton Georgiev
1f41635d8b fixed closing private chat tabs. Some cleaning up 2014-09-25 17:57:58 +00:00
Maxim Khlobystov
feba2731e5 Fixed missing cursor on resized whiteboard. 2014-09-25 10:43:09 -07:00
perroned
f98686abc0 Securing more methods. 2014-09-25 10:37:07 -07:00
Anton Georgiev
de672cd6ca recording tabs in a clientside only collection. 2014-09-25 17:24:42 +00:00
perroned
7486acd1f8 Many more changes to functions to user different ids, and server methods more secured. 2014-09-25 10:21:46 -07:00
perroned
ac542d0f87 More changes to server side methods. 2014-09-25 09:19:02 -07:00
perroned
6ab262f368 Changing ids and validating method callers. 2014-09-25 08:54:14 -07:00
Maxim Khlobystov
46026e330b Fixed zooming and panning so that it works properly with any adjusted size of slides. 2014-09-25 08:30:48 -07:00
perroned
715686f34e Moving files to the server to restrict client access. 2014-09-25 07:45:13 -07:00
Maxim Khlobystov
6566347ae1 Fixed the issue with whiteboard borders for the very first slide user sees after opening a new presentation. 2014-09-24 14:38:33 -07:00
perroned
a0ffb6e48d Working on lower and raise hand. 2014-09-24 12:55:55 -07:00
Anton Georgiev
ab0e746ee1 move tab related code in chat_bar.coffee 2014-09-24 19:44:18 +00:00
Maxim Khlobystov
6efe4ccfb5 Fixed whiteboard scaling. 2014-09-24 10:26:24 -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
866f9d5d77 simplify how get_all_meetings_request is sent 2014-09-23 20:15:03 +00:00
Anton Georgiev
81427b7968 cosolidate validateAuthToken 2014-09-23 19:59:56 +00:00
Anton Georgiev
9bc23c9510 restructuring the serverside. All publishing should go through "publish" 2014-09-23 19:55:25 +00:00
Anton Georgiev
a9697d96cc ask the user to confirm before logging out 2014-09-23 19:02:31 +00:00
Anton Georgiev
7d9f25fd9b fix logging out, which I broke earlier today with the moving of some code into users.coffee 2014-09-23 18:59:58 +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
0dbeb75148 remove excess logging 2014-09-23 17:20:18 +00:00
Anton Georgiev
288bcc88db updating the user related methods 2014-09-23 15:58:13 +00:00
Anton Georgiev
e67cc4f68b move user-related meteor methods out of redispubsub 2014-09-23 15:45:01 +00:00
Maxim Khlobystov
e3f98d488d Merge branch 'testing-version-002' of https://github.com/antobinary/bigbluebutton into meteor-client-whiteboard 2014-09-23 08:40:47 -07:00
Anton Georgiev
47e3b4eded send a user_left_voice_request when the html5 user clicks on Leave Audio. Right now we just leave it to webrtc to notify the server 2014-09-23 15:22:55 +00:00
Maxim Khlobystov
5e6c6a4739 Improved zooming performance by getting rid of multiple MongoDB observe handlers. 2014-09-22 17:07:01 -07:00
Maxim Khlobystov
9de4e24a26 Fixed ascending scaling for portrait slides on window resize. 2014-09-22 15:29:37 -07:00
Maxim Khlobystov
13166247a0 Added presentation's filename to the whiteboard title. 2014-09-22 15:11:24 -07: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
Anton Georgiev
6a2c6f2848 force more of the username to be displayed 2014-09-22 21:47:05 +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
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
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
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
perroned
f45ee807e8 Working on presenter tool for muting all users. 2014-09-17 10:51:10 -07:00
perroned
6526cdaa8b Beginning work on stats for # of hands raised. 2014-09-16 12:29:17 -07:00
perroned
a2274bf017 Made user presenter. Beginning presenter functionality. 2014-09-16 08:24:52 -07:00
perroned
e6e66ece42 Removed border code. Doesn't seem to be used/needed anymore. Causes shapes and DOM elements to be created repeatedly. 2014-09-16 07:35:26 -07: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
b4ed2bac5b Removed resizing for chat box for now. Made error message clearer. 2014-09-11 11:17:31 -07:00
perroned
72f857e76a Fixed title. 2014-09-11 10:37:09 -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
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
Anton Georgiev
0e670a05d8 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merging-html5-with-master 2014-09-04 17:15:13 +00:00
Anton Georgiev
fd85a30ff2 handling recording_status_changed_message 2014-09-04 17:13:23 +00: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
Anton Georgiev
1ed41ceb59 splitting "recorded" into "currentlyBeingRecorded" and "intendedForRecording" 2014-09-04 16:34:18 +00:00
perroned
a0163e5117 Fixed meeting recording status. 2014-09-04 09:32:24 -07:00
Anton Georgiev
206a2e23ea Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merging-html5-with-master 2014-09-04 15:04:42 +00:00
perroned
29cdfe1530 Added code for getting proper voice bridge pin 2014-09-04 07:48:50 -07:00
Anton Georgiev
4a88ebdcaf support voice_conf and duration in meeting_create_message. put empty strings for these params in get_all_meetings_reply 2014-09-04 14:47:32 +00:00
perroned
c6a91079bd Added newline and fixed operator. 2014-09-04 07:37:36 -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
f5fd9ee664 log when meeting_created_message was received 2014-09-03 15:09:34 +00:00
Anton Georgiev
149b21936d not sure if I should commit these 2014-09-02 15:59:50 +00:00
Anton Georgiev
70a3553ae9 cleaning up 2014-09-02 15:19:50 +00:00
Anton Georgiev
27e05e112a some work on presentation_page_resized_message 2014-09-02 15:19:21 +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
Anton Georgiev
ad4413db48 fixed the sorting of chat messages 2014-08-21 16:03:31 -04: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
126b0eb127 removed unused properties from config 2014-08-21 19:07:02 +00:00
Anton Georgiev
8ef0248868 removed unused properties from config 2014-08-21 19:06:20 +00: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
Anton Georgiev
9435b5ee7b (un)muting in Flash is displayed in HTML5 2014-08-21 18:06:08 +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
Anton Georgiev
adf20cca7d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-08-20 15:24:25 +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
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
perroned
17e4ea629f Fixed some errors 2014-08-01 08:01:44 -07:00
Anton Georgiev
c8de68eaca now the slide is displayed when we first load the page 2014-08-01 14:54:48 +00:00
perroned
d5ab7d1009 Added toggle for whiteboard visibility 2014-08-01 06:51:45 -07:00
perroned
aff1b175f6 Merge branch 'prototype-metor-client' of https://github.com/perroned/bigbluebutton into prototype-metor-client 2014-07-31 13:48:24 -07:00
perroned
24918e943b Supressed a lot of debugging 2014-07-31 13:31:50 -07:00
perroned
b3430cc09b Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-31 13:22:45 -07:00
perroned
2d101e25e3 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-31 12:24:37 -07:00
Anton Georgiev
df0d0668c0 cleaning up 2014-07-31 19:13:00 +00:00
Anton Georgiev
b0cc462953 needed to remove another line of obsolete code causing an error 2014-07-31 17:42:46 +00:00
Anton Georgiev
627f46f84e was able to display a rectangle on the slide 2014-07-31 17:38:54 +00:00
Anton Georgiev
9205fcef60 fixing the calling of displaySlide, displayShapeOnSlide. Removing code referring to globals... (left over from the Express version) 2014-07-31 17:34:52 +00:00
Anton Georgiev
7fe1eb8e1e splitting the displaying of slide and shapes into separate functions and calling them via Spacebar 2014-07-31 15:16:47 +00:00
perroned
1d7e4aed8d Tidying UI 2014-07-31 07:29:45 -07:00
perroned
3d402ef11c Adding user accessibility options 2014-07-31 07:11:01 -07:00
Anton Georgiev
fdd7c57d03 started work on drawing shapes 2014-07-30 21:31:12 +00:00
perroned
a15265b0c5 More tooltips :) 2014-07-30 13:51:54 -07:00
perroned
92eeb16c4b Added more tooltips 2014-07-30 13:24:53 -07:00
perroned
39d47318d6 Added some tooltips 2014-07-30 13:22:23 -07:00
Anton Georgiev
0c9a17f308 remove Draw button 2014-07-30 19:42:34 +00:00
Anton Georgiev
69d8e54141 fixed the displaying of the current slide - had to regulate which presentation is current=true aside from which slide is current=true 2014-07-30 19:35:31 +00:00
Anton Georgiev
e966ae84ca cleaning up 2014-07-30 18:29:02 +00:00
Anton Georgiev
d25df88be4 rough: displays the slide 2014-07-30 17:06:29 +00:00
Anton Georgiev
22ce0dd2bc cleaning up 2014-07-30 16:22:22 +00:00
Anton Georgiev
a284517ffe slide.current true is updated in the collection when the slide changes on the Flash client 2014-07-30 16:19:11 +00:00
Anton Georgiev
a57e8e61bc got the slideId 2014-07-30 15:20:29 +00:00
Anton Georgiev
5f5d18c52d add only unique presentations 2014-07-29 21:33:35 +00:00
Anton Georgiev
176f1176c1 working on adding presentations to the collection 2014-07-29 21:30:16 +00:00
Anton Georgiev
b6d9b45f37 adding Presentations collection 2014-07-29 20:57:02 +00:00
Anton Georgiev
9af56af4b1 add the raphaeljs-package 2014-07-29 20:29:53 +00:00
Anton Georgiev
cd7ea270df moved the code from the whiteboard prototype to the html5 client. Now will start integrating it 2014-07-29 19:23:16 +00:00
perroned
b16f01f0d4 Fix the user being registered as talking if they mute while talking. 2014-07-29 12:22:41 -07:00
perroned
1700417958 Fix field name being used 2014-07-29 12:21:27 -07:00
perroned
042ba3cc00 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-29 10:07:12 -07:00
Anton Georgiev
834b48dde3 cleaning up 2014-07-29 16:02:30 +00:00
Anton Georgiev
821af76933 now user.voiceUser.muted changes to true/false as it is supposed to do 2014-07-29 15:58:32 +00:00
Anton Georgiev
7a03063d52 wait for mute_voice_user_request 2014-07-29 15:55:46 +00:00
Anton Georgiev
f10650d8d8 fix publishing 2014-07-29 15:42:19 +00:00
perroned
bc0b2ccee7 Clear private chat messages when conversation is closed. 2014-07-29 08:04:55 -07:00
Anton Georgiev
140795f694 working on mute/unmute events 2014-07-29 15:03:19 +00:00
perroned
9f8729a825 Handlebars comment style doesn't work so well. 2014-07-29 07:24:21 -07:00
perroned
30d96b8229 User raise hand ability since html5 client will be for students/viewers 2014-07-29 07:20:51 -07:00
Anton Georgiev
7730abbeb8 fix for the merge and fix for an issue with get_all_meetings_request not recognized in bbb-apps 2014-07-28 21:01:06 +00:00
Anton Georgiev
3075166fa8 Merge branch 'meteor-merge-private-chat' into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/client/views/chat/chat_bar.coffee
 2014-07-28 19:56:40 +00:00
perroned
248b90f3bb Adding UI for muting functionality 2014-07-28 12:24:07 -07:00
Anton Georgiev
17ae9c1d88 style change 2014-07-28 19:13:36 +00:00
Maxim Khlobystov
3b10e80342 XX:00 bug in timestamps was fixed. 2014-07-28 11:04:40 -07:00
perroned
7e8cedc4dc Updated UI to now show whether a user is sharing audio and further whether the user is actually speaking or not. 2014-07-28 10:43:26 -07:00
perroned
b7a0a1ed31 Status bar icon now shows when user is talking. Should be changed to use more pronounced icons. 2014-07-28 08:52:50 -07:00
perroned
4be030ef2f Clear user data when they logout 2014-07-28 08:00:07 -07:00
perroned
682e4a5dcd Wipe subscriptions after user logout 2014-07-25 09:36:31 -07:00
perroned
904d91f2b2 Only load collections when the previous was successful, now check if user is validated by checking the integrity of their database entry 2014-07-24 13:06:07 -07:00
perroned
3eb2ce47e8 Display header only when user is actually inside 2014-07-24 13:04:53 -07:00
perroned
48806ca51f Will need to implement this server-side function 2014-07-24 13:04:04 -07:00
perroned
47c28469d8 Manual merge of meteor-client-change-logout into prototype-metor-client 2014-07-24 11:04:12 -07:00
perroned
62dde1fb8c Restructured logout procedure 2014-07-24 10:56:31 -07:00
perroned
f826215dd7 Now displays when user is actually talking 2014-07-24 09:12:27 -07:00
perroned
0b931aa7d8 Working on detecting sound while talking 2014-07-24 07:43:46 -07:00
perroned
44c16be891 Update user list title 2014-07-24 07:42:17 -07:00
perroned
49e05abebd Update methods for user sharing audio 2014-07-24 07:39:53 -07:00
Maxim Khlobystov
e2fd5f5202 Chat message timestamp is fixed (converted from Epoch time to 24-hour clock). 2014-07-22 18:38:52 -07:00
perroned
ace02d8cb4 Supressed error and make access safer. Still don't know what the proper way to fix this is. 2014-07-22 08:15:24 -07:00
perroned
f45abb866b Fixed message scrolling and added some message filtering 2014-07-22 06:33:27 -07:00
perroned
387ad47f31 Updated method for determining whether user is talking 2014-07-22 06:31:32 -07:00
perroned
eb7c8d0507 Kicking users now works properly 2014-07-21 08:54:38 -07:00
perroned
d6e7ee3944 Updated session to coffeescript from js 2014-07-21 08:30:21 -07:00
perroned
1113ecc114 Fixed logout issue 2014-07-18 08:18:27 -07:00
perroned
2461be4edf Merging in persistent sorage solution 2014-07-18 07:30:46 -07:00
perroned
11904455cf Removed files 2014-07-18 07:21:54 -07:00
perroned
0de71c6039 removing things 2014-07-18 07:19:49 -07:00
perroned
5a96d7c370 Updated ignore file 2014-07-18 07:17:06 -07:00
perroned
3214985e4e Commented code 2014-07-18 07:08:59 -07:00
perroned
730616631a Once logged out user cannot return to meeting without the server validating their entrance. 2014-07-18 06:41:35 -07:00
perroned
7e4b88a5d1 Updated session calls to use amplifies session. data now preserved upon refresh 2014-07-17 13:13:06 -07:00
perroned
b1e1f6f96a Collections now remain after refresh 2014-07-17 12:45:26 -07:00
perroned
11bb0daf89 Fixing up chat tabs... again. 2014-07-17 08:25:56 -07:00
perroned
fdc214dd65 Removed some clutter, fixing up packages and environment 2014-07-16 11:10:27 -07:00
perroned
219b3b70d5 Putting voice call functionality into client prototype 2014-07-14 07:46:02 -07:00
perroned
56e94e6133 Proof of concept prototype successful. Can join audio call using WebRTC in html5 client. 2014-07-11 11:58:25 -07:00
perroned
9b3251ba40 Added files required for JsSip and new modules which were removed 2014-07-11 10:55:02 -07:00
perroned
b72568600d Fixed the view to make private chat sort messages correctly 2014-07-11 09:05:30 -07:00
perroned
9d0c06b086 Fixed messages to display previous messages from before join, display greeting, then display new messages accordingly 2014-07-11 08:53:49 -07:00
perroned
239666d2ef Trying to fix up, still a big mess 2014-07-10 07:36:29 -07:00
perroned
4001373438 Still trying to get the tabs UI working 2014-07-10 06:11:38 -07:00
Anton Georgiev
7ea4571568 coffeescript proper style 2014-07-09 19:09:10 +00:00
perroned
e91f0e832e Merge branch 'meteor-merge-private-chat' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-09 09:08:07 -07:00
Anton Georgiev
884cce7e9b the client will have access only to the meeting they are in so they can see the meeting"s name and record status 2014-07-09 16:06:25 +00:00
perroned
328872b222 Merge branch 'meteor-merge-private-chat' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-07-09 08:38:25 -07:00
perroned
2797bb15f3 Updated bootstrap 2014-07-09 08:36:08 -07:00
Anton Georgiev
1c1815fb16 missed these changes in the merge 2014-07-09 15:26:12 +00:00
Anton Georgiev
3ad1bdd341 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat 
Conflicts:
	labs/meteor-client/client/globals.coffee
	labs/meteor-client/client/views/chat/chat_bar.coffee
	labs/meteor-client/collections/collections.coffee
	labs/meteor-client/lib/router.coffee
	labs/meteor-client/server/publish.coffee
	labs/meteor-client/server/server.coffee
 2014-07-09 15:09:27 +00:00
perroned
af3c7f4896 Removed old comment 2014-07-09 06:31:04 -07:00
perroned
df4a393b12 Added method for getting meeting name 2014-07-09 06:28:33 -07:00
perroned
098a4c7f81 Added private chat and chat tabs functionality. Tab UI is still buggy. 2014-07-09 06:18:52 -07:00
perroned
a304301bd4 By default youre in public chat 2014-07-09 06:16:17 -07:00
perroned
4460127b6a Method for getting user's name' 2014-07-09 06:15:50 -07:00
Anton Georgiev
48010179e5 fixed adding to Slides collection 2014-07-08 17:15:30 +00:00
Anton Georgiev
abddc57c6f worked on slides collection 2014-07-08 15:14:55 +00:00
Anton Georgiev
168eb4e715 adding Slides collection 2014-07-07 20:58:50 +00:00
Anton Georgiev
7aef935771 filter log messages from flooding event types - cursor update, page resizing... 2014-07-07 20:51:33 +00:00
Anton Georgiev
86e90bbdef forgot to publish the Shapes collection 2014-07-07 20:31:18 +00:00
Anton Georgiev
4adef66799 remove redundant meetingId decl 2014-07-07 20:21:36 +00:00
Anton Georgiev
498472969e adding a shape to the collection 2014-07-07 20:17:09 +00:00
Anton Georgiev
c74737d66c adding a Shapes collection 2014-07-07 19:08:24 +00:00
Anton Georgiev
f1416a49a5 on get_presentation_info_reply request shapes 2014-07-07 18:04:47 +00:00
Anton Georgiev
3d00b2f2b8 changed logging style 2014-07-07 18:03:33 +00:00
perroned
8bc9ace261 Make tabs reappear 2014-07-07 08:31:29 -07:00
perroned
adb7dbc77c working on private chat tabs 2014-07-07 08:30:17 -07:00
perroned
d0d4227d17 Made a tab creation helper 2014-07-04 08:00:46 -07:00
Anton Georgiev
c79c17d61a stop sending userName and meetingName via the URL. Now we can obtain them from bbb-apps and the Collections 2014-07-03 20:50:24 +00:00
Anton Georgiev
561d099eec display number of meetingsin console.log 2014-07-03 20:40:36 +00:00
Anton Georgiev
52202527a8 use the user's username when sending a chat message 2014-07-03 20:39:47 +00:00
Anton Georgiev
25cbf5af27 fix removing users from Users 2014-07-03 18:44:05 +00:00
Anton Georgiev
f651744da9 handle end of meeting + some cleanup 2014-07-03 18:31:32 +00:00
perroned
837edef50b Created array to keep track of tabs 2014-07-03 10:56:56 -07:00
perroned
1b01ce8666 Added private chat creation and UI 2014-07-03 10:56:16 -07:00
perroned
94fe921ad6 Added private chat selectors 2014-07-03 10:55:32 -07:00
perroned
75bc1500e6 Added the default tabs 2014-07-03 10:55:06 -07:00
perroned
5d03c2651b Added functions for adding new tabs 2014-07-03 10:54:41 -07:00
Anton Georgiev
444aef0b25 Meetings collection, adding to it on Server.start 2014-07-03 15:52:43 +00:00
Anton Georgiev
39d62e1d4a now get_all_meetings_reply returns info about meetingName and recorded status 2014-07-03 15:30:06 +00:00
Anton Georgiev
3fa27ae11a Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/client/globals.coffee
 2014-07-02 19:10:12 +00:00
Anton Georgiev
c40bcece8f cleaning up 2014-07-02 17:57:07 +00:00
Anton Georgiev
22785c12bc cleaning up. The client side can only see one meeting 2014-07-02 17:13:00 +00:00
perroned
775d4ef0eb Added comments for future changes - 2 2014-07-02 09:23:30 -07:00
perroned
5c326e0cd6 Added comments for future changes 2014-07-02 09:21:33 -07:00
perroned
a85a706d1d Updated templates to new message format, the chat now displays real messages 2014-07-02 09:17:05 -07:00
perroned
d9eb0c8cf2 Changes 2014-07-02 08:43:56 -07:00
perroned
a8defa1c30 Changes 2014-07-02 08:41:12 -07:00
Anton Georgiev
5ea58dfb23 fixing user logout 2014-07-02 15:09:55 +00:00
Anton Georgiev
2b2622ecc9 fixing when a chat message is added to a collection 2014-07-02 15:08:56 +00:00
Anton Georgiev
773825de73 fixing chat so that we only call Meteor.redisPubSub from within RedisPubSub 2014-07-02 14:47:22 +00:00
Anton Georgiev
d599a782a3 cleaning up 2014-06-27 19:47:16 +00:00
perroned
2beb2868b1 commented 2014-06-27 12:29:07 -07:00
Anton Georgiev
dd85764db9 fix user logout 2014-06-27 19:16:04 +00:00
Anton Georgiev
2fb970d9cd adjusting the parameter names so that they match what is recognized on the server 2014-06-27 19:10:11 +00:00
Anton Georgiev
8c61b3fcdc sending on the chat channel 2014-06-27 18:41:25 +00:00
Anton Georgiev
d6851c39a4 when we try to send a chat message from the html5 client we now send a send_public_chat_message_request towards bbb-apps 2014-06-27 17:53:31 +00:00
Anton Georgiev
9a9c80efab when we press Enter, the chat message enters the collection 2014-06-27 17:31:01 +00:00
perroned
d53e340f28 Fixed bug in sending message, missing parentheses 2014-06-27 10:22:56 -07:00
Anton Georgiev
9ef70b55e9 inserting the chat messages we receive from bbb-apps into the Chat collection 2014-06-27 16:16:17 +00:00
Anton Georgiev
f0a50ce174 introducing Chat collection, clear on start, publish, subscribe, etc 2014-06-27 15:37:33 +00:00
perroned
60ac20880c Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-06-27 07:40:36 -07:00
Anton Georgiev
1aacd65e66 clear Users data on startup 2014-06-27 14:38:08 +00:00
perroned
8a213f6354 stress the current user 2014-06-27 06:59:31 -07:00
Anton Georgiev
08e446e6a0 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 2014-06-26 20:28:54 +00:00
perroned
50e746e5da Fixed bug where help link changed current page, now opens new tab 2014-06-26 13:15:31 -07:00
perroned
090c5ae595 Fixed issue with no server version being displayed 2014-06-26 13:11:31 -07:00
Anton Georgiev
8f11be5a8b dealing with users event 2014-06-26 20:11:18 +00:00
perroned
f270f74903 Implemented auto scrolling to the bottom of the chat messages window, building chat message to send to server 2014-06-26 12:58:58 -07:00
Anton Georgiev
7b5866cf1e we get information about all the meetings on starting up the Meteor server 2014-06-26 19:54:24 +00:00
Anton Georgiev
86dfa841bf switched server.js to coffeescript 2014-06-26 18:10:15 +00:00
Anton Georgiev
99bd016cab the first thing we do when we start the Meteor server is to grab the list of active meetings from bbb-apps 2014-06-26 18:09:39 +00:00
perroned
2123998bcb Changed some toggles, fixed up some UI, more chat functionality 2014-06-26 10:13:19 -07:00
perroned
46cdeafabb Cleaned up lots of code, changed toggles to server calls 2014-06-26 08:14:43 -07:00
perroned
8971b21a90 Added some comments 2014-06-26 08:13:29 -07:00
perroned
7ac36b1cf6 Tidy up, more chat UI, log out user info to check for duplicates' 2014-06-25 11:51:16 -07:00
perroned
efb2177b2b Fixing up some UI 2014-06-25 07:04:04 -07:00
perroned
30bae7c80f Recreating chat UI 2014-06-25 06:28:15 -07:00
perroned
bbdfc071ef Set a few values that should be retrieved from server later 2014-06-25 06:27:12 -07:00
perroned
806bf90b4c Some tidying up and making things more proper 2014-06-24 11:39:32 -07:00
perroned
3eb07aec15 Fixed a bug when switching panes 2014-06-24 11:36:22 -07:00
perroned
abe150cd88 Added some whitespace 2014-06-24 11:20:18 -07:00
perroned
ddde558da2 Fixed up collection declarations 2014-06-24 11:18:25 -07:00
perroned
34e62b838e Moved function 2014-06-24 11:11:51 -07:00
perroned
13df1b475b Working on chat UI 2014-06-24 11:11:26 -07:00
perroned
7412774b5c Added chatbar CSS 2014-06-24 11:10:43 -07:00
perroned
28d7358f67 Moved a file to the global namespace 2014-06-24 11:10:02 -07:00
perroned
067463b866 beginning work on the chat UI 2014-06-24 06:46:42 -07:00
perroned
30694171f5 Altered some values for default view 2014-06-24 06:46:14 -07:00
perroned
c282b46b4c Cleaning up the code a bit, placed rendering logic inside individual templates to be a bit neater 2014-06-23 12:54:17 -07:00
perroned
ac61ea7a24 Added sample whiteboard entry 2014-06-23 12:51:54 -07:00
perroned
c76378edff Added logout page 2014-06-23 12:11:57 -07:00
Anton Georgiev
31ff2121ab logging out 2014-06-23 17:55:54 +00:00
Anton Georgiev
43c1eae0e5 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 2014-06-23 17:48:59 +00:00
Anton Georgiev
5532f3c766 implementing user logout 2014-06-23 17:48:11 +00:00
perroned
cf2215db07 Adding some functionality for logout button 2014-06-23 10:44:09 -07:00
perroned
6005ea000e Fixed kicking users... for now, until things change again 2014-06-23 10:20:08 -07:00
perroned
63a3a4c737 Created a helper and rewrote logic to determine if user is sharing audio/video 2014-06-23 09:58:30 -07:00
perroned
32ddd86438 Fixed spelling issue 2014-06-23 06:24:12 -07:00
perroned
70714bd320 Fixed some helpers and templates to match data format 2014-06-23 06:22:30 -07:00
perroned
466787ab47 Added new line feeds to files 2014-06-23 06:21:03 -07:00
perroned
b63a1cb549 Fixed setPresenter helper 2014-06-23 06:17:19 -07:00
perroned
bf1a65541d updated user retrieval 2014-06-23 06:16:24 -07:00
perroned
e53ced5200 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-06-20 12:36:00 -07:00
Anton Georgiev
a102a501ed insert more info about the user in the collection 2014-06-20 19:30:37 +00:00
Anton Georgiev
33597fcbe5 added a field username to the Users collection 2014-06-20 15:22:04 +00:00
Anton Georgiev
dd8d10260b following the model meetingId, userId 2014-06-20 14:44:32 +00:00
perroned
01b7fc9111 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 
Conflicts:
	labs/meteor-client/client/views/users/user_list.coffee
	labs/meteor-client/server/insert-startup-data.js
 2014-06-20 07:32:12 -07:00
Richard Alam
78ebb5b14c - start implementing per user access code 2014-06-19 15:43:20 -07:00
Anton Georgiev
82b8f9d134 Meteor.users -> Meteor.Users the collection should start with a capital letter 2014-06-19 21:29:52 +00:00
Anton Georgiev
d963078423 get_users_reply populates the collection of users 2014-06-19 21:16:48 +00:00
Anton Georgiev
6d98622d38 handling user_left_message - removing the user from the Meteor.users collection 2014-06-19 20:25:27 +00:00
perroned
4e3dc04573 Removed 'sign in as...' buttons 2014-06-19 11:13:52 -07:00
Anton Georgiev
0f4ac2a32a moved the subscription code so it is executed on connect and not on client startup 2014-06-19 18:13:12 +00:00
perroned
1da3dfe3a5 Using realistic data 2014-06-19 10:52:41 -07:00
perroned
124068a590 Use data from session now 2014-06-19 10:52:08 -07:00
Anton Georgiev
d6e873c013 working with coffeescript 2014-06-19 16:57:43 +00:00
Anton Georgiev
8d5f3170cc we now subscribe to stay up to date only with our meeting's users 2014-06-19 15:36:51 +00:00
Anton Georgiev
eb5703b5d8 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/lib/router.coffee
 2014-06-19 15:24:20 +00:00
Anton Georgiev
af122d2629 work in progress on subscribing a client for the users changes for a single meeting only 2014-06-19 15:19:32 +00:00
perroned
3f93644255 Added server code for calling client function 2014-06-19 07:46:26 -07:00
perroned
529f573d20 Added client function for receiving data from server 2014-06-19 07:45:58 -07:00
Anton Georgiev
67d1a1f947 sending meeting info to the client 2014-06-19 14:27:14 +00:00
perroned
eeb4558f92 Beginning chat system 2014-06-19 06:29:48 -07:00
perroned
49a0b715b7 Re-enabled server's startup code 2014-06-19 06:28:34 -07:00
perroned
79e5ae19a2 Added sample chat data 2014-06-19 06:27:44 -07:00
perroned
f285638184 toggling chat 2014-06-19 06:27:27 -07:00
perroned
ee3a2bf481 toggling chat 2014-06-19 06:27:04 -07:00
perroned
abeab42623 toggling chat 2014-06-19 06:26:46 -07:00
perroned
a38a1f7ca3 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-06-19 06:13:56 -07:00
Anton Georgiev
10c075719b cleaning up 2014-06-18 21:20:32 +00:00
Anton Georgiev
accaa62a29 use iron-router only. The UI is displayed AND redis is working on the serverside! 2014-06-18 20:11:29 +00:00
perroned
eab639e134 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client 2014-06-18 10:54:03 -07:00
perroned
29488daa9e Added chat data: 2014-06-18 10:53:57 -07:00
perroned
a04041ded2 chat collection 2014-06-18 10:53:30 -07:00
Anton Georgiev
ec875e3c1c joining the router for server and client side 2014-06-18 17:34:08 +00:00
Anton Georgiev
10363effc9 join the routing of client and server side 2014-06-18 17:31:42 +00:00
Anton Georgiev
795171bd71 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/.meteor/packages
	labs/meteor-client/smart.json
	labs/meteor-client/smart.lock
 2014-06-17 17:45:50 +00:00
Anton Georgiev
fe464d53af cleaning up 2014-06-17 17:04:58 +00:00
perroned
6e1ec8f200 Updated more buttons to templates. Still trying to clean up code 2014-06-17 08:47:26 -07:00
perroned
18e729eaf1 Fixed some queries 2014-06-17 08:46:49 -07:00
Anton Georgiev
59fbf2ad52 able to add a user to a collection on user_joined_message. 2014-06-17 15:22:12 +00:00
perroned
1280a4dccf Changed button html to template 2014-06-17 08:08:34 -07:00
perroned
9f34755d88 Updated query based on available data 2014-06-17 08:08:07 -07:00
perroned
904caa7212 Added a few required fields 2014-06-17 08:07:36 -07:00
perroned
1f88a590c1 Made a helper for buttons. Code is more proper, more readable, shorter and concise, easier to maintain 2014-06-17 07:02:52 -07:00
perroned
77c70dd801 Changed parameters to work with new templates 2014-06-17 07:01:54 -07:00
perroned
096892264d Formatting data into table cells 2014-06-16 12:11:55 -07:00
perroned
c52bef4e3c Formatting data into table cells 2014-06-16 12:11:22 -07:00
perroned
c12942aa45 Added scrolling in user's list 2014-06-16 11:31:44 -07:00
perroned
39335dfb03 Added scrolling CSS for user's list. Though, Still not beautiful 2014-06-16 11:31:14 -07:00
perroned
abdf769a2f Using bootstrap classes for layouts 2014-06-16 10:47:55 -07:00
perroned
4352bc2721 Restructured page layouts. There has to be a better way to do this. Spacebars is a pain 2014-06-16 10:47:16 -07:00
perroned
c20e7e2d1b Shortened some code. Added special handlers allowing for mods to edit another's user's data 2014-06-16 10:45:17 -07:00
perroned
d821a1a8be Few changes to make things proper 2014-06-16 10:44:18 -07:00
perroned
a99346d385 UI tweak highlights which component is active 2014-06-13 12:34:52 -07:00
perroned
52f8acbbae A bit easier to notice what is active and inactive 2014-06-13 12:34:20 -07:00
Anton Georgiev
a73bafe41e did some refactoring - we now use a RedisPubSub class 2014-06-13 19:27:26 +00:00
perroned
2bc7ad3c5d updating ignore files 2014-06-13 12:00:14 -07:00
perroned
bfaf9a63c7 Users list fixed. Fixed an indentation issue where the body of a function was stand-alone and not actually part of the function prototype. Darn Coffeescript 2014-06-13 11:24:59 -07:00
perroned
6e427efbfa Hooked up some main screen toggles 2014-06-13 11:20:36 -07:00
perroned
ec0c61ab73 Added a file for functions and helpers on the client. All functions inside are available for all client templates and from other java functions. Only available/global to the CLIENT, however. 2014-06-13 11:19:50 -07:00
perroned
1948e7c7a2 Removed uneeded functions to a different more appropriate scope 2014-06-13 11:17:58 -07:00
perroned
1fdbe98db4 Added new CSS classes to allow for Meteor button selectors 2014-06-13 11:17:21 -07:00
perroned
65fa7b5ac0 Prototyping main page. Reflects users choices for navbar, etc. 2014-06-13 11:16:14 -07:00
Anton Georgiev
dfb95d6688 fixed the meetingID; we got valid=true for validate_auth-token_reply 2014-06-13 18:10:49 +00:00
Anton Georgiev
ebdda24f8a sending validate_auth_token message 2014-06-13 18:01:32 +00:00
perroned
d0747c9418 Added iron router 2014-06-13 09:22:30 -07:00
Anton Georgiev
8b82e03bda the :4000 landing page redirects to the meteor app. We extract the meeting_id, user_id, username, auth_token inside the Meteor app. Added router. 2014-06-12 23:22:58 +00:00
Anton Georgiev
46b8f8a923 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server 
Conflicts:
	labs/meteor-client/smart.json
	labs/meteor-client/smart.lock
 2014-06-12 20:22:42 +00:00
Anton Georgiev
b6e534f287 adding .gitignore 2014-06-12 19:52:59 +00:00
Anton Georgiev
cde9a73c6a include deps 2014-06-12 19:51:20 +00:00
perroned
8cabd766dc Some prettying up a bit with bootstrap 2014-06-12 12:12:09 -07:00
perroned
a6fed17cb4 Some package files 2014-06-12 12:10:50 -07:00
Anton Georgiev
41f6c5c3d5 Merge branch 'meteor-rebuild-server' of github.com:antobinary/bigbluebutton into meteor-rebuild-server 2014-06-12 17:19:48 +00:00
perroned
ef0272f768 Fixing up users collection to use meteor's built in users collection, fixed up some meteor-coffeescript compatability issues 2014-06-12 08:12:25 -07:00
perroned
21d9c7799f Migrating to coffeescript 2014-06-12 07:08:55 -07:00
perroned
2978ba1eed Fixed a bug with presenters and deletion 2014-06-12 06:18:40 -07:00
Anton Georgiev
c9f8683e0b Merge remote-tracking branch 'perroned/prototype-metor-client' into meteor-rebuild-server 2014-06-11 19:45:02 +00:00
Anton Georgiev
0f680bd4d5 cleaning up 2014-06-11 19:38:47 +00:00
Anton Georgiev
fc9c2adf3e still have to connect bunyan 2014-06-11 19:26:46 +00:00
perroned
e609d2df9f Fixed up some permissions issues 2014-06-11 11:56:04 -07:00
perroned
740a3056e0 Implementing pseudo log in, to alter view based on user' 2014-06-11 11:52:58 -07:00
Anton Georgiev
22a31392f4 I think I resolved the coffeescript class structure problem 2014-06-11 17:56:07 +00:00
Anton Georgiev
1ccc24d71c subscribing and publishing (simple version) 2014-06-11 17:12:51 +00:00
Anton Georgiev
46a231c3c0 config is found, redis is found 2014-06-11 16:11:23 +00:00
perroned
b86c9c8cce Added user toggles. And made them only accessible to individual user (i.e. moderator should only be able to turn off a students webcam and mic, not on 2014-06-11 09:11:07 -07:00
perroned
26c7050283 Trying to implement css/less from html5, cleaned up code a bit, added functionality to buttons 2014-06-11 08:21:09 -07:00
perroned
4e30f69e81 Added a few buttons that would show up for moderators or presenters 2014-06-10 12:59:58 -07:00
perroned
19ba6f37e2 Just a few comments 2014-06-10 12:26:42 -07:00
perroned
cb8b0d0e11 basic functionality for users 2014-06-10 12:19:20 -07:00
perroned
4e19f83006 Merge branch 'prototype-meteor-client' of https://github.com/bigbluebutton/bigbluebutton into prototype-metor-client 2014-06-09 08:02:43 -07:00
Anton Georgiev
ebb0424856 Merge branch 'prototype-meteor-client' of https://github.com/bigbluebutton/bigbluebutton into prototype-meteor-client 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
 2014-06-09 14:51:59 +00:00
Richard Alam
b19053980a - set user id 2014-06-06 15:51:12 -07:00
Richard Alam
1f9fe5cac7 - meteor 2014-06-06 15:19:09 -07:00
perroned
ae1c01e194 Removing useless code 2014-06-03 12:26:59 -07:00
perroned
b8eafc5312 Forgot to put meeting name back into url for last commit 2014-06-03 12:25:43 -07:00
perroned
22db0d8dc9 Fixed meeting name so it shows up in chat, added it to the url 2014-06-03 11:48:02 -07:00
perroned
70da7d1deb test 2014-06-03 11:45:05 -07:00
Anton Georgiev
dbbe0d251e missed this during the merge from perroned 2014-05-28 15:25:29 +00:00
Anton Georgiev
392238fa31 Merge branch 'merge-polling-with-master' of github.com:perroned/bigbluebutton into merge-polling-with-master 
Conflicts:
	labs/demos/lib/handlers.coffee
 2014-05-27 17:56:38 +00:00
perroned
4d476cec37 "Changed AgnularJs Link 
Made the http link use config IP in settings"
 2014-05-27 08:12:12 -07:00
Anton Georgiev
ae6fba2053 the usernames in the userlist are no longer surrounded by quotation marks 2014-05-26 14:45:10 +00:00
Anton Georgiev
f78264e9da a joining user is displayed in the user list 2014-05-21 15:57:10 +00:00
Anton Georgiev
32fea5be69 when redirected from the login page, go straight into sessionView 2014-05-15 15:54:39 +00:00
Anton Georgiev
bc09084ec2 moving the handler for /html5.client in its own method 2014-05-14 20:54:43 +00:00
Anton Georgiev
32b5f70b08 the landing page passes some credentials to HTML5's Node app 2014-05-14 19:28:45 +00:00
Anton Georgiev
2f41719ef0 tidying up 2014-05-14 16:00:32 +00:00
Anton Georgiev
82bc00cad1 the username is passed in correctly 2014-05-14 15:44:59 +00:00
Anton Georgiev
f76fedee6a under construction, the html5 page"s html prints instead of displaying 2014-05-13 19:43:47 +00:00
Anton Georgiev
69b9ec6493 attempts to use the npm "cors" 2014-05-13 17:35:18 +00:00
Anton Georgiev
a45ce41d2f html5 joinapi 2014-05-12 21:09:40 +00:00
Anton Georgiev
c0b60e211b update README 2014-05-12 17:51:34 +00:00
Anton Georgiev
29cbc584ae update README 2014-05-12 17:49:20 +00:00
Anton Georgiev
30c1fb41a5 added the salt to config.json 2014-05-12 17:45:48 +00:00
Anton Georgiev
daed029107 Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master 2014-05-12 17:31:35 +00:00
Anton Georgiev
95a609af72 added Richard's bbbapi and testapi to create and join a meeting. Logs URLs but hits Error 404 2014-05-12 17:02:18 +00:00
Anton Georgiev
26a0d0bf60 use PORT from the config file 2014-05-12 15:56:14 +00:00
Anton Georgiev
f4f9da8522 introducing config.json for IP:PORT 2014-05-12 15:40:48 +00:00
Anton Georgiev
c6e55d39d7 resolving path error 2014-05-12 14:53:53 +00:00
Anton Georgiev
efcada9692 restructuring 2014-05-12 14:42:06 +00:00
Anton Georgiev
0d31de23fd Rename app-local.coffee to index.coffee 2014-05-12 10:34:46 -04:00
Anton Georgiev
66bcba19d1 moved 2014-05-12 10:34:06 -04:00
Anton Georgiev
f35eb3dc02 restructuring 2014-05-12 14:31:52 +00:00
Anton Georgiev
87155023b8 asking for username, the username reaches the node app 2014-05-09 21:21:16 +00:00
Anton Georgiev
ab03f11727 displaying the index page 2014-05-09 19:45:38 +00:00
Anton Georgiev
d14d5d56d5 initial commit 2014-05-09 14:55:25 +00:00
Anton Georgiev
b1beaf07ed added instructions for running a test file 2014-05-05 18:01:39 +00:00
Anton Georgiev
bf2d447558 added a sample test for recordings for a specific meetingid 2014-05-05 17:56:06 +00:00
xaker1
8c83e1a0d3 Add send XML in createMeetingWithXmlResponseArray 2014-05-03 22:29:59 +04:00
xaker1
bf46d1b8cd Conclusion correct errors in function _requiredParam 2014-05-03 22:12:13 +04:00
Richard Alam
2c5dabd459 - trying out json2xml conversion 2014-05-03 10:38:20 -07:00
Anton Georgiev
074009012e cleaning up 2014-05-02 21:34:48 +00:00
Anton Georgiev
17cca998f8 cleaning up 2014-05-02 20:55:12 +00:00
Anton Georgiev
0c03af8d1b gets the array 2014-05-02 20:00:30 +00:00
Anton Georgiev
97d08ecb97 implementing GET /recording?meetingid= 2014-05-02 19:01:11 +00:00
Richard Alam
9f4513240e - take out record watcher 2014-05-02 14:44:45 +00:00
Richard Alam
b0d4eea62e - put record watcher into module 2014-05-02 14:44:13 +00:00
Richard Alam
0bb44609f1 - setup logging and config 2014-05-02 13:50:46 +00:00
Anton Georgiev
b3d55e4ee1 Watches the recordings tree. Parses all files when it starts running. Pushes info to Redis 2014-05-01 21:42:15 +00:00
Richard Alam
23d78524e2 - initial recording api 2014-05-01 15:30:09 +00:00
Richard Alam
bfc4cb178e - setup testing 2014-04-30 15:43:25 +00:00
Richard Alam
5e6caccbac - add oauth signature 2014-04-27 16:38:25 -07:00
Richard Alam
e37cca26f5 - versioned api 2014-04-27 16:29:26 -07:00
Richard Alam
454b37a0df - setup 2014-04-26 19:51:18 -07:00
Richard Alam
79fe7f4b8b - cleanup 2014-04-26 19:48:06 -07:00
Richard Alam
bee1320463 Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2014-04-08 19:07:37 +00:00
Anton Georgiev
2d89a73c0c Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/ivy.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2014-04-08 15:55:04 +00:00
Richard Alam
3956daf327 - playing around with api in coffee 2014-04-02 22:11:59 +00:00
Richard Alam
c77ddd76d3 Merge branch 'master' into merge-polling-with-master 2014-02-10 21:49:36 +00:00
Fred Dixon
b8a04f18d5 Fixed typo that prevented wget from making API call 2014-02-03 11:51:55 -05:00
Richard Alam
5559a2b8cc Merge branch 'master' into merge-polling-with-master 
- there are compile issues we need to fix

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-23 20:49:04 +00:00
Richard Alam
4b07e6d3ab Merge branch 'master' into html5-bridge-new-events 2014-01-06 13:20:35 -08:00
Richard Alam
b975a8ac14 - move the html5 client out of labs 2014-01-06 08:44:15 -08:00
mohamed-ahmed
cad8c8ea4f user list now loads (some bugs though ) 2013-12-17 19:51:46 +00:00
mohamed-ahmed
da39d3efef scoll bar added to messages, also chat bar will scroll to bottom upon new message 2013-12-10 20:47:43 +00:00
mohamed-ahmed
d3055fc9ce all_messages event now working - loads previous messages 2013-12-09 21:47:11 +00:00
mohamed-ahmed
5f8ab24ffd line tool is now working under new message format 2013-11-26 22:09:39 +00:00
mohamed-ahmed
5c51d939fa progress on making pen tool work 2013-11-23 17:26:21 +00:00
mohamed-ahmed
3d472e5894 'makeShake' and 'updateShape' working for triangle 2013-11-19 19:04:25 +00:00
mohamed-ahmed
ae8dff86a6 'makeShake' and 'updateShape' working for ellipse 2013-11-19 16:59:22 +00:00
mohamed-ahmed
c8e48d9e22 'makeShake' and 'updateShape' working for rectangle 2013-11-19 16:34:34 +00:00
mohamed-ahmed
813f10cef0 progress on getting makeShape to work for 'rect' 2013-11-19 00:14:37 +00:00
mohamed-ahmed
7aa31b47b7 removed unecessary events handlers 2013-11-18 19:52:44 +00:00
mohamed-ahmed
d35d00fd55 'all_slides' and move cursor events now working in new msg format 2013-11-18 19:36:27 +00:00
mohamed-ahmed
59adb0d680 now sends public chat messages using new message format 2013-11-14 19:24:49 +00:00
mohamed-ahmed
0a80708464 fixed comment 2013-11-13 20:36:23 +00:00
mohamed-ahmed
5541539d24 use can now connect to html5-client using new message format 2013-11-13 19:15:31 +00:00
mohamed-ahmed
874add53ef client now prints 'socket.on:connct' when the client connects 2013-11-13 18:22:56 +00:00
mohamed-ahmed
c54fb80f2e progress on changing 'user join' event 2013-11-12 22:21:11 +00:00
mohamed-ahmed
7545876fc5 starting to be able to handle user connect 2013-11-11 22:55:39 +00:00
Fred Dixon
d5d502e4e4 minor bug fix in old stress testing script 2013-11-05 07:44:53 -05:00
Richard Alam
82281f1c0f - add more logging 2013-11-04 07:30:26 -08:00
Leonardo Crauss Daronco
9cb5c156cd HTML5: remove all old css files and adjust what's left 2013-11-01 17:25:00 -02:00
Leonardo Crauss Daronco
d3191c84af HTML: layout with fullsize components when in very small screens 
For mobile phones on portrait mode, chat, user list and video are shown
taking the whole screen.
 2013-11-01 15:51:29 -02:00
tylercopeland
c887f2eb92 Public chat style updates 2013-11-01 13:47:53 -04:00
Leonardo Crauss Daronco
8a11f56ce9 HTML5: impemeting the layout positioning for mobile devices 2013-11-01 13:01:58 -02:00
tylercopeland
7fcba312cf Users list style updates 2013-11-01 10:58:09 -04:00
Leonardo Crauss Daronco
10aafeedea HTML5: showing/hiding elements when navbar buttons are clicked 2013-11-01 11:22:02 -02:00
Leonardo Crauss Daronco
cbdd3f30ee HTML5: splitting the css files in several sections 
So we can work on them in paralell to implement the new layout.
 2013-11-01 10:25:05 -02:00
Leonardo Crauss Daronco
a06331f00b HTML5: cleanup session whiteboard view, remove whiteboard controls 
Removed the controls that are not used anymore, are gonna be used only when
the html5 is allowed to be a presenter.
 2013-10-31 22:44:34 -02:00
Leonardo Crauss Daronco
6d8e6b9210 HTML5: pushing layout changes from @tylercopeland 2013-10-31 21:58:18 -02:00
Leonardo Crauss Daronco
3c447287f3 HTML5: remaking the html markup for the chat 
A lot of changes to make it easier to control the design from the css.
The actions in the chat now only add or remove classes from the elements instead
of changing their css, so the css is responsible for showing or hiding them
and controlling how they appear in the screen.
 2013-10-31 21:30:37 -02:00
Leonardo Crauss Daronco
e0d394896f HTML5: restructuring the client's html 
Removing all the styling from the javascript files, it should all be done
in the css. Not finished yet, the chat and login screens still need a lot
of work.
 2013-10-31 17:36:38 -02:00
Leonardo Crauss Daronco
c0a8fb7b57 HTML5: setup bootstrap and update font-awesome 
Versions:
- Bootstrap v3.0.1
- Font Awesome 4.0.1

Haven't added bootstrap-theme, can be add in the future if needed.
 2013-10-31 15:40:17 -02:00
Leonardo Crauss Daronco
a20f3f3f6d HTML5: use less instead of plain css 
Using connect-assets to automatically compile less files into css files and
serve them. All less files should be under assets/css/.
The current layout file is using less but it's a plain css, with its content
simply copied from the old layout.css file.
 2013-10-31 12:50:52 -02:00
Leonardo Crauss Daronco
d6158115f1 HTML5: comment out wrong method call in RedisPublisher 
Temporary, the method called doesn't exist anymore. Have to check it better,
but commented it for now so the app doesn't break.
 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
ab6c73ca92 HTML5: fixing undo and clearPaper events in the server 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
814b6172fa HTML5: update redis to 0.9.0, solves a few bugs 
Apparently solved errors on user joins, the error was:
Error: node_redis command queue state error. If you can reproduce this, please report it
 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
bd4cb88e16 HTML5: restructuring the classes in the node.js server 
Restructured the classes that read or write on redis to make more sense. Now
there's a single class that makes the bridge between redis and websockets,
and helper classes to publish to redis and to do any other actions on redis.
 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
45463acc91 HTML5: cleanup and fix errors when a new user joins the session 
Most changes on the method WebsocketConnection#_onUserConnected()
The server doesn't crash as much as before when a user joins.
 2013-10-31 12:04:24 -02:00
tylercopeland
3866a8e4b2 chat module style updates 2013-10-30 16:09:56 -04:00
tylercopeland
a4a806d254 lastest css updates 2013-10-29 19:38:52 -04:00
Leonardo Crauss Daronco
ed3975674e HTML5: removing lots of unused or unnecessary code from the server 
Cleanup the node.js server removing things that were not used or were related
to making the HTML5 client a presenter, which will not be necessary at this
first iteration.
The node.js server should also not change anything that's in redis, just read
it. Removed some of the code that changes redis.

Also updating the comments to match codo's format.
 2013-10-30 10:08:16 -02:00
Leonardo Crauss Daronco
d681eac13b HTML5: cleanup on RedisBridge 
Moved some methods that actually do things on redis to RedisAction.
 2013-10-30 10:08:15 -02:00
Leonardo Crauss Daronco
b1cdb2ea8c HTML5: setting up a logger class 
Prints logs with better formatting than simply calling console.log.
 2013-10-30 10:08:15 -02:00
Leonardo Crauss Daronco
10f9bd592b HTML5: Setting up the test environment for the node.js server 
Created tests for lib/modules.coffee and a few for routes/main_router.coffee
to be used as reference.
 2013-10-30 10:08:15 -02:00
Leonardo Crauss Daronco
01654424c9 HTML5: Cleaned and refactored some code used to join the session 2013-10-30 10:08:15 -02:00
Leonardo Crauss Daronco
e20e46a7a5 Replace docco by codo for docs in the HTML5 client 
Updated the documentation of lib/modules.coffee to be used as a reference.
 2013-10-30 10:08:14 -02:00
Leonardo Crauss Daronco
f42eb27049 HTML5: moving global objects into modules 
There's a new class Module to organize modules in the application. Prevents
errors from cyclic require's.
The number of modules can still be reduced by organizing them better.
 2013-10-30 10:08:14 -02:00
Leonardo Crauss Daronco
612b818f38 HTML5: setting up docco for documentation 
To be used
 2013-10-30 10:08:14 -02:00
Leonardo Crauss Daronco
65d876fd00 HTML5: Clean up app.coffee as much as possible 
Move methods to new classes RedisBridge and Utils.
Also made several other small fixes (typos mostly).
 2013-10-30 10:08:01 -02:00
Leonardo Crauss Daronco
64de058316 HTML5: Add class RedisKeys 
Contains methods to get the keys used on redis.
Reduced RedisAction a lot by having this new class.
 2013-10-30 10:08:01 -02:00
Leonardo Crauss Daronco
7aa6e9114d HTML5: Update redis to 0.8.4 (latest) and small fixes 
The node.js server is now working as it was before the refactoring was
started 🍻
 2013-10-30 10:08:00 -02:00
Leonardo Crauss Daronco
884147f6bc Refactor routes/socketio as a class WebsocketConnection 
Most of its methods are used only internally, so now the class is more isolated
than before. But still with some methods that should be refactored.
 2013-10-30 10:07:30 -02:00
Leonardo Crauss Daronco
3fc84c775b Refactor routes/index as a class MainRouter 
Also removed some methods/routes that were not being used and will have to
be refactored anyway if they are needed in the future. They are: get_join,
to join the session getting the username and password from the url, and
post_upload, to upload presentations from the html5 client (this was a
specially big method).
 2013-10-30 10:07:30 -02:00
Leonardo Crauss Daronco
15df4de206 HTML5: Move methods from redis/index to a class RedisAction 
Not working 100% yet and a lot more can be improved in this class.
The rest of the code should also be moved into classes like this one.
 2013-10-30 10:06:58 -02:00
Leonardo Crauss Daronco
75769a27f0 HTML5: fix requires and global variables in the server 
Now there's a 'config' module to store global configurations.
The requires have to be made locally for the modules needed, can't just
require everything on app.js as it was before.
 2013-10-30 10:06:58 -02:00
Leonardo Crauss Daronco
ea13a399dc HTML5: basic conversion of the server to coffeescript 
Simply converted from js to coffee, a lot is still not working and a lot
more has still to be improved.
 2013-10-30 10:06:58 -02:00
tylercopeland
499aba5f03 css style updates 2013-10-29 19:01:52 -04:00
Richard Alam
c23ca787a4 Merge pull request #282 from mohamed-ahmed/html5-bridge 
fixed it so that shapes won't be erased when changing slides
 2013-10-29 07:56:52 -07:00
mohamed-ahmed
129ab9f5ca fixed it so that shapes won't be erased when changing slides 2013-10-29 14:47:26 +00:00
Richard Alam
8e9acfdf75 - add version for request module 2013-10-28 12:01:48 -07:00
Richard Alam
8e04927ea2 Merge pull request #281 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-10-28 09:57:57 -07:00
mohamed-ahmed
a470e27614 fixed merge conflicts 2013-10-28 15:01:15 +00:00
mohamed-ahmed
b94fa93c1b added photo to repo and handles if it can't load 2013-10-06 17:30:52 +00:00
mohamed-ahmed
6e8dff75d2 adding styling and logo to login page 2013-10-06 17:29:14 +00:00
mohamed-ahmed
6d1f711ab6 removed 'switch users' element 2013-10-06 16:59:52 +00:00
mohamed-ahmed
c20f5be445 fixed button sizing on page resize 2013-10-04 22:33:41 +00:00
mohamed-ahmed
597a383aa1 fixed icon sizing 2013-10-04 20:57:26 +00:00
mohamed-ahmed
66398d4e15 fixed icon sizing 2013-10-04 20:20:09 +00:00
mohamed-ahmed
b9a700c2c5 fixing right button group on navbar 2013-10-04 19:01:50 +00:00
mohamed-ahmed
45b4b68d44 progress on fixng navbar 2013-10-04 18:57:11 +00:00
mohamed-ahmed
4d66f0273c fixed some UI changes for freds demo 2013-10-03 21:16:42 +00:00
mohamed-ahmed
825dcd110a progess on changing layout 2013-10-03 16:05:23 +00:00
Richard Alam
f14bf93d26 Merge pull request #265 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-09-30 11:29:52 -07:00
mohamed-ahmed
8213272485 fixed drawing reversed square in both flash client and html5 client 2013-09-30 18:23:29 +00:00
mohamed-ahmed
3e8a592934 can now draw circles in reverse like the bug i fixed in the flash client 2013-09-30 16:02:32 +00:00
Richard Alam
0ddadd25eb Merge branch 'html5-bridge' of github.com:mohamed-ahmed/bigbluebutton into mohamed-ahmed-html5-bridge 
Conflicts:
	labs/bbb-html5-client/package.json
 2013-09-27 17:48:15 +00:00
mohamed-ahmed
f208ca8a2d update cursor to appear the same size even when page is zoomed in 2013-09-27 17:09:24 +00:00
mohamed-ahmed
ad86f142d4 merged Gary's newUI and fixed conflicts 2013-09-27 16:07:38 +00:00
mohamed-ahmed
521dd3aa33 boarder now appears infront of ever other element (i.e. shapes_ 2013-09-24 18:27:26 +00:00
mohamed-ahmed
b6dd5eae5e added better styling to landing page 2013-09-24 18:05:28 +00:00
Gary Deng
fb8af3bdf7 implement html5 new interface 2013-09-24 06:13:09 -07:00
mohamed-ahmed
8a28dc9df5 added comment explaining cursor calculations 2013-09-23 20:45:01 +00:00
mohamed-ahmed
3764cc4ae1 cursor now moves to correct location 2013-09-23 20:43:38 +00:00
mohamed-ahmed
2695586f8c page resize now alsop handles fit to width 2013-09-23 20:11:32 +00:00
mohamed-ahmed
ca8dfa7e21 fixed zooming to handle fit to width 2013-09-23 18:29:16 +00:00
mohamed-ahmed
2a1d2f7525 simplified a function 2013-09-20 19:15:15 +00:00
Richard Alam
2b9f6b747e Merge pull request #257 from mohamed-ahmed/html5-bridge 
fixed ellipse tool
 2013-09-17 10:18:06 -07:00
mohamed-ahmed
f359337e6c fixed page resize 2013-09-17 16:54:29 +00:00
mohamed-ahmed
ad297e8079 fixed ellipse tool 2013-09-17 15:34:17 +00:00
Gustavo Salazar
173f8b7f18 Merge pull request #256 from mohamed-ahmed/html5-bridge 
now the zooming will still be correct when the window is resized
 2013-09-16 13:53:51 -07:00
mohamed-ahmed
20c9118b68 now the zooming will still be correct when the window is resized 2013-09-16 18:36:16 +00:00
Gustavo Salazar
59159ee216 Merge pull request #255 from mohamed-ahmed/html5-bridge 
html5 client now handles the zoom event I created
 2013-09-16 08:58:27 -07:00
mohamed-ahmed
58ab406e12 html5 client now handles the zoom event I created 2013-09-16 15:45:58 +00:00
Richard Alam
300287e71d - just rename the directory 2013-09-13 15:37:25 +00:00
Richard Alam
817a86637f - add init.d script for bbb-callback 2013-09-13 15:34:51 +00:00
Gustavo Salazar
3932b879e3 Merge pull request #239 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-08-28 09:32:39 -07:00
mohamed-ahmed
df5721ecae ellipse tool can now draw prefect circle in html5 client 2013-08-27 21:30:54 +00:00
Leonardo Crauss Daronco
fc00a8639d HTML5: Update jade to 0.34.1 and remove warnings 
Removed the warnings:
"Implicit textOnly for `script` and `style` is deprecated.  Use `script.` or `style.` instead."
 2013-08-16 19:00:15 -03:00
Leonardo Crauss Daronco
13ff0b0d19 HTML5: Set specific versions for the dependencies 
It's always better to have specific version to force all instances to
use exactly the same dependencies and avoid errors that will naturally
happen when libs are updated.
Also restricted the version of node to 0.10.x.
 2013-08-16 18:42:21 -03:00
Gary Deng
f04c048526 After clearShape,currentshape should not be null 2013-08-01 08:57:17 -07:00
Gary Deng
17881b19ee remove unnecessary changes 2013-08-01 08:27:22 -07:00
Gary Deng
ebe17628f5 send undo and clrPaper events to html5-client, and enable html5-client to see square while Ctrl keypressed 2013-08-01 08:10:59 -07:00
Richard Alam
997ecb15cb Merge pull request #210 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-07-15 14:15:27 -07:00
mohamed-ahmed
5014f68379 added jquery as depency, fixed bugs 2013-07-15 20:39:44 +00:00
mohamed-ahmed
48f108469f added jquery as depency, fixed bugs 2013-07-15 20:38:23 +00:00
Richard Alam
5c6585736b Merge pull request #196 from SenecaCDOT-BigBlueButton/html5-bridge 
Rewrite layout.css file in LESS template
 2013-07-13 18:16:43 -07:00
Richard Alam
34a9875766 - enable webhooks 2013-07-11 19:20:11 +00:00
Gary
d4d2d49814 modify previous commit 2013-07-11 09:25:41 -07:00
Gary
03e7883660 To show the current slide to new user,send 'changeslide' event when user join 2013-07-11 09:12:45 -07:00
Richard Alam
79f35087e8 Merge pull request #197 from mohamed-ahmed/html5-bridge 
Html5 bridge
 2013-07-05 11:49:08 -07:00
Mohamed Ahmed
da179b03df modified Utils.PostToUrl to to use jquery for DOM manipulation 2013-07-05 14:13:12 -04:00
Gary
c576070282 Rewrite layout.css file in LESS template 2013-06-30 15:55:05 -07:00
Gary
18159f1db4 manage UserModel in UserCollection 2013-06-26 08:15:01 -07:00
Markos Calderon
6dd72a3951 Finish webhook API callback and remove unneeded demo app 2013-06-13 19:25:00 -05:00
Markos Calderon
2597d47bba listen to events in bbb-callbacks 2013-06-12 18:49:32 -05:00
Markos Calderon
689dde4318 initial changes for api callbacks 2013-06-07 15:47:18 -05:00
Richard Alam
584d0ae97f Merge pull request #161 from daronco/html5-event-bus 
HTML5 client - events
 2013-05-22 19:24:08 -07:00
Leonardo Crauss Daronco
21c79844c5 HTML5: remove events emitted on Connection, now emitted on the event bus 
And removed duplicated events for 'connected' and 'disconnected'.
 2013-05-20 17:41:29 -03:00
Leonardo Crauss Daronco
1f0c53a151 HTML5: last view, chat, migrated to use the event bus 2013-05-20 15:47:18 -03:00
Richard Alam
e1e600dfa1 Merge branch 'html5-bridge' of github.com:bigbluebutton/bigbluebutton into html5-bridge 2013-05-09 17:26:00 +00:00
Richard Alam
be8befb243 Merge branch 'master' into html5-bridge 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
 2013-05-09 17:25:25 +00:00
Leonardo Crauss Daronco
b80a0dc89e HTML5: create event bus, not finished yet 
A global event bus to improve the structure of events in the
HTML5 client.
 2013-04-29 17:26:09 -04:00
Leonardo Crauss Daronco
bc513c72f6 HTML5: cleanup/refactor whiteboard paper a bit more 
PRESENTATION_SERVER was moved to a better place. It was kind of
hardcoded in the client, now it is passed to the client by the
server, so it can be easily configured in the server if needed in
the future.
 2013-04-28 19:41:10 -04:00
Leonardo Crauss Daronco
bec08b559f HTML5: add WhiteboardSlideModel 
It stores the slides that are shown in the whiteboard.
 2013-04-28 18:01:23 -04:00
Leonardo Crauss Daronco
961d15828b HTML5: standard method to create tools in the whiteboard 
Shrink the code a bit more.
 2013-04-28 17:47:18 -04:00
Leonardo Crauss Daronco
7a9cbaecfb HTML5: add WhiteboardCursorModel, simplify whiteboard paper 2013-04-28 17:34:38 -04:00
Leonardo Crauss Daronco
d5a51ce6ec HTML5: more small fixes in the whiteboard drawings 2013-04-28 16:58:37 -04:00
Leonardo Crauss Daronco
c62533139f HTML5: add text tool to whiteboard 2013-04-28 16:24:43 -04:00
Leonardo Crauss Daronco
a3f286947e HTML5: small fixes in the whiteboard drawings 2013-04-28 13:21:08 -04:00
Leonardo Crauss Daronco
4792698ca4 HTML5: rects and ellipses work when drawn backwards 
Rects and ellipses would not work if drawn from right to left and/or from
bottom to top, but now they work.
 2013-04-27 22:19:25 -04:00
Leonardo Crauss Daronco
0b031558e9 HTML5: WhiteboardLineModel working for line and pencil tools 2013-04-27 20:28:08 -04:00
Leonardo Crauss Daronco
0c577090e5 HTML5: add ellipse and triangle to whiteboard 2013-04-27 20:00:52 -04:00
Leonardo Crauss Daronco
98a8d05bc1 Add WhiteboardToolModel as a base for whiteboard tools in HTML5 
WhiteboardLineModel and WhiteboardRectModel already inherit from it.
 2013-04-27 16:54:22 -04:00
Leonardo Crauss Daronco
76f06c9e80 Add WhiteboardLineModel to clean up WhiteboardPaperModel 
First version, there are still things that should be moved from
WhiteboardPaperModel to it.
 2013-04-27 16:06:38 -04:00
Leonardo Crauss Daronco
482debd9fe Round borders for rects and pencil in the HTML5 whiteboard 
Makes the drawings more similar to the drawings in the flash client.
 2013-04-27 14:58:20 -04:00
Leonardo Crauss Daronco
f44a1bb4ad Add WhiteboardRectModel to clean up WhiteboardPaperModel 
First version, there are still things that should be moved from
WhiteboardPaperModel to it.
 2013-04-27 14:37:42 -04:00
Leonardo Crauss Daronco
d2f09e916d Redraw shapes when resizing the HTML5 client 
Only redrawing shapes that were loaded when the HTML5 started. Shapes
drawn before are not being saved in the arrays yet and so are not being
redraw when resizing (they disappear).
 2013-04-27 11:58:20 -04:00
Leonardo Crauss Daronco
9589e7c7a1 Fix positioning of shapes in the whiteboard, not 100% yet 2013-04-25 19:54:26 -04:00
Leonardo Crauss Daronco
714cccc1f0 Fix the color of shapes drawn in the whiteboard 2013-04-25 17:12:55 -04:00
Leonardo Crauss Daronco
6c102519af Removing some class variables in WhiteboardPaperModel 
They are variables that store the position and size of slides and now are
store with the slide they are associated with.
 2013-04-25 16:57:20 -04:00
Leonardo Crauss Daronco
62739fa9fe Resize the slides to occupy 100% of the space 2013-04-25 10:05:38 -04:00
Dale Karp
0813595c61 fixed merges 2013-04-10 17:23:40 +00:00
Dale Karp
d721f762a8 fix merge conflicts 2013-04-10 16:44:42 +00:00
Markos Calderon
dfbf081409 added support for rect shape 2013-03-25 16:35:45 -05:00
Markos Calderon
c5a63cb1fb fix whiteboard shape doesn't appear when you change slide 2013-03-24 15:30:50 -05:00
Markos Calderon
2b95385c39 fixed whiteboard gap bug 2013-03-22 18:06:36 -05:00
Dale Karp
d239744c77 slides center in viewport when fitToPage is true 2013-03-20 16:46:29 +00:00
Dale Karp
f02751be0d #slide resizes on page load, fills up presentation area 2013-03-18 17:48:05 +00:00
Dale Karp
9bfbb0f754 pausing work on whiteboard issue for now 2013-03-07 20:32:14 +00:00
Dale Karp
0f19182ad6 removed css default width/height for whiteboard 2013-03-07 18:00:08 +00:00
Dale Karp
fef3c2e198 progress check in for resizing html5 whitebord 2013-03-01 21:36:46 +00:00
Dale Karp
80cf67ccff integrating ScaleRaphael into current project 2013-02-28 15:26:36 +00:00
Dale Karp
9129158ea1 adding scale.raphael.js 2013-02-26 18:40:25 +00:00
Dale Karp
ac38917977 bah 2013-02-22 18:48:28 +00:00
Dale Karp
ef1a8e9d86 now have ScaleRaphael building properly 2013-02-21 17:59:48 +00:00
Dale Karp
87a078e655 renamed scale.raphael.js to be less confusing 2013-02-21 17:32:25 +00:00
Dale Karp
e8964362ca adding new raphael scale library 2013-02-21 17:11:15 +00:00
Dale Karp
3be816f52a editing CSS for SVG area will scale to slides div 2013-02-15 18:28:13 +00:00
Markos Calderon
bdccc4eee7 html5 branch updated with the latest changes from the master 2013-01-29 20:24:36 -05:00
Fred Dixon
de47e2e65e Updated license header to LGPL 3.0 2013-01-27 09:44:40 -05:00
Markos Calderon
ba2da7004c Merge almost complete. Still red dot not working 2013-01-25 21:50:32 -05:00
Markos Calderon
5348a4892a check if the browser supports websockets 2013-01-23 11:40:12 -05:00
Markos Calderon
e104941d54 Changes for sync users 2013-01-22 17:56:17 -05:00
Fred Dixon
08bb37a6c3 Added sample voiceBridge parameter 12345 2013-01-18 15:41:43 -05:00
Fred Dixon
e075e65cbe Changed voiceBridge parameter from optional to required in PHP library in labs 2013-01-18 15:40:18 -05:00
Calvin Walton
07357ce15b Demonstration code for video view 2013-01-15 18:11:05 +00:00
Calvin Walton
9e6de065ad Merge branch 'html5-bridge' of git://github.com/kepstin/bigbluebutton into html5-bridge-ipad 
This pulls in the icecast changes

Conflicts:
	labs/bbb-html5-client/README.md
 2013-01-15 18:09:39 +00:00
Leonardo Crauss Daronco
ff3d00f579 Add video area and hide presenter tools in the html5 client 2013-01-06 17:46:25 -02:00
Leonardo Crauss Daronco
950c7bf8f5 First changes to make the html5 client look good in an iPad 
Smaller presentation, chat always visible, user list on top of chat.
 2013-01-05 21:40:29 -02:00
Leonardo Crauss Daronco
1ef17be130 Fix wrong cursor position when presenter 
Container dimensions were not set when the first slide was added to the screen.
 2012-12-19 16:54:11 -02:00
Leonardo Crauss Daronco
98d4cba3c8 Use r.js to optimize the html5 client 
Development works as it was before. In production the js file loaded is the optimized one.

Had to wrap the colorwheel plugin in a define() call.
jQuery now is always loaded from googleapis, the local files were removed.
 2012-12-19 16:42:58 -02:00
Leonardo Crauss Daronco
45a264a211 Fix the dimensions of the container at WhiteboardPaper 
They were always 0x0 at startup until the page was resized.
 2012-12-17 18:25:54 -02:00
Leonardo Crauss Daronco
423bbcf41e Fix selection of users in the user list 2012-12-17 17:51:12 -02:00
Leonardo Crauss Daronco
c42d6c29ae Fix the position of the cursor when the html5 clients is the presenter 2012-12-17 17:45:15 -02:00
Leonardo Crauss Daronco
5bb4075577 Small changes in the layout: whiteboard tools to bottom 2012-12-17 17:17:51 -02:00
Leonardo Crauss Daronco
27c8a7abde Increase requirejs's timeout to 60 secs (for iPads) 
For some reason an iPad takes ~30 seconds to load the initial page.
 2012-12-17 17:15:26 -02:00
Leonardo Crauss Daronco
036e77f559 Split the session template into smaller templates rendered by the subviews 2012-12-14 22:58:14 -02:00
Leonardo Crauss Daronco
f29b73c16c Prefix private methods with an underline and remove unecessary files 2012-12-14 22:41:30 -02:00
Leonardo Crauss Daronco
2577123726 Migrate the form validation on login to LoginView 2012-12-14 22:16:25 -02:00
Leonardo Crauss Daronco
d795a56c93 Allow page refreshes and redirect the user to the session when already logged in 
User authentication now through /auth (GET|POST). /chat removed.
Increased the time limit for a user to be logged out from 1sec to 5secs (the pages take a bit longer to load now).
 2012-12-14 22:03:38 -02:00
Leonardo Crauss Daronco
4b80352e8e Move the last methods to the new models/views, and remove the old js files 
Also updated jQuery UI css to v1.9.2, using the theme ui-lightness
 2012-12-13 23:54:10 -02:00
Leonardo Crauss Daronco
c562f5cd85 Methods to draw in the whiteboard migrated to views/models 😓 
Almost everything migrated now, even though not everything's working 100% yet.
 2012-12-13 17:35:57 -02:00
Leonardo Crauss Daronco
fdc12ccb6c Add a toolbar on top os slides with actions that are not yet in the main navbar 
Such as the upload of slides.
 2012-12-13 15:26:02 -02:00
Leonardo Crauss Daronco
a397e2be63 Color picker working 
colorwheel.js code updated to jweir/colorwheel@be140fb2f8
This version allows the colorwheel to be inside a DOM element and has built-in integration with a text input.
 2012-12-13 00:04:43 -02:00
Leonardo Crauss Daronco
9938e11662 Presentation zooming and fitting migrated to the new models/views 2012-12-12 23:02:35 -02:00
Leonardo Crauss Daronco
a0753ab4f3 Move a few more methods from the old js files to new models/views 2012-12-12 00:15:14 -02:00
Markos Calderon
7a3d22d74e Update labs/bbb-html5-client/README.md 2012-12-11 16:50:36 -05:00
Markos Calderon
5b73384994 Update labs/bbb-html5-client/README.md 2012-12-11 16:34:58 -05:00
Leonardo Crauss Daronco
152e601e54 Cursor movement and slide changes now working 2012-12-11 19:15:08 -02:00
Leonardo Crauss Daronco
2e2a37c6f8 Drawing functions now available in WhiteboardPaperModel 
Actions (drawings) in the whiteboard are now shown in the html5 client.
 2012-12-11 18:48:38 -02:00
Leonardo Crauss Daronco
bbe1c63c9f Basic whiteboard functionality in a new view and model 
All it can do for now is initialize the Raphel objects and show the slide images in the screen.
 2012-12-11 17:37:32 -02:00
Leonardo Crauss Daronco
79d88135ab More options in the authentication object stored in the client 
Authentication object is stored during the session, with data (currently with meetingID and username) sent by the server.
 2012-12-10 23:51:01 -02:00
Leonardo Crauss Daronco
b11f12eb16 User list with selection of users and set presenter working 2012-12-10 23:29:56 -02:00
Leonardo Crauss Daronco
308ddb691d Treat more socket.io events: login, logout and chat now working with backbone 2012-12-10 16:28:30 -02:00
Leonardo Crauss Daronco
8ca78dd83e Split SessionView in subviews and add treatment to basic events 
Events that were in chat/behaviour.coffee are now in Backbone views.
 2012-12-10 14:34:06 -02:00
Leonardo Crauss Daronco
5677bd4fb3 Add ConnectionModel that uses socket.io to connect to the server 2012-12-10 12:46:20 -02:00
Leonardo Crauss Daronco
5727fd9b07 Session view now is visually ok, but with javascripts still disabled 
Only login and logout work by now.
Methods in the old chat javascripts are almost all commented until they are refactored to use backbone.
 2012-12-09 18:34:32 -02:00
Leonardo Crauss Daronco
519ac9ce0e First version of a single page html5 client app 
Very simple by now, but with login working and switching to a (not yet implemented) session view.
 2012-12-09 16:39:29 -02:00
Leonardo Crauss Daronco
9561790dcb Use require.js and coffeescript in the index page 2012-12-08 23:24:23 -02:00
Leonardo Crauss Daronco
dcc6393c4c jQuery v1.8.3, jQuery UI v1.9.2, both from googleapis with local fallbacks 2012-12-08 22:44:03 -02:00
Leonardo Crauss Daronco
0dce4b1b25 Convert the cclient scripts in chat/ to coffeescript 2012-12-08 22:26:58 -02:00
Leonardo Crauss Daronco
f70a48ad81 Remove js triggers from the chat view and refactor it to be a bit more readable 
Also refactored behaviour.js a bit.
 2012-12-08 20:54:05 -02:00
Leonardo Crauss Daronco
27f4a00940 First version with require.js in the client side 
Events trigger from the chat view are not working yet.
 2012-12-08 20:27:27 -02:00
Richard Alam
3265e6c2a1 - add example in 3rd party html to lock unlock layout 2012-11-01 18:45:51 +00:00
Richard Alam
d5b14ccb39 - cleanup 2012-10-28 15:56:03 +00:00
Richard Alam
4b22fbbd3b - display users 2012-10-28 15:41:08 +00:00
Richard Alam
2b92bf0dd6 - still can't get users to display...to be continued. 2012-10-26 23:01:55 +00:00
Richard Alam
a894397999 - still trying to display users 2012-10-26 22:22:59 +00:00
Richard Alam
3f64313fff - try to display users when new user join...still trying to figure why it won't 2012-10-26 20:22:19 +00:00
Richard Alam
b8e8a2d069 - display flash client between users and chat 2012-10-26 18:07:43 +00:00
Richard Alam
cb722385ac - display flash client inside html 2012-10-26 15:11:06 +00:00
Richard Alam
1d2f818f25 - create embed html example 2012-10-25 21:12:21 +00:00
Richard Alam
1fda7a3af9 - demo html5 client embedding BigBlueButton Flash Client 2012-10-25 19:32:19 +00:00
Markos Calderon
4d76c61417 added a better quality for converting images 2012-10-24 14:37:25 -05:00
Markos Calderon
7e4381f362 removing upload button 2012-10-23 15:16:42 -05:00
Markos Calderon
faeac6a6e1 move and back slides 2012-10-23 13:32:59 -05:00
Markos Calderon
9e45420a4c load presentation in both sides html5 and flex 2012-10-20 14:18:39 -05:00
Richard Alam
89bf8f9972 ignore modules 2012-10-14 18:30:56 -07:00
Richard Alam
007c51eef0 ignore modules 2012-10-14 18:29:14 -07:00
Richard Alam
4427c86a7a playing around with node 2012-10-14 13:15:09 -07:00
Markos Calderon
48c0830efc setpresenter, mouse movement, and starting to send pencil drawings 2012-10-05 17:07:17 -05:00
Calvin Walton
4fea74251b Add additional buttons with some presentation controls. 
For now, the buttons are just going into the bottom bar, and some are
missing icons.
 2012-10-05 14:57:02 -04:00
Calvin Walton
18a74e3871 Update HTML5 client CSS to closer match the mockup style 2012-10-05 13:33:37 -04:00
Markos Calderon
9352e198ef setPresenter integrated 2012-09-25 18:29:58 -05:00
Markos Calderon
173211bdec integrating setPresenter call 2012-09-21 14:42:17 -05:00
Calvin Walton
a4331acb06 Add the new user interface 
It's still partially incomplete - missing the presentation controls, but
it's a start :)
 2012-09-16 14:06:12 -04:00
Markos Calderon
baa9eef486 chat almost complete... pending chat history in flex client 2012-09-15 03:15:14 -07:00
Markos Calderon
8053c15b9e participants module full working 2012-09-15 01:44:17 -07:00
Markos Calderon
ce9d7c1706 API stores meeting in redis, apps stores users in redis 2012-09-14 16:48:05 -07:00
Fred Dixon
abce700f11 Merge pull request #62 from ryanseys/master 
Add bbb-html5-client to labs
 2012-09-10 13:21:47 -07:00
Ryan Seys
69e27955b3 Add bbb-html5-client to labs not as submodule 2012-09-07 15:02:21 -04:00
Ryan Seys
1288b0b1cc Remove submodule 2012-09-07 15:00:13 -04:00
Ryan Seys
9a8283951f Add bbb-html5-client to labs 2012-09-07 14:48:07 -04:00
Vikrant1
c84d809ec4 Update labs/bbb-api-php/includes/bbb-api.php 
Fixed function getCreateMeetingUrl() so that the duration parameter is passed properly when creating meeting. Minor change was required to the file:
Line 137 was changed to end with ";" instead of "."
 2012-08-08 22:56:10 +02:00
Tiago Daniel Jacobs
65d1e4436f Initial commit of installer folder. 2012-08-07 12:07:11 -03:00
Tiago Daniel Jacobs
a794bb5319 Initial Commit 2012-08-06 17:16:47 -03:00
Tiago Daniel Jacobs
6a8e5cf5f8 Initial commit of applet-jni test. 2012-08-03 07:22:16 -03:00
Jesus Federico
485155bb96 Updated README on bbb-api-php and bbb-api-php-legacy placed in labs 2012-04-05 11:07:10 -04:00
Jesus Federico
d368aef0f6 Added petermentzer bbb-api-php contribution to labs 2012-04-05 10:47:53 -04:00
Fred Dixon
c431169bd7 Changed redis host for bigbluebutton.yml to 127.0.0.1 2011-07-10 08:38:12 -07:00
Richard Alam
491e2af437 - cleanup and move webminer into labs 2011-05-22 15:59:33 -04:00
Fred Dixon
acb45b34a7 - Added a labs area for creating test scripts; added bbb-test, a utility to launch multiple BigBlueButton clients within firefox for testing see (http://code.google.com/p/bigbluebutton/wiki/Testing) 2011-01-23 03:53:51 +00:00
Richard Alam
c1edb67290 - moved the record-and-playback folder from labs 2010-07-19 12:16:11 -04:00
Marco Calderon
50467d4f0f added playback client and web 2010-07-12 22:01:12 +00:00
root
666c745ee4 webminer update files references 2010-07-08 20:41:23 +00:00
Markos Calderon
e18759710c added message-producer and message-recorder 2010-06-05 14:58:45 +00:00
Markos Calderon
4727684a31 message generator - read lecture.xml and send to a queue 2010-06-05 09:25:35 +00:00
Richard Alam
01554b1266 - add README 2010-05-31 21:36:31 -04:00
Richard Alam
7ac6ff51d9 - adding .classpath and .project to .gitignore 2010-05-31 21:33:55 -04:00
Richard Alam
89d47f9da6 - initial commit of record-and-playback into labs folder 2010-05-31 20:45:13 -04:00