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

1814 Commits

Author SHA1 Message Date
Anton Georgiev
b9dc4aab7f add a vertical limit for the userslist 
set a vertical limit for users after which the scrollbar appears
 2015-02-26 19:38:40 +00:00
perroned
59d5c1025f Fixed the close tab button for different resolutions and oreintations 2015-02-26 19:02:49 +00:00
perroned
480a6288b5 Address border issue on mobile 2015-02-26 19:02:26 +00:00
Maxim Khlobystov
64ee1b56bf Made the vertical whiteboard centering compatible with Internet Explorer and more reliable. 2015-02-26 17:25:42 +00:00
Anton Georgiev
6cededf848 fit to width slide in portrait. substitute jquery resizing for whiteboard 2015-02-26 17:24:47 +00:00
Anton Georgiev
b61932aacf limit the color to mobile only. hide footer when typing 2015-02-26 17:14:21 +00:00
Anton Georgiev
a7d181f862 first steps of making the elements more readable on mobile 2015-02-25 02:39:30 +00:00
Anton Georgiev
4bf12fd721 footer: visible only on the bottom, resize 2015-02-25 01:28:50 +00:00
Anton Georgiev
2aeb982706 add a vertical limit for the userslist 
set a vertical limit for users after which the scrollbar appears
 2015-02-24 23:09:26 +00:00
Anton Georgiev
89e97577da fit to width slide in portrait. substitute jquery resizing for whiteboard 2015-02-24 21:29:32 +00:00
Maxim Khlobystov
bcbfd60228 Made the vertical whiteboard centering compatible with Internet Explorer and more reliable. 2015-02-24 16:33:05 +00:00
Anton Georgiev
082d524cac The chat input box is no longer auto focused on login 
The reasoning is:
-when the client loads on a touch-screen device (mobile) the keyboard should not be displayed. Or it impedes the view.
-prevent accidental chat messages
 2015-02-23 23:29:12 +00:00
Anton Georgiev
1c981ec11b css resizeWindows. footer no longer overlaps. height control 2015-02-23 23:04:40 +00:00
Maxim Khlobystov
828114f03f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-restructured-css 2015-02-23 14:00:42 -08:00
Maxim Khlobystov
9ce41b3444 Finished up the restructuring of LESS. 2015-02-21 15:50:47 -08:00
Maxim Khlobystov
3a2f44a9f5 Moved all the chat-related LESS to one file and structured it using media queries inside classes instead of the other way around. 2015-02-20 18:07:50 -08:00
Maxim Khlobystov
428ab03cc4 Introduced the media query aliases. 2015-02-19 19:28:55 -08:00
Anton Georgiev
8550ed926c adjust the logOutUrl 2015-02-17 23:33:13 +00:00
Anton Georgiev
822b6268e3 removing demos. Substituted with demoHTML5.jsp 2015-02-17 23:25:30 +00:00
Oleksandr Zhurbenko
61ea73c2a7 Improved Chat tab 2015-02-17 15:23:27 -08:00
Oleksandr Zhurbenko
3f55033c67 Improved participants tab in a mobile view 2015-02-17 15:02:49 -08:00
Anton Georgiev
e95b63f444 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-portrait-improvements 2015-02-17 16:55:04 +00:00
Oleksandr Zhurbenko
1adb366cf3 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into whiteboard-modifications 2015-02-16 17:59:14 -08:00
Maxim Khlobystov
7a068c5c8e Corrected the proportion in which the userlist, whiteboard and chat grow or shrink on horizontal scaling. 2015-02-16 17:49:01 -08:00
Maxim Khlobystov
065cf1e701 Fixed the horizontal scaling in Firefox. 2015-02-16 17:33:26 -08:00
Maxim Khlobystov
7ff7c4a9be Made the userlist width flexible. 2015-02-16 17:16:57 -08:00
Oleksandr Zhurbenko
16973ccd71 Merge branch 'meteor-portrait-improvements' of https://github.com/antobinary/bigbluebutton into whiteboard-modifications 2015-02-16 17:13:37 -08:00
Anton Georgiev
f78dd1e0f8 rearranged the permissions so that even unvalidated users should be allowed to logoutSelf as long as authenticated 2015-02-14 00:14:49 +00:00
Anton Georgiev
64b3929bc5 onBeforeAction requires a this.next() even if we're still waiting before rendering 2015-02-13 23:27:31 +00:00
Anton Georgiev
fc9ebef332 Merge branch 'new-branch' of github.com:perroned/bigbluebutton into meteor-portrait-improvements 2015-02-13 22:47:07 +00:00
Anton Georgiev
cb3fb5806d mini script to run without testing 2015-02-13 21:03:25 +00:00
Anton Georgiev
a4f08680b1 limit expansion of chat + users after a widow resize or orientation switch 2015-02-13 20:54:44 +00:00
Oleksandr Zhurbenko
28ed53eaa2 Merge branch 'meteor-portrait-improvements' of https://github.com/antobinary/bigbluebutton into whiteboard-modifications 2015-02-12 14:51:45 -08:00
Anton Georgiev
91cabcae8e portrait view:the chat section is now vertically restricted 2015-02-12 18:11:11 +00:00
perroned
4d1d29af34 readable text in different orientations 2015-02-12 09:29:55 -08:00
perroned
773d6b0b59 mobile userlist readability 2015-02-12 09:19:58 -08:00
Oleksandr Zhurbenko
4b300a1cf0 Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into whiteboard-modifications 2015-02-11 13:20:36 -08:00
perroned
10bd9e28fe Merge remote-tracking branch 'anton/meteor-portrait-improvements' into new-branch 2015-02-11 12:50:30 -08:00
perroned
10fe725695 Comments properly explaining line break code 2015-02-11 12:06:19 -08:00
perroned
096d2e5d93 Cleaned up newline conversions 2015-02-11 11:55:50 -08:00
perroned
2f4960e5b2 Newlines between flash and html5 2015-02-11 11:43:46 -08:00
Oleksandr Zhurbenko
dade374971 Fixed chat scaling 2015-02-10 11:01:40 -08:00
perroned
949c40b618 translate incoming and outgoing multiline messages 2015-02-10 08:29:52 -08:00
perroned
1c6abd5793 Prevent user list from getting covered in mobile 2015-02-10 07:48:02 -08:00
perroned
256fbbc1c5 Forgot a class 2015-02-10 07:24:13 -08:00
perroned
570e62143f participants list and options menu 2015-02-10 07:17:26 -08:00
Anton Georgiev
5a07dfd482 added the footer portrait specific font-size to the remaining cases 2015-02-06 23:57:57 +00:00
Anton Georgiev
1d030ac066 bigger font-size on portrait's footer. update footer params 2015-02-06 23:08:56 +00:00
Anton Georgiev
876c3cb9eb meteor 1.0.2.1->1.0.3.1 2015-02-06 23:07:01 +00:00
Anton Georgiev
192a641119 missed during merge 2015-02-06 20:50:49 +00:00
Anton Georgiev
a1d4e62d9b Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into testing-version-15 
Conflicts:
	labs/meteor-client/app/client/stylesheets/portrait/chat.less
 2015-02-06 20:03:11 +00:00
