Commit Graph

2880 Commits

Author SHA1 Message Date
KDSBrowne
126f4589e1 move if conditions 2017-08-29 12:31:09 -07:00
KDSBrowne
20316be90f add suggested changes 2017-08-29 12:25:01 -07:00
KDSBrowne
82de509c55 fix typo 2017-08-29 07:00:41 -07:00
Klaus
ade47254d3 Fix inconsistency inside the ACL, #4310 2017-08-28 16:48:46 -03:00
Maxim Khlobystov
54e74d213d Added test command to the precommit git hook. 2017-08-28 14:45:38 -04:00
KDSBrowne
1ba4be58fd removed unused functions 2017-08-28 09:14:18 -07:00
Maxim Khlobystov
9a8a4a2a5e Added an instance of the mobile Chrome (iPhone 6). 2017-08-28 11:52:15 -04:00
KDSBrowne
7271be05f8 remove getElementById usage in message-list-item component 2017-08-28 08:30:50 -07:00
KDSBrowne
24bdb2d000 remove getElementById usage in message component 2017-08-28 08:30:50 -07:00
KDSBrowne
92c9af6d96 add functions to create headers 2017-08-28 07:29:26 -07:00
Oleksandr Zhurbenko
5d2b215591 Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection 2017-08-27 01:12:27 -07:00
Oleksandr Zhurbenko
1a92a7f6a1 Changed annotations' rendering, refactored draw listeners, adjusted permissions for the publishAnnotation 2017-08-25 15:45:06 -07:00
Oleksandr Zhurbenko
f533b25d69 Improved whiteboard-toolbar and fixed linter warnings 2017-08-24 16:47:20 -07:00
Oleksandr Zhurbenko
f3481a7e4b Turned on multi-user drawings 2017-08-23 21:27:41 -07:00
Oleksandr Zhurbenko
321b47abd1 Fixed pencil and text draw listeners for presenters 2017-08-23 20:35:34 -07:00
Oleksandr Zhurbenko
af558ff61d Fixed cursor's rendering including smoothing; adjusted cursor's label 2017-08-22 13:20:12 -07:00
Oleksandr Zhurbenko
2686c67ee7 Fixed a bug with pencil data not being added to the collection 2017-08-21 17:32:03 -07:00
Maxim Khlobystov
0d7072f6c7 Put the logic of typing a username into a separate function, thus avoiding repetition. 2017-08-21 14:29:25 -04:00
Maxim Khlobystov
7819f425d8 Added Google Dev and Firefox Nightly to the browsers list. 2017-08-21 11:42:10 -04:00
Oleksandr Zhurbenko
6a04851469 Fixed all the eslint errors under components/presentation 2017-08-20 17:16:39 -07:00
Oleksandr Zhurbenko
aa68421462 Fixed most of lint errors under components/whiteboard
Except annotation group, which will be changed soon
2017-08-19 23:32:01 -07:00
Oleksandr Zhurbenko
d5f07a574c Fixed publishShape message for 4 common shapes
Line, Rectangle, Triangle, Ellipse
2017-08-18 19:47:31 -07:00
Anton Georgiev
50efdf3066 Merge pull request #4242 from MaximKhlobystov/selenium-multiremote
[HTML5 Client] Multiple browser sessions in test specs
2017-08-17 13:29:42 -04:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Maxim Khlobystov
397a94b1c9 Put the assertion logic that browsers share into a separate utility class, thus avoiding unnecessary code repetition + we are now fetching the base url from the wdio config (not hardcoded anymore). 2017-08-16 12:31:49 -04:00
Oleksandr Zhurbenko
76d778d9e5 Fixed 'Clear All' annotations for the multi-user mode 2017-08-15 15:30:11 -07:00
Anton Georgiev
5f1fb7542e Merge pull request #4204 from Klauswk/fix-missing-state
[HTML5 2.0] Fix Audio Modal on Meeting Join
2017-08-15 15:11:47 -04:00
Anton Georgiev
f6e8e743e0 Merge pull request #4244 from KDSBrowne/fix-meeting-title
[HTML5] - Meeting title fix
2017-08-15 15:11:27 -04:00
KDSBrowne
66d1a3b06a fix meeting title 2017-08-15 10:24:58 -07:00
Klaus
3730891d5f Merge branch 'bbb-2x-mconf' into html5-breakout-2x-fix 2017-08-15 13:08:13 -03:00
Maxim Khlobystov
cca17c222e Got rid of the tests' getting started document (these docs are already on the official docs website). 2017-08-15 11:04:38 -04:00
Maxim Khlobystov
511529c93f Cleanup: removing some debug code. 2017-08-15 11:02:10 -04:00
Maxim Khlobystov
723532c4a4 Increased the Jasmine default timeout to prevent async-related errors when running the tests on desktop Ubuntu. 2017-08-15 10:44:19 -04:00
Oleksandr Zhurbenko
9035386e76 Added multi-cursors 2017-08-14 17:15:11 -07:00
JaeeunCho
ab81ebfcfd added new line at the end of service.js 2017-08-14 13:05:59 -07:00
JaeeunCho
11d181327c created service.js moved makeCall to service.js 2017-08-14 13:03:37 -07:00
JaeeunCho
1dff7f0ef2 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-14 12:56:56 -07:00
Klaus
dc62d15ad0 Change variable name 2017-08-14 16:19:35 -03:00
Klaus
e996bea1e9 Handling separate redis channel 2017-08-14 15:55:17 -03:00
Klaus
7c12ccb39e Handling meeting end 2017-08-14 15:52:18 -03:00
Maxim Khlobystov
3d7a35972b Updated the page object classes according with the multiremote needs. 2017-08-14 12:58:43 -04:00
Maxim Khlobystov
8379d5207c Updated all the existing landing page specs to support mutiremote mode. 2017-08-14 12:30:14 -04:00
Maxim Khlobystov
4e55403348 Added multiremote to the test runner config. 2017-08-14 10:03:43 -04:00
JaeeunCho
237d1b6ac3 divided code into new container.jsx 2017-08-11 13:32:33 -07:00
Klaus
de6b40a666 Fix counter in breakout notification 2017-08-11 17:17:35 -03:00
Klaus
17dce149d9 fix dropdown going missing 2017-08-11 15:02:26 -03:00
Klaus
babc981867 Messages been correct handle 2017-08-11 14:14:50 -03:00
JaeeunCho
b20ea78e2a fixed conflict 2017-08-10 14:34:21 -07:00
JaeeunCho
8607eff5d6 changed fullScreen to fullscreen 2017-08-10 12:09:16 -07:00
JaeeunCho
3f773684bc [HTML5] changed string id to camelCase 2017-08-10 10:34:34 -07:00
Oleksandr Zhurbenko
cd4150ebf5 Adjusted permissions for the multi-user cursorMove 2017-08-09 20:59:53 -07:00
JaeeunCho
405ead47c2 added new line at styles.scss 2017-08-08 15:29:22 -07:00
JaeeunCho
33f0104b5a changed logout confirmation 2017-08-08 15:27:34 -07:00
Oleksandr Zhurbenko
f90a1d446f Made whiteboard-toolbar display when multi-user mode is on 2017-08-08 13:55:38 -07:00
JaeeunCho
8590d2f414 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-08 12:31:56 -07:00
Klauswk
0ce41afabb Merge branch 'bbb-2x-mconf' into html5-toggle-mute 2017-08-08 13:59:00 -03:00
Oswaldo Acauan
716ee5902f Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-08 11:52:26 -03:00
Klaus
024fd2a796 Fix removed logic from the AudioContainer 2017-08-04 17:33:25 -03:00
Klaus
526518e740 Remove duplicate lines 2017-08-04 17:20:24 -03:00
Klaus
0807960da4 Fix missing method for mute user 2017-08-04 17:05:18 -03:00
Oswaldo Acauan
e07c8b41af Add autofocus when switching/entering chat 2017-08-04 15:32:21 -03:00
Oswaldo Acauan
78e88c8189 Fix unread counter 2017-08-04 15:20:54 -03:00
Oswaldo Acauan
720dddec24 Fix chat styles 2017-08-04 15:17:15 -03:00
Oswaldo Acauan
0022c121d3 Fix chat bug and styles 2017-08-04 14:58:55 -03:00
Klaus
0c6ac6364c Fix missing state of audio modal 2017-08-04 09:24:57 -03:00
Oleksandr Zhurbenko
227f9d540f Added permissions to Move Cursor presenter action 2017-08-03 14:18:01 -07:00
Oleksandr Zhurbenko
43566245ac Added permissions to Undo and Clear All presenter actions 2017-08-03 14:09:19 -07:00
Anton Georgiev
6afb7ca8b3 Merge pull request #4124 from Klauswk/html5-2x-chat-options
[HTML5 2.0] Add public chat new options
2017-08-03 14:33:32 -04:00
Anton Georgiev
1d465909e8 Merge pull request #4198 from KDSBrowne/x2.0.1-transifex-fetch-translation
[HTML5 2.0] - Transifex script & Translations.
2017-08-03 14:21:48 -04:00
Klaus
e4e7f1da2c Move domain functions to service.js 2017-08-03 11:10:05 -03:00
Oswaldo Acauan
bc3679c0b4 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-03 09:53:44 -03:00
Anton Georgiev
1494c23858 Merge pull request #4189 from Klauswk/html5-hotfix-voiceuser
[HTML5 2.0] Fix VoiceUser microphone state
2017-08-03 08:53:01 -04:00
Oswaldo Acauan
b53636ec19 Fix avatar colors and text capitalization 2017-08-03 09:36:26 -03:00
Oswaldo Acauan
14f586faad Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-03 09:23:12 -03:00
Klaus
e02e5d75ce Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-03 09:17:50 -03:00
Oswaldo Acauan
00db9ee5bb Comment out compact user-list toggle 2017-08-03 09:06:59 -03:00
Oswaldo Acauan
92da0ace60 Fix error when a user have no subName and hide compact toggle 2017-08-03 09:05:17 -03:00
Oleksandr Zhurbenko
fa1458c3eb Handling and publishing multi-user mode switch 2017-08-02 18:24:38 -07:00
Klaus
7b8eb8027c Merge clear annotations and annotationsWhiteboard 2017-08-02 17:14:01 -03:00
Klaus
4495c2e897 Move from annotation/ to annotations/ 2017-08-02 16:52:13 -03:00
Klaus
c5646069fd Using the older insert method inside addShape 2017-08-02 16:46:29 -03:00
KDSBrowne
daa1439099 add script to pull translation from transifex 2017-08-02 11:11:33 -07:00
Klaus
e7b9eab5b6 Move makeCall to service file 2017-08-02 14:05:20 -03:00
Klaus
63fee3b615 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-02 11:36:16 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Klaus
a0368e55cf Fix voiceUser mic states 2017-08-02 10:11:53 -03:00
Oleksandr Zhurbenko
b207a1275e Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-01 13:49:46 -07:00
Anton Georgiev
1bafb292cb Merge pull request #4169 from oswaldoacauan/meteor-1.5.1
[HTML5] Update Meteor to 1.5.1
2017-08-01 15:27:26 -04:00
Anton Georgiev
64b597c420 Merge pull request #4179 from Klauswk/html5-2x-voice-user
[HTML5 2.0] Move AudioUsers to his own Collection
2017-08-01 14:38:26 -04:00
Oswaldo Acauan
35fd834397 Fix error when a user have no subName 2017-08-01 14:50:33 -03:00
Oswaldo Acauan
df35a22676 Merge branch 'bbb-2x-mconf' into userlist-2x-design 2017-08-01 14:29:12 -03:00
Klaus
0a9abf6273 Remove user.listenOnly 2017-08-01 14:02:41 -03:00
JaeeunCho
e663458d01 added div for description 2017-08-01 09:17:03 -07:00
JaeeunCho
08818948ac changed logout-confirmation and en.json 2017-08-01 09:09:06 -07:00
Klaus
6cc46b8627 Add const to voiceUser 2017-08-01 13:04:20 -03:00
JaeeunCho
e4f94f1d91 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-01 08:55:02 -07:00
JaeeunCho
04636ca25b [HTML5] added endMeeting by moderator 2017-08-01 08:53:05 -07:00
Klaus
fc6713013a Move method to VoiceUser 2017-08-01 12:00:07 -03:00
Anton Georgiev
04a7781ea6 Merge pull request #4172 from mmarangoni/call-manager
[HTML5] Remove audio API duplication & Join Audio fix
2017-08-01 10:23:09 -04:00
Klaus
ed7d9a3a63 Change wrong log 2017-08-01 10:55:00 -03:00
Klaus
11cf4b8d78 A few fixes on client 2017-08-01 10:41:24 -03:00
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Anton Georgiev
2fd4bc4330 handle PresentationConversionCompletedEvtMsg 2017-07-31 17:08:09 -04:00
Matthew Marangoni
2494f48f52 removed unused constructor 2017-07-31 13:54:18 -07:00
Klaus
1ff3df770a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user 2017-07-31 17:01:04 -03:00
Klaus
d06c49a6b8 Move from voice-user to voice-users 2017-07-31 16:36:41 -03:00
Anton Georgiev
7d50c01a4a Merge pull request #4126 from Klauswk/html5-2x-handle-meeting-end
[HTML5 2.0] Handling meeting end
2017-07-31 15:29:15 -04:00
Anton Georgiev
1b2591653b Merge pull request #4168 from oswaldoacauan/user-join-req-msg
[HTML5] Implements the new join flow
2017-07-31 15:25:24 -04:00
Oswaldo Acauan
75d67cec33 Update Meteor to 1.5.1 2017-07-31 16:19:13 -03:00
Oswaldo Acauan
f217304e19 Add publish to UserJoinMetting to the auth flow 2017-07-31 15:48:56 -03:00
Anton Georgiev
7b40122c89 Merge pull request #4121 from mmarangoni/call-manager
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04:00
Klaus
0a1091f871 Merge branch 'slides-refactor-2x' of https://github.com/klauswk/bigbluebutton into slides-refactor-2x 2017-07-31 09:04:07 -03:00
Klaus
03f0061e2c Fix lint 2017-07-31 09:03:46 -03:00
Oleksandr Zhurbenko
4e31181690 Resolve Alex cherry-pick 2017-07-31 08:30:08 -03:00
Klaus
9bc9116e5c handling a few messages 2017-07-31 08:10:52 -03:00
Oleksandr Zhurbenko
9e58c33b10 Added 'resize' event to the notifications bar
To scale the whiteboard
2017-07-28 18:52:06 -07:00
Oleksandr Zhurbenko
c61dcbce36 Fixed a cursor display/publish for both presenters and viewers
Plus linting warnings, no multi-user yet
2017-07-28 17:29:40 -07:00
Oswaldo Acauan
dca47fcbb6 Add missing locales 2017-07-28 10:51:18 -03:00
Oswaldo Acauan
e93f3c0fd5 Remove logs 2017-07-28 10:49:48 -03:00
Oswaldo Acauan
83c117ddde Match user-list with the new styles 2017-07-28 10:43:39 -03:00
Klaus
e43a44e828 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-07-28 08:47:56 -03:00
Oleksandr Zhurbenko
ae3b4bb7fb Fixed initial whiteboard request history handler
Linter fixes
2017-07-27 19:56:41 -07:00
Oleksandr Zhurbenko
0cb46d2156 Fixed initial whiteboard history request handler 2017-07-27 18:21:02 -07:00
Klaus
e2c0971e57 Add new icons 2017-07-27 17:45:40 -03:00
Klaus
eac898e81d Merge branch 'bbb-2x-mconf' into html5-2x-chat-options 2017-07-27 17:36:01 -03:00
Klauswk
e751bcdadf Merge branch 'bbb-2x-mconf' into slides-refactor-2x 2017-07-27 17:27:35 -03:00
Klaus
e23d75c16b Captions mapped 2017-07-27 17:18:44 -03:00
Anton Georgiev
b78f40b543 Merge pull request #4119 from JaeeunCho/new_icon
[HTML5 2.0] added new icons
2017-07-27 15:49:33 -04:00
Anton Georgiev
13b406313e drop handling of fsesl->akka-apps events 2017-07-27 11:27:06 -04:00
Klaus
b015c98f82 Mapped annotations 2017-07-27 10:45:40 -03:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
JaeeunCho
7fc1fa376f changed 'romm' to 'room' 2017-07-26 11:04:55 -07:00
Anton Georgiev
4c19d0589b reorganize object destruction 2017-07-26 14:01:38 -04:00
Matthew Marangoni
0ab3bcc599 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-26 10:59:05 -07:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Anton Georgiev
5ca6f63d7e Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into html5-2x-fix-audio 2017-07-26 13:49:57 -04:00
Klaus
a1e57c84c3 Mapped meeting 2017-07-26 14:36:57 -03:00
JaeeunCho
315dae97d7 Merge branch 'new_icon' of https://github.com/JaeeunCho/bigbluebutton into new_icon 2017-07-26 10:17:37 -07:00
Klaus
06b5538054 Mapped polls 2017-07-26 14:08:00 -03:00
Klaus
d05e3c6b14 Presentation mapped 2017-07-26 13:59:21 -03:00
Klaus
ff42dbc58b Refactored slides 2017-07-26 13:39:53 -03:00
Anton Georgiev
305b47e535 improve getSessionToken function and use it on verto_extension 2017-07-26 11:43:47 -04:00
Klaus
355f777d0d User mapped 2017-07-26 11:50:02 -03:00
Klaus
9ab4430f68 Fix merge stuff 2017-07-26 11:31:35 -03:00
Klaus
745b9070f6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-07-26 11:11:40 -03:00
Klaus
eea2c0ee8b Refactor user 2017-07-26 11:09:07 -03:00
Anton Georgiev
dbcf6dbd2c screenshare displays except at refresh 2017-07-26 09:18:15 -04:00
Oleksandr Zhurbenko
6ea4d39da9 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-07-25 15:08:29 -07:00
Anton Georgiev
4e34a7f551 screenshare displays except at refresh 2017-07-25 16:56:40 -04:00
Klaus
d44299d221 Fix the missing string name 2017-07-25 15:57:20 -03:00