Anton Georgiev
e846c5f330 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-15 2015-02-06 19:52:36 +00:00
Anton Georgiev
dc12fc0eb1 Merge branch 'chat-quotes' of github.com:antobinary/bigbluebutton into testing-version-15 2015-02-06 19:48:13 +00:00
Anton Georgiev
a6eb4865dc load the main template only on successful login (before it would load for a sec no matter what) 2015-02-06 19:41:18 +00:00
Anton Georgiev
c6da51d61b add a flag for HTML5 users. add a flag for html5 users that validated successfully. Use these flags for action authorization. From now onwards we only allow users that got validate_auth_token_reply with true to proceed and enter a meeting. No restriction for the flash client users. Dummy users are now added only for html5 users when requesting validation from BBB 2015-02-06 17:21:31 +00:00
Anton Georgiev
7ff2a05a73 clear session vars before redirecting 2015-02-06 16:55:46 +00:00
Maxim Khlobystov
438c61485d Made the landing page responsive. 2015-02-05 16:44:01 -08:00
Maxim Khlobystov
b16f4e2f1a Made the padding between the slide and whiteboard border consistent on loading the portrait view and scaling. 2015-02-05 14:43:57 -08:00
Anton Georgiev
08e0ada372 Merge branch 'whiteboard-modifications' of https://github.com/OZhurbenko/bigbluebutton into chat-quotes 2015-02-05 20:07:13 +00:00
Anton Georgiev
6e39140ab3 if unauthorized user attempts to subscribe, throw an error which will cause the user to be redirected to the login page 2015-02-05 19:58:39 +00:00
Oleksandr Zhurbenko
ef9d59dfb2 Added vertical centering, added Flexbox support for all browsers, cleared a console 2015-02-04 19:30:32 -08:00
Maxim Khlobystov
52c8a471bf Merge branch 'meteor-client-nightwatch' into meteor-client-responsive-ui 2015-02-04 14:22:52 -08:00
perroned
56c13bd4c5 cleaned up 2015-02-04 13:20:41 -08:00
perroned
5bf696d998 Fixed inability to send multilined messages 2015-02-04 11:11:47 -08:00
perroned
b4bf8b561b Add timestamps to selected font size 2015-02-04 11:10:45 -08:00
perroned
366bb23c78 Don't hard code sizes in html 2015-02-04 10:16:35 -08:00
perroned
ad7224cd7f Fixing chat message size on mobile 2015-02-04 10:01:14 -08:00
Oleksandr Zhurbenko
f1129d88fb Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into whiteboard-modifications 2015-02-03 13:37:58 -08:00
Anton Georgiev
24b26f450e Merge branch 'meteor-client-device-orientation' of https://github.com/gthacoder/bigbluebutton into meteor-client-device-orientation 2015-02-03 18:20:53 +00:00
Maxim Khlobystov
833dcd273b Handled the soft keyboard on mobile devices. 2015-02-03 10:19:16 -08:00
perroned
66fd06c662 Merge remote-tracking branch 'maxim/meteor-client-device-orientation' into new-branch 
Conflicts:
	labs/meteor-client/app/client/stylesheets/portrait/chat.less
 2015-02-03 07:45:16 -08:00
Anton Georgiev
2e1ff49048 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into chat-quotes 2015-02-03 15:35:07 +00:00
perroned
2eb1f2f9ac Easier to close chat on mobile 2015-02-03 07:30:40 -08:00
Maxim Khlobystov
bf366e7341 Started using the device orientation instead of the device width to distinguish between a narrowed desktop window and a mobile device in portrait orientation. 2015-02-02 17:19:57 -08:00
Anton Georgiev
a6f0755f27 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-14 2015-02-02 20:06:08 +00:00
Maxim Khlobystov
b9f6dbd646 Added some padding space between the slide and the whiteboard bottom border. 2015-02-02 08:34:37 -08:00
perroned
0bdea5163d fixing some elements on small screens 2015-02-02 08:31:22 -08:00
perroned
827a64a7b9 Organized user list 2015-02-02 08:11:25 -08:00
Maxim Khlobystov
9a2c10b7a8 Revert "add slide spacing on startup" 
This reverts commit 580d84c9fa.

Conflicts:
	labs/meteor-client/app/client/views/whiteboard/whiteboard.coffee
 2015-02-02 08:10:40 -08:00
Maxim Khlobystov
b27186c7c2 Revert "add bottom border for whiteboard slide when resizing" 
This reverts commit 06c4c71d18.

Conflicts:
	labs/meteor-client/app/client/views/whiteboard/whiteboard.coffee
 2015-02-02 08:05:29 -08:00
Maxim Khlobystov
aeabd91f6b Added Jasmine package and one of its dependencies. 2015-01-30 16:22:12 -08:00
Anton Georgiev
bd2ea9c711 unnecessary code repetition 2015-01-30 22:41:28 +00:00
Anton Georgiev
3f867f205f Merge branch 'testing-version' of https://github.com/OZhurbenko/bigbluebutton into chat-quotes 2015-01-30 17:35:10 +00:00
perroned
84120647c4 When you select a conversation from the extra list, actually display it 2015-01-30 08:48:37 -08:00
perroned
fe6ae739c2 Prevent close tab button from being hidden 2015-01-30 07:06:24 -08:00
perroned
919321d793 Prevent row from dropping by a few pixels when hovering a private tab 2015-01-29 09:53:31 -08:00
Oleksandr Zhurbenko
78bf4818ba Added text wrapping to whiteboard 2015-01-29 09:52:04 -08:00
perroned
c969d75730 Move notification class to parent tab element 2015-01-29 09:24:59 -08:00
perroned
46efa8cfa0 Fixing chat tabs dropping to a new line. 2015-01-29 08:59:32 -08:00
Maxim Khlobystov
459b8f2d71 Merge branch 'meteor-client-responsive-ui' into meteor-client-nightwatch 2015-01-28 14:50:08 -08:00
Maxim Khlobystov
db9f9c7082 Fixed the whiteboard height on startup in portrait orientation. 2015-01-28 13:47:48 -08:00
Maxim Khlobystov
c30ed0e046 Fixed the leak in one of the tests that was creating abandoned users in a meeting. 2015-01-26 16:24:55 -08:00
Maxim Khlobystov
93a1cb90e0 Added the specs to test the top of the page behaviour while scaling the page horizontally on desktop. 2015-01-26 16:17:56 -08:00
Maxim Khlobystov
ee06ff10f6 Added the spec to verify the whiteboard presentation successfully loads. 2015-01-25 11:11:56 -08:00
Maxim Khlobystov
a3eff36394 Beginning work on the acceptance tests for the log in/out process. 2015-01-24 18:14:46 -08:00
Maxim Khlobystov
44e851a2c4 Added some acceptance tests to verify that public chat messages work correctly. 2015-01-24 18:13:29 -08:00
Maxim Khlobystov
669fd71b79 Merge branch 'testing-version-11' of https://github.com/antobinary/bigbluebutton into meteor-client-nightwatch 2015-01-24 17:46:02 -08:00
Maxim Khlobystov
543b002165 Added Selenium and Nightwatch.js support. 2015-01-24 17:44:29 -08:00
Oleksandr Zhurbenko
53f00f6028 Merge branch 'testing-version-11' of https://github.com/antobinary/bigbluebutton into testing-version 2015-01-23 13:40:42 -08:00
Anton Georgiev
e6301b2cef Merge branch 'testing-version' of https://github.com/OZhurbenko/bigbluebutton into testing-version-12 2015-01-23 18:42:07 +00:00
Oleksandr Zhurbenko
dd5a341f1a Fixed whiteboard text positioning 2015-01-23 09:41:28 -08:00
perroned
a0aefb845d Fix text overflow for chat button 2015-01-21 13:07:17 -08:00
perroned
580d84c9fa add slide spacing on startup 2015-01-21 12:30:57 -08:00
perroned
06c4c71d18 add bottom border for whiteboard slide when resizing 2015-01-21 12:02:50 -08:00
perroned
77ee0a14f7 removed resizing from chatbar file 2015-01-21 12:02:04 -08:00
perroned
189ef5f7a9 spacing for whiteboard slide 2015-01-21 12:01:24 -08:00
perroned
486a25fcf4 Moved resizing windows to globals 2015-01-21 12:00:43 -08:00
perroned
8c36a145f5 Solved sorting of users list 2015-01-21 10:28:45 -08:00
Maxim Khlobystov
c89f4d64c5 Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into meteor-client-jasmine 2015-01-20 11:55:01 -08:00
perroned
8e4c27c13b Clear session. Prevent left over data allowing re-entry 2015-01-20 08:01:17 -08:00
perroned
45458c3f0c Fixing title name 2015-01-20 06:55:03 -08:00
perroned
4788faba2d Added route handler for trying to bypass port 4000 2015-01-16 09:00:37 -08:00
perroned
61f906875e fixing chat ui 2015-01-16 07:59:50 -08:00
perroned
990fdad193 Resize users windows 2015-01-16 07:44:17 -08:00
Maxim Khlobystov
6ae7a73980 Merge branch 'meteor-client-responsive-ui' into meteor-client-jasmine 2015-01-15 18:04:04 -08:00
Maxim Khlobystov
5f9b579a19 Included the navbar to a disabled area on clicking Logout. 2015-01-15 18:02:13 -08:00
Maxim Khlobystov
be40164588 Beginning work on client-side unit tests. 2015-01-15 16:51:20 -08:00
Maxim Khlobystov
40431ade89 Merge branch 'meteor-client-responsive-ui' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2015-01-15 13:01:08 -08:00
perroned
e4fd27e34d chatbar resizing works on meeting join now 2015-01-15 10:05:11 -08:00
perroned
b4effb2e01 chatbar is better on startup, message input it slightly hidden 2015-01-15 09:51:07 -08:00
perroned
38e3cac8ee Merge remote-tracking branch 'maxim/meteor-client-responsive-ui' into new-branch 2015-01-15 08:28:24 -08:00
perroned
9b9ad01847 Run resize at startup. Only run in landscape mode 2015-01-15 08:10:44 -08:00
perroned
15a5441354 height sizing of chat window 2015-01-15 07:50:59 -08:00
Maxim Khlobystov
bc6f00328a Fixed the size of a logout dialog box in a narrow window on desktop. 2015-01-14 16:00:19 -08:00
Maxim Khlobystov
3c0afca34c Made the desktop navbar always be one row, even in a very small window. 2015-01-13 17:23:34 -08:00
Maxim Khlobystov
35aaf3e3a9 There's no need to mask test specs manually, we can disable testing modes with environment variables. 2015-01-13 16:47:17 -08:00
Maxim Khlobystov
c50e88f2b9 Made the navbar display long meeting names truncated. 2015-01-12 16:02:08 -08:00
Maxim Khlobystov
f09809205d Made all the navbar buttons always visible in portrait orientation on desktop. 2015-01-12 15:11:26 -08:00
Maxim Khlobystov
addb734d9d Prevented the collapsible navbar from jumping to another row after it is triggered and user resizes the window. 2015-01-12 13:47:10 -08:00
Anton Georgiev
f1114418cb Merge branch 'meteor-client-new-icons' into meteor-client-responsive-ui 2015-01-12 21:27:33 +00:00
Anton Georgiev
54ff0915c4 logoutURL is still needed 2015-01-12 21:04:50 +00:00
Anton Georgiev
3ccc3887d7 regulate the height of the components so no vertical scrolling is needed 2015-01-12 20:54:59 +00:00
Anton Georgiev
3662f7cc7b Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-client-responsive-ui 2015-01-12 20:52:51 +00:00
Maxim Khlobystov
0b2973b03d Prevented the sliding menu icons from appearing below the userlist/whiteboard/chat panels. 2015-01-12 12:42:58 -08:00
Anton Georgiev
4c62aeed3d Merge branch 'meteor-client-new-icons' of github.com:gthacoder/bigbluebutton into meteor-client-new-icons 2015-01-12 20:16:43 +00:00
Maxim Khlobystov
988f5f02dd Made sure the cursor is set to the chat input textbox every time a new private tab is created or user switches between existing tabs. 2015-01-11 18:47:27 -08:00
Maxim Khlobystov
cfb79d13de Replaced Raised Hand and Leave Audio Call icons with ionicons. 2015-01-11 12:13:40 -08:00
Maxim Khlobystov
7c8f51ea55 Added Ionicons package. 2015-01-11 11:12:45 -08:00
Maxim Khlobystov
703d42b14d Added the ability for a navbar to collapse in portrait orientation on desktop. 2015-01-10 18:49:08 -08:00
Anton Georgiev
c7e7bde00a not used anymore 2015-01-09 22:54:40 +00:00
Maxim Khlobystov
bbdf5106f3 Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2015-01-09 12:48:19 -08:00
Maxim Khlobystov
2d1319e402 Added a separate stylesheet for a portrait mode in a narrowed desktop window. 2015-01-08 15:43:34 -08:00
Anton Georgiev
d9c1356427 keep only the most recent version of the shape 2015-01-08 21:00:13 +00:00
Anton Georgiev
a811265b86 the textshape is displayed as the presenter is typing. Overwritten with the final version when it is available 2015-01-08 20:49:29 +00:00
Anton Georgiev
60980df6a7 joinedAt is no longer used 2015-01-08 19:20:03 +00:00
Anton Georgiev
2836b9c647 update meteor to 1.0.2.1 2015-01-08 15:32:49 +00:00
Anton Georgiev
05e0b4d59d fixes the issue of portrait oriented slide not visible on sign in/refresh 2015-01-07 22:53:37 +00:00
Maxim Khlobystov
28b5f562ff Merge branch 'testing-version-008' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2015-01-07 13:09:05 -08:00
Maxim Khlobystov
4e2a0c05dd Got rid of the thin white horizontal line at the bottom of the navbar. 2015-01-07 12:40:32 -08:00
Anton Georgiev
8d37efbb2c Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2015-01-07 19:16:53 +00:00
Maxim Khlobystov
b28a7ab5b8 Added the ability for a user to close the sliding menu by clicking the darkened area. 2015-01-06 16:32:44 -08:00
Maxim Khlobystov
c461af43de Corrected the tooltip for Expand/Collapse button. 2015-01-06 15:49:41 -08:00
Anton Georgiev
8e88828464 cleaning up 2015-01-06 23:31:09 +00:00
Anton Georgiev
4b390f08c5 worked on fixing discrepancies of whiteboard on resize of the window 2015-01-06 23:27:56 +00:00
Maxim Khlobystov
8c65f05d16 Cleaning up. 2015-01-06 15:24:49 -08:00
Anton Georgiev
ac569c9fdd hide the unused space right above the footer 2015-01-06 23:22:02 +00:00
Maxim Khlobystov
2949415117 Prevented scrolling while the sliding menu is opened. 2015-01-06 15:07:25 -08:00
Anton Georgiev
a94bdcd85b rearranged and added comments for scaleSlide 2015-01-06 21:53:07 +00:00
Maxim Khlobystov
8973c30646 Made sure the whiteboard is visible when user enters the meeting using browser in portrait orientation. 2015-01-06 13:50:54 -08:00
Maxim Khlobystov
977f7f4273 Made sure the screen is always darkened while the sliding menu is opened. 2015-01-06 12:00:04 -08:00
Anton Georgiev
ef2c615b0d Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2015-01-06 18:28:17 +00:00
Maxim Khlobystov
8a4b7b6195 Eliminated unnecessary async operations on drawing/redrawing the whiteboard. 2015-01-06 09:42:37 -08:00
Anton Georgiev
d4f37c1ec6 text shapes now can be colourful 2015-01-05 20:54:03 +00:00
Maxim Khlobystov
2c86220669 Made sure the whiteboard height is restored to its landscape value after switching from portrait to landscape mode. 2015-01-04 14:13:43 -08:00
Maxim Khlobystov
352ab6760a Merge branch 'testing-version-008' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2014-12-30 11:35:22 -08:00
Maxim Khlobystov
2e03dd1dc8 Added the sliding menu to the portrait version. 2014-12-29 18:08:16 -08:00
Anton Georgiev
37cbe22d40 cleaning up whiteboard_paper !!Revisit when developing presenter functionality 2014-12-23 20:01:16 +00:00
Anton Georgiev
27160b36ed cleaning up whiteboard_paper 2014-12-23 19:44:31 +00:00
Anton Georgiev
e968f41327 fix for: when you draw a shape and then zoom in, it should appear thicker 2014-12-23 18:25:47 +00:00
Anton Georgiev
ccd88be39f Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2014-12-23 15:09:31 +00:00
Anton Georgiev
46a4a57481 adjusted some tests 2014-12-22 21:21:30 +00:00
Maxim Khlobystov
7edcdec82e Prevented the whiteboard title from jumping to the next line on small screens. 2014-12-22 12:16:36 -08:00
Anton Georgiev
a7eb342fbb Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2014-12-22 19:56:32 +00:00
Anton Georgiev
1564235ef5 revise the deletion of users 2014-12-22 19:53:46 +00:00
Anton Georgiev
bb62104070 move clearCollections 2014-12-22 19:53:07 +00:00
Anton Georgiev
f84def84a7 working on clearing the collections after a meeting ends 2014-12-22 19:43:27 +00:00
Maxim Khlobystov
54f0c28b7c Merge branch 'testing-version-008' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2014-12-22 11:39:48 -08:00
Maxim Khlobystov
dd3add4c29 Made the whiteboard use space more effectively in portrait orientation. 2014-12-22 11:11:09 -08:00
Maxim Khlobystov
2206594c4e Corrected the title of Collapse button's tooltip. 2014-12-19 16:02:15 -08:00
Maxim Khlobystov
b62e56ac42 Unfocused some buttons after click event is triggered. 2014-12-19 15:51:31 -08:00
Anton Georgiev
dce185c65b meteor 1.0 -> 1.0.2 2014-12-19 21:29:31 +00:00
Anton Georgiev
f6c48c9130 remove the option of no chat notifications 2014-12-19 21:07:36 +00:00
Maxim Khlobystov
fabb0ebca1 Made Logout dialog box bigger in portrait orientation and made it hidden on window resize. 2014-12-19 11:01:45 -08:00
Anton Georgiev
9a8b64a77f scroll chat to the bottom. Based on Dannys 6cf46e864cbcb59ed1032da36dff1bc303692797 2014-12-19 17:23:24 +00:00
Anton Georgiev
440fc532b0 now using a meteor package for raphaeljs-package 2014-12-18 21:45:23 +00:00
Maxim Khlobystov
5aaa48ee86 Made the navbar always expanded in landscape orientation. 2014-12-17 14:05:21 -08:00
Maxim Khlobystov
0e6bb2da20 Made the navbar collapsed by default in portrait orientation. 2014-12-17 14:00:36 -08:00
Anton Georgiev
8eb4f36d0e 'The user has left' notification in private chat 2014-12-17 21:09:12 +00:00
Anton Georgiev
f9c28c8f6a Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2014-12-17 19:40:15 +00:00
Anton Georgiev
a3d555603c Merge branch 'meteor-new-ui' of github.com:perroned/bigbluebutton into testing-version-008 2014-12-17 19:38:24 +00:00
Anton Georgiev
e278060aa8 this was causing me issues 2014-12-17 19:37:58 +00:00
perroned
6d1f86128f Removed tables from options tab 2014-12-17 11:10:41 -08:00
perroned
a203e706fc Removed table from message 2014-12-17 10:58:57 -08:00
Anton Georgiev
b1dd54ca3d switched from observeChanges to observe 2014-12-17 18:34:12 +00:00
Maxim Khlobystov
fc6321cb18 Prevented the navbar from jumping to the second row in portrait orientation. 2014-12-17 10:14:25 -08:00
perroned
c7e7b8af99 Removed function that isn't used 2014-12-17 09:37:11 -08:00
perroned
3f457de891 Fixed handler for navbar expansion. 2014-12-17 09:14:39 -08:00
perroned
f69c554c87 UI tweaks for chat tabs 2014-12-17 08:38:37 -08:00
Anton Georgiev
20fbcb84b6 cleaning up 2014-12-17 00:29:58 +00:00
Anton Georgiev
d535804071 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into testing-version-008 2014-12-17 00:22:12 +00:00
Anton Georgiev
5c9335dd69 improver chat sorting by time, welcome message is now per user and comes from the server 2014-12-17 00:20:13 +00:00
Maxim Khlobystov
e71a8f91ba Fixed the issue with missing whiteboard cursor. 2014-12-16 15:27:39 -08:00
Anton Georgiev
5c6fee4333 Merge branch 'meteor-new-ui' of github.com:perroned/bigbluebutton into testing-version-008 2014-12-16 22:38:08 +00:00
perroned
10526b4a46 newline 2014-12-16 10:59:20 -08:00
perroned
f3a48368a7 Some usability improvements making it easier to select chat name or close chat tab 2014-12-16 10:57:42 -08:00
perroned
ebe3cc20b9 Address a small typo. No more needed, fixed properly in translation units. 2014-12-16 10:03:14 -08:00
perroned
546ad2e833 Use welcome message from config file 2014-12-16 08:54:36 -08:00
perroned
3e2393f1bd Added config fields for welcome message 2014-12-16 08:54:02 -08:00
perroned
7c405fa120 Use proper version variable 2014-12-16 08:53:30 -08:00
perroned
42847c20ba Added new fileds in information we pull from config file. 2014-12-16 08:52:52 -08:00
perroned
f52aedaede Added copyright year entry to configuration file 2014-12-16 07:57:33 -08:00
perroned
8a72339f00 Build footer with new ifnormation 2014-12-16 07:55:38 -08:00
perroned
00d73c7142 Retrieve footer info from configuration file 2014-12-16 07:55:11 -08:00
perroned
9156684a5c Better solution for key press 2014-12-16 07:11:23 -08:00
perroned
d885a173ec Allow both return/enter keys to work. Fixed some bugs in adding new lines and sending messages. 2014-12-16 06:43:03 -08:00
Anton Georgiev
71f5e53e92 Merge branch 'meteor-order-users' of github.com:lfzawacki/bigbluebutton into testing-version-008 2014-12-15 22:40:38 +00:00
perroned
3840540783 Using proper BBB audio query. 2014-12-15 13:16:35 -08:00
perroned
ebc8cecb94 More user friendly message when slideshow is loading. 2014-12-15 13:15:42 -08:00
perroned
1f628b255b More appropriate string when meeting is loading. 2014-12-15 13:14:12 -08:00
perroned
0e5f044382 More appropriate string when meeting is loading. 2014-12-15 13:12:36 -08:00
Anton Georgiev
a3d05cf14a Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-008 2014-12-15 21:10:56 +00:00
Maxim Khlobystov
d998b6560a Made the whiteboard scale with its container on closing/opening userlist/whiteboard/chat. 2014-12-15 13:08:09 -08:00
Anton Georgiev
db8a552afa Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-15 20:12:23 +00:00
Maxim Khlobystov
b7b178b37a Got rid of some unnecessary padding below the navbar on collapsing userlist/whiteboard/chat in the mobile version. 2014-12-15 09:06:22 -08:00
Lucas Zawacki
03b56d84ef Order users by time of raise_hand and name 2014-12-12 18:58:54 -02:00
Anton Georgiev
4890131591 (redo) Public did not look selected when it was (when private tabs available) 2014-12-12 16:23:47 +00:00
Anton Georgiev
0ed83d2542 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-ui-less 
Conflicts:
	labs/meteor-client/app/client/stylesheets/landscape/chat.less
	labs/meteor-client/app/client/stylesheets/portrait/chat.less
 2014-12-12 16:23:26 +00:00
Anton Georgiev
e4c696e358 focus on the input box when clicking on a chat tab 2014-12-12 16:20:06 +00:00
Maxim Khlobystov
3d033903b1 Got rid of unnecessary inline CSS. 2014-12-11 18:11:15 -08:00
Maxim Khlobystov
9f8436e71f Fixed the issue with hiding Join Audio Call tooltip on clicking its button. 2014-12-11 16:19:41 -08:00
Anton Georgiev
ef2def0ef5 not needed anymore. the isActiveTab is now fixed 2014-12-11 23:23:44 +00:00
Anton Georgiev
a157ec9b2f open the new tab even before a chat message was sent 2014-12-11 23:21:51 +00:00
Maxim Khlobystov
2b00252a02 Restructured the stylesheets. 2014-12-11 11:35:10 -08:00
Anton Georgiev
4f849c9d0e improve logs, improve flow in rouer.coffee 2014-12-11 17:23:19 +00:00
Anton Georgiev
c41e7aae14 when selecting Public chat, the tab did not look selected 2014-12-11 17:21:44 +00:00
Anton Georgiev
0c032080e1 was causing an error on reload 2014-12-11 17:21:15 +00:00
Anton Georgiev
43555fe1a1 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-11 16:41:57 +00:00
Maxim Khlobystov
8c552f540d Cleaning up. 2014-12-10 18:24:23 -08:00
Maxim Khlobystov
68321387c7 Made Public Chat tab active when page is loaded. 2014-12-10 17:19:08 -08:00
Maxim Khlobystov
0c27d35fce Merged the fix for landscape navbar positioning from branch 'navbar' of https://github.com/OZhurbenko/bigbluebutton. 2014-12-10 14:46:43 -08:00
Maxim Khlobystov
720b817150 Fixed the issue with hiding Expand tooltip. 2014-12-10 14:20:48 -08:00
Maxim Khlobystov
48d5df7ae4 Substitute the right chevron icon by the left chevron. 2014-12-10 14:17:41 -08:00
Maxim Khlobystov
cd5a16d38e Made the text in portrait mode larger. 2014-12-10 14:10:04 -08:00
Maxim Khlobystov
a4bcc69c12 Made the user list, whiteboard and chat always fit the page horizontally. 2014-12-10 13:48:41 -08:00
Anton Georgiev
1fdecb4e1b created an onLoadComplete function. fixed the check for user kicked out 2014-12-10 20:09:17 +00:00
Anton Georgiev
86de11305b improving the callback for cleaning old session vars 2014-12-10 19:31:03 +00:00
Anton Georgiev
1fee2f76a5 clear old session vars before setting new ones 2014-12-10 19:30:14 +00:00
Anton Georgiev
329784697f remove logout page. navigate to logOutUrl instead 2014-12-10 18:56:25 +00:00
Anton Georgiev
bd0cffcdeb improve visibility in logs 2014-12-10 16:24:22 +00:00
Anton Georgiev
5d1fe80482 added an extra case for the user connection status 2014-12-10 16:23:25 +00:00
Anton Georgiev
191d2d68ee Merge branch 'meteor-client-kicked-n-returning' of github.com:gthacoder/bigbluebutton into meteor-client-kicked-n-returning 
Conflicts:
	labs/meteor-client/app/client/main.html
	labs/meteor-client/app/client/views/users/user_list.coffee
	labs/meteor-client/app/server/user_permissions.coffee
 2014-12-10 15:50:08 +00:00
Maxim Khlobystov
fd9d9b02d6 Trying to wait for the moment when the user is kicked out more effectively. 2014-12-09 18:46:49 -08:00
Anton Georgiev
26e5749d44 now we won't see 'ghost' users in the html5 client - users that registered but did not join 2014-12-10 00:33:56 +00:00
Anton Georgiev
c6b48e4037 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-007 2014-12-09 22:16:46 +00:00
Anton Georgiev
3150fc5483 in a race condition the user did not have a user.role 2014-12-09 22:10:06 +00:00
Maxim Khlobystov
da0cb724a9 Merge branch 'testing-version-007' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2014-12-09 14:01:26 -08:00
Anton Georgiev
7e78e3dcc2 clean up and improve logging 2014-12-09 20:45:20 +00:00
Maxim Khlobystov
35e0090afe Merge branch 'meteor-ui-less' of https://github.com/antobinary/bigbluebutton into meteor-client-responsive-ui 2014-12-09 10:06:08 -08:00
Maxim Khlobystov
434cfc588c Made navbar responsive. 2014-12-09 10:03:01 -08:00
Anton Georgiev
5f93fdc2f2 if the user is not in the meeting (kicked out) redirect to 'logout' 2014-12-09 17:06:28 +00:00
Anton Georgiev
9eeee1823d Tyler's changes on UI 2014-12-09 00:22:09 +00:00
Maxim Khlobystov
032cc39c4e Replaced width-related breakpoint by the page orientation info for switching between landscape and portrait stylesheets. 2014-12-08 15:35:25 -08:00
Anton Georgiev
4d34b5f073 Merge branch 'master' of github.com:antobinary/bigbluebutton into testing-version-007 
Conflicts:
	labs/meteor-client/app/client/stylesheets/users.less
 2014-12-08 19:56:44 +00:00
Anton Georgiev
6b16a67e6c the default values for Session vars should be set on main page load 2014-12-05 19:04:46 +00:00
Anton Georgiev
f9dc0fdac1 clean Session var on logout 2014-12-05 18:53:53 +00:00
Anton Georgiev
b30d18cda7 Merge branch 'meteor-client-responsive-ui' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-05 14:52:32 +00:00
Anton Georgiev
596bacbc09 fixing issue where meetingName was using old value from Session 2014-12-04 21:31:13 +00:00
Maxim Khlobystov
a1682a02fe Put landscape and portrait stylesheets in separate files. 2014-12-04 13:30:52 -08:00
Maxim Khlobystov
1a8aca0315 Added a portrait mode for extra small devices. 2014-12-03 18:06:06 -08:00
Anton Georgiev
00e860d794 Merge branch 'meteor-client-responsive-ui' of https://github.com/gthacoder/bigbluebutton into testing-version-007 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/client/views/users/user_item.html
 2014-12-03 21:10:51 +00:00
Maxim Khlobystov
0a6e8a9b53 Made the size of visible panels fit the whole window on toggling userlist/whiteboard/chat. 2014-12-02 19:20:16 -08:00
Anton Georgiev
171f3dccfc reworked the toggle on/off expanding 2014-12-02 22:52:03 +00:00
Anton Georgiev
c7c35f3ef3 Merge branch 'meteor-client-css-to-less' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-02 18:25:15 +00:00
Maxim Khlobystov
2faa695b71 Made LESS selectors nested. 2014-12-02 08:59:06 -08:00
Anton Georgiev
2073c742b6 could not properly append the width without the ; 2014-12-02 16:23:30 +00:00
Anton Georgiev
3fc167f20a first cut of expanding view on toggle chat/users off 2014-12-01 23:36:03 +00:00
Anton Georgiev
4c79a29c87 remove 'userNameEntry' 2014-12-01 20:59:39 +00:00
Anton Georgiev
4cecd51380 lint 2014-12-01 20:49:20 +00:00
Anton Georgiev
d892ae5c6c Merge branch 'meteor-client-post-summit-merge' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-12-01 20:40:43 +00:00
Maxim Khlobystov
b58bfb78c2 Fixed the issue with all the tabs re-displayed on refreshing or receiving a new message regardless of the previous tabs state. 2014-11-30 18:39:33 -08:00
Anton Georgiev
816a70f3bd Merge branch 'meteor-ui-less' of github.com:antobinary/bigbluebutton into testing-version-007 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/.meteor/versions
	labs/meteor-client/app/client/stylesheets/users.less
	labs/meteor-client/app/client/views/users/user_item.html
 2014-11-28 23:44:32 +00:00
Anton Georgiev
4c32795b10 removing the table in users list 2014-11-28 23:39:02 +00:00
Anton Georgiev
9a2618ed35 style should be in the .less 2014-11-28 21:56:27 +00:00
Anton Georgiev
adb16f72a0 Create a seperate CSS file for the login screen 2014-11-28 21:43:52 +00:00
Anton Georgiev
e5841a96d5 Merge branch 'meteor-client-post-summit-merge' of github.com:gthacoder/bigbluebutton into meteor-ui-less 2014-11-28 20:50:45 +00:00
Anton Georgiev
4172537f24 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
 2014-11-28 20:33:11 +00:00
Maxim Khlobystov
767a49de3a Merge branch 'meteor-recover-disconnection' of https://github.com/antobinary/bigbluebutton into meteor-client-post-summit-merge 2014-11-28 10:31:02 -08:00
Maxim Khlobystov
0d7f168cb5 Put hex values into variables. 2014-11-28 10:22:28 -08:00
Anton Georgiev
de36894cee must clear the chat tabs on logout 2014-11-28 16:41:00 +00:00
Anton Georgiev
8e34601ffc simplify the username fetching 2014-11-28 16:40:14 +00:00
Anton Georgiev
8a7ab38956 to_userid is now userid 2014-11-28 16:26:51 +00:00
Maxim Khlobystov
544de2db8c Made cursor automatically focused on the landing page's username field. 2014-11-27 17:33:54 -08:00
Maxim Khlobystov
94cde21087 Temporary removed Velocity package. 2014-11-27 17:22:09 -08:00
Anton Georgiev
7cc9e97730 there is no need currently to hide the navbar on logout 2014-11-27 23:28:06 +00:00
Anton Georgiev
d64e324bf8 remove duplicate def of setInSession 2014-11-27 23:25:06 +00:00
Anton Georgiev
cbe31eb4c0 the reconnect button on logout logs you back in the meeting 2014-11-27 23:24:14 +00:00
Anton Georgiev
b1399a8d40 removed dbid 2014-11-27 22:08:33 +00:00
Anton Georgiev
6ba5d39b93 dbid->userid for chat tabs 2014-11-27 22:02:19 +00:00
Anton Georgiev
b3f3147a69 publish chat based on userid, not dbid 2014-11-27 20:30:23 +00:00
Anton Georgiev
3c12be30b5 cleaning up 2014-11-27 00:01:40 +00:00
Anton Georgiev
f5a3c987b1 added a condition. cleaning up 2014-11-26 23:57:39 +00:00
Anton Georgiev
f2760f3ef8 chat with authToken+userid instead of userSecret+dbid 2014-11-26 22:49:21 +00:00
Maxim Khlobystov
a2d868643b Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-post-summit-merge 
Conflicts:
	labs/meteor-client/app/client/globals.coffee
 2014-11-26 11:19:28 -08:00
Maxim Khlobystov
8256f78db1 Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-viewer 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/.meteor/versions
	labs/meteor-client/app/client/main.coffee
	labs/meteor-client/app/client/stylesheets/style.css
 2014-11-24 13:08:44 -08:00
Leonardo Crauss Daronco
b12ea8252d Webhooks: fix callbacks not being sent for create meeting events 
Meeting ID mappings have to be created before the meeting created event is
processed, otherwise they won't generate callbacks to hook registered for
that meetingID only.
 2014-11-24 14:34:03 -02:00
Leonardo Crauss Daronco
b568560df4 Webhooks: any 2xx status should be taken as successful 2014-11-24 13:01:13 -02:00
Leonardo Crauss Daronco
9366bd766b Move labs/bbb-callback to labs/bbb-webhooks 2014-11-24 12:56:04 -02:00
Maxim Khlobystov
075ca4e18c Moved from client-side-only collection for tracking chat tabs to its Session analogue. 2014-11-21 19:26:02 -08:00
Anton Georgiev
1e3daf1252 cleaning up 2014-11-21 22:12:55 +00:00
Anton Georgiev
6af440d219 cleaning up 2014-11-21 20:57:36 +00:00
Anton Georgiev
0e7f9e8bb3 delete the users from the collection on meeting end 2014-11-21 20:51:37 +00:00
Anton Georgiev
fe858d3888 when a user leaves the meeting mark the user as offline instead of removing from the collection 2014-11-21 20:29:07 +00:00
Anton Georgiev
b01e8e5418 cleaning up router.coffee 2014-11-21 18:02:53 +00:00
Anton Georgiev
a544329079 not needed anymore 2014-11-21 17:52:14 +00:00
Anton Georgiev
e7b6a48934 not used anywhere 2014-11-21 17:51:44 +00:00
Anton Georgiev
eb05ad18a5 authToken instead of userSecret 2014-11-21 17:45:44 +00:00
Anton Georgiev
f5bda18c49 authToken instead of userSecret 2014-11-21 17:36:21 +00:00
Anton Georgiev
c0b9ba37ee we no longer use getMyInfo() 2014-11-21 17:35:04 +00:00
Anton Georgiev
624354e246 use userId instead of the changing dbid 2014-11-21 17:28:50 +00:00
Anton Georgiev
a2bbc548f0 setInSession was defined twice 2014-11-21 17:25:42 +00:00
Anton Georgiev
a003365d35 redoing the router with authToken 2014-11-21 17:07:16 +00:00
Anton Georgiev
93f2338dae subscribe using the token 2014-11-21 15:05:03 +00:00
Maxim Khlobystov
9629fcbc9f Customized the Confirm Logout box. 2014-11-20 19:15:29 -08:00
Anton Georgiev
261066c8ae use authToken for subscribing 2014-11-20 23:35:30 +00:00
Anton Georgiev
a504be308c multi is false by default 2014-11-20 22:01:26 +00:00
Anton Georgiev
1a8019edfc removed html reporter 2014-11-20 21:36:18 +00:00
Anton Georgiev
ecacf5010b on regiser user add the user to the collection. on userjoin update the user 2014-11-20 21:32:51 +00:00
Anton Georgiev
81d8fbde08 function whoami to help during development 2014-11-19 23:22:50 +00:00
Anton Georgiev
0616c593f3 function whoami to help during development 2014-11-19 23:21:12 +00:00
Anton Georgiev
a2d739a113 changed isCurrentUser to use userId 2014-11-19 23:20:34 +00:00
Anton Georgiev
4ab88b2a32 added the meetingId when searching for the user 2014-11-19 20:47:37 +00:00
Anton Georgiev
9e628b0282 put the disconnection handling code back in place 2014-11-19 20:14:19 +00:00
Anton Georgiev
a31246c6f9 join audio, leave audio don't need server side assistance at this point 2014-11-18 22:44:52 +00:00
Anton Georgiev
9c4e7f80e2 reworked userLogout, added secret 2014-11-18 22:03:13 +00:00
Anton Georgiev
004b6d40ba we don't need to send user_join_voice_request or user_leave_voice_request. It's automatic 2014-11-18 19:54:46 +00:00
Anton Georgiev
0f61fbed24 reworked [un]muting user so it uses userId and userSecret 2014-11-18 19:35:51 +00:00
Anton Georgiev
45e1eb1ac3 lint of users.coffee 2014-11-18 16:28:00 +00:00
Anton Georgiev
058fa24437 Merge branch 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-working-on-permissions 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/.meteor/versions
 2014-11-18 15:55:29 +00:00
Anton Georgiev
759ee46ca4 removing html-reporter 2014-11-18 15:49:47 +00:00
Anton Georgiev
51f070bccf shortened the message 
(not sure why but we were getting an error with the previous version of the message)
 2014-11-18 15:47:43 +00:00
Anton Georgiev
4bfc8d4d41 Merge branch 'master' of github.com:antobinary/bigbluebutton into testing-version-006 2014-11-17 22:48:00 +00:00
Anton Georgiev
df45df31ab Tyler:work in progress on user items 2014-11-17 22:44:47 +00:00
Anton Georgiev
a9ebc858c1 the sip library was renamed 2014-11-17 22:02:17 +00:00
Maxim Khlobystov
f1bbcb2a49 Cleaning up. 2014-11-17 13:49:46 -08:00
Maxim Khlobystov
c4b352d87b Made all the Jasmine suites disabled by default. 2014-11-17 13:40:19 -08:00
Maxim Khlobystov
fb1bc92ada Removed a file containing a sample server-side unit test. 2014-11-17 13:31:32 -08:00
Maxim Khlobystov
b5a8fdd172 Removed Velocity HTML reporter. 2014-11-17 13:26:31 -08:00
damaren
7a004601b8 the two files that should have been in the last commit 2014-11-14 18:18:47 -02:00
damaren
690f1a291b added a button in the logout page to redirect the user to the login page 2014-11-14 18:03:45 -02:00
Leonardo Crauss Daronco
feaf75901e Webhooks: add a post catcher application for testing 2014-11-14 17:55:44 -02:00
Leonardo Crauss Daronco
7efb3a18ab Webhooks: trigger callbacks for recording events too 2014-11-14 16:53:46 -02:00
Lucas Zawacki
7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2014-11-14 15:33:17 -02:00
Lucas Zawacki
92584c1cad Merge branch 'merge-with-tests' of https://github.com/antobinary/bigbluebutton into merge-with-tests 2014-11-14 14:31:53 -02:00
Leonardo Crauss Daronco
81f5a109b6 Merge remote-tracking branch 'upstream/master' into webhooks-2.0 2014-11-14 14:28:35 -02:00
Leonardo Crauss Daronco
8fc251c55b Webhooks: follow redirects on callback calls, up to 10 times 2014-11-14 14:26:29 -02:00
Leonardo Crauss Daronco
536decff7c Webhooks: use winston for logging and rotate log files 2014-11-14 14:12:37 -02:00
Anton Georgiev
9ef7ad5edc using roles and predefined permissions per role for raising/lowering hand 2014-11-14 11:00:55 -05:00
Leonardo Crauss Daronco
6260f26101 Webhooks: adjustments for the app when running in production 2014-11-14 11:58:12 -02:00
Leonardo Crauss Daronco
31666bc7fb Webhooks: add config files for upstart and monit 2014-11-14 11:23:04 -02:00
Leonardo Crauss Daronco
592a2f92dd Webhooks: add an extra app to print events from a meeting 
Utility app to help a user find out the events that happen in a meeting.
 2014-11-14 11:07:16 -02:00
Leonardo Crauss Daronco
329a1ff959 Webhooks: local config, docs and improve how the checksum is calculated 
The way the checksum is calculated now is more similar to the other API calls,
specially setConfigXML. It uses the content type 'application/x-www-form-urlencoded'
so the information in the post body doesn't have to be converted from/to
js/string, preventing possible checksum errors in different programming
languages.
 2014-11-14 11:05:20 -02:00
Lucas Zawacki
0a92c0e138 Merge branch 'merge-with-tests' of https://github.com/antobinary/bigbluebutton into merge-with-tests 2014-11-13 18:54:46 -02:00
Lucas Zawacki
6721e3395f Add velocity:core and velocity:html-report back and mock logging 2014-11-13 18:53:54 -02:00
Anton Georgiev
826b6658a7 remove moderator condition 2014-11-13 15:52:42 -05:00
Anton Georgiev
c275778b19 using the userSecret to control the permissions for raise/lower hand 2014-11-13 15:04:51 -05:00
Maxim Khlobystov
bbbb51a8a5 Added the first set of integration tests for the whiteboard template. 2014-11-13 16:06:45 -02:00
Maxim Khlobystov
367b6eb3f5 Improved the quality of usersList rendering specs and added some new test cases. 
Conflicts:
	labs/meteor-client/app/tests/jasmine/client/integration/templates/usersList/usersListSpec.js
 2014-11-13 16:06:24 -02:00
Anton Georgiev
65d858e737 added an alphanumeric userSecret with length 10 symbols 2014-11-13 12:54:50 -05:00
Lucas Zawacki
2bb32218fa Merge branch 'meteor-client-tests' of https://github.com/gthacoder/bigbluebutton into merge-with-tests 
Conflicts:
	labs/meteor-client/app/tests/jasmine/server/unit/CollectionMethodsSpec.js
 2014-11-13 15:28:51 -02:00
Lucas Zawacki
0b3e1e570e Using iron-router params.query syntax in router.coffee 2014-11-13 12:29:27 -02:00
Leonardo Crauss Daronco
6dbcf1bab2 Webhooks: rename MeetingIDMap to IDMapping 2014-11-13 12:15:20 -02:00
Leonardo Crauss Daronco
14641d1a3b Webhooks: expire mappings for inactive meetings 
If a meeting has no events for too long (24 hours), remove the meeting
mapping to prevent too much data from being stored forever on redis.
 2014-11-13 12:03:42 -02:00
Anton Georgiev
0f3a877402 modified the url for routing to the sign in page 2014-11-13 08:46:39 -05:00
Maxim Khlobystov
425c2b533b Added unit tests for the server side private methods used to add/remove slides. 2014-11-12 19:42:17 -08:00
Maxim Khlobystov
b9462e4f2a Got rid of the spec related to deletePrivateChatMessages() (the method didn't exist anymore). 2014-11-12 18:50:21 -08:00
Anton Georgiev
f9ed2a23b5 (not complete) on meteor 1.0 2014-11-12 16:04:03 -05:00
Anton Georgiev
623136670a Merge branch 'merge-with-tests' of github.com:lfzawacki/bigbluebutton into merge-with-tests 
Conflicts:
	labs/meteor-client/app/.meteor/packages
 2014-11-12 16:00:44 -05:00
Leonardo Crauss Daronco
66bfbeb1bc Webhooks: use external meeting ID as key in the mappings 
It changes less than the internal meeting ID. An application can subscribe
to an external ID and use the hook for several different meetings that will
have the same external ID but different internal IDs.
 2014-11-12 18:27:21 -02:00
Leonardo Crauss Daronco
5e141d324c Webhooks: better intervals for retying failed callbacks 
Will try again a number of times for about 5min and then give up. On giving
up, the hook is removed.
And a few fixes for saving and loading data on redis.
 2014-11-12 18:07:29 -02:00
Lucas Zawacki
81f0665738 Merge with testing and update to meteor only packages 2014-11-12 17:34:12 -02:00
Lucas Zawacki
87421be943 Merge branch 'meteor-client-tests' of https://github.com/gthacoder/bigbluebutton into testing-version-005 
Conflicts:
	labs/demos/views/index.html
	labs/meteor-client/app/server/collection_methods/meetings.coffee
 2014-11-12 16:38:18 -02:00
Leonardo Crauss Daronco
6d63f2f299 Webhooks: persist data to redis 
Save hooks and meetingID mappings to redis and get them back when the
application starts.
Still missing a way to remove old data in case the app loses events (e.g.
a hook for a specific meeting might stay on redis forever if the app
lost the meeting_destroyed event).
 2014-11-12 16:35:25 -02:00
Anton Georgiev
2b819c2499 Merge branch 'testing-version-005' of github.com:lfzawacki/bigbluebutton into testing-version-005 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
 2014-11-12 13:14:21 -05:00
Lucas Zawacki
7e763b7219 Remove unused js files and move api_bridge to the client/lib 2014-11-12 15:17:23 -02:00
Anton Georgiev
b18b8a2d0e install external-file-loader via mrt 2014-11-12 12:01:19 -05:00
Maxim Khlobystov
ae48d72dc3 Merge branch 'meteor-client-viewer' into meteor-client-tests 
Conflicts:
	labs/meteor-client/app/.meteor/packages
 2014-11-12 08:51:14 -08:00
Lucas Zawacki
284ce6bbaf Add winston client and correct logging path 
Conflicts:
	labs/meteor-client/app/client/main.coffee
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
 2014-11-12 14:37:55 -02:00
Lucas Zawacki
3f6cc062a9 Merge winston logging 
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/lib/router.coffee
	labs/meteor-client/app/server/collection_methods/chat.coffee
	labs/meteor-client/app/server/collection_methods/users.coffee
	labs/meteor-client/app/server/redispubsub.coffee
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
 2014-11-12 13:18:09 -02:00
Leonardo Crauss Daronco
bfdae8f204 Webhooks: store meeting ID mappings in a global model 2014-11-12 13:07:54 -02:00
Anton Georgiev
ffab06751c we have the .coffee now 2014-11-12 09:58:24 -05:00
Fred Dixon
e84a65d986 Moved from labs; reformatted check.nginx 2014-11-12 09:22:50 -05:00
Anton Georgiev
6efde7e2aa Merge branch 'meteor-improving-login' into testing-version-005 2014-11-12 09:15:36 -05:00
Anton Georgiev
7b2ea01b30 Merge branch 'meteor-sip' of github.com:lfzawacki/bigbluebutton into testing-version-005 
Conflicts:
	labs/meteor-client/app/client/globals.coffee
 2014-11-12 08:57:59 -05:00
Leonardo Crauss Daronco
fd90a46563 Webhooks: implement the API method to list available hooks 2014-11-12 11:38:00 -02:00
Lucas Zawacki
ca8133070b Write parts of the client using the BBB api bridge methods 2014-11-12 11:30:34 -02:00
Leonardo Crauss Daronco
79609fadb2 Webhooks: use more "hook" and less "subscription" for consistency 
It now creates and destroys hooks instead of creating and removing
subscriptions.
 2014-11-12 11:28:49 -02:00
Anton Georgiev
4727737691 moved the re-subscription to users to be at the end because on / it was stopping the subscription to the other collections. As a result we were not able to send a chat message immediately after login. We had to refresh first 2014-11-12 08:15:13 -05:00
Felipe Cecagno
739287bce0 added a nginx config file so anybody can run the client check from a dev environment 2014-11-12 10:54:38 -02:00
Felipe Cecagno
9a8e299648 changed the client check output dir from bin-release/ to check/ 2014-11-12 10:54:13 -02:00
Leonardo Crauss Daronco
c25082bafa Wehbooks: hooks can now subscribe to a single meeting 
Hooks can be global, to receive events from all meetings, or can receive
events for a single meeting. Depends on whether the meetingID parameter is
informed or not in the hooks/subscribe API call.

Also improved the log messages a bit.
 2014-11-12 10:53:49 -02:00