KDSBrowne
090b3e91c2
add comment to publish
2017-09-12 10:25:41 -07:00
KDSBrowne
72acea229b
remove single quotes from variable
2017-09-12 10:01:07 -07:00
KDSBrowne
c987ef6635
add publishSystemMessage
2017-09-12 09:11:08 -07:00
KDSBrowne
39bd590329
rework header creation
2017-09-12 08:52:02 -07:00
Oleksandr Zhurbenko
39ba2d12de
Fixed permissions
2017-09-11 12:13:42 -07:00
Oleksandr Zhurbenko
eca8090bac
Adjusted the PR 'methods' to #4322
2017-09-11 12:12:39 -07:00
Oleksandr Zhurbenko
43b3b89c6a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-11 12:11:03 -07:00
Anton Georgiev
9599ed9374
Merge pull request #4320 from MaximKhlobystov/selenium-browser-versions
...
[HTML5 Client] Test Update: Support for browser versioning + Code optimization
2017-09-11 14:08:02 -04:00
Anton Georgiev
802b3bb4fb
Merge pull request #4322 from KDSBrowne/x2.0-header-functions
...
[HTML5] - Add header functions
2017-09-11 14:00:15 -04:00
KDSBrowne
89de2f771b
change parameter name to header
2017-09-11 10:19:06 -07:00
Anton Georgiev
bf35fa7a4c
Merge pull request #4354 from KDSBrowne/x2.0.1-fix-lock-issue-userlist
...
[HTML5] - Fix Userlist Lock Notification
2017-09-11 12:07:17 -04:00
KDSBrowne
467ffaba49
change log message
2017-09-11 06:46:19 -07:00
KDSBrowne
eeb878649a
remove single quotes from variable
2017-09-11 06:42:56 -07:00
Oleksandr Zhurbenko
7e6ad07b76
Added indexes for the html5 Mongo collections
2017-09-07 16:41:03 -07:00
KDSBrowne
ef6d3059a7
fix lint issue
2017-09-07 12:06:48 -07:00
Oswaldo Acauan
c0307e36a6
Presentation Uploader to 2.0
2017-09-07 15:18:14 -03:00
KDSBrowne
b0f3ca7a1a
remove unused import
2017-09-07 10:41:26 -07:00
KDSBrowne
876097a0f4
fix line endings
2017-09-07 10:38:00 -07:00
KDSBrowne
b2b36254ab
remove check from handler add exhaustive check to modifier
2017-09-07 10:33:23 -07:00
KDSBrowne
bc8718e263
fix line endidngs
2017-09-07 09:47:20 -07:00
KDSBrowne
21c5ffee8f
remove need for separate headerBuilder function
2017-09-07 09:37:13 -07:00
KDSBrowne
13e6357b19
fix line endings
2017-09-07 07:31:19 -07:00
KDSBrowne
5a6183dc34
fix undefined check
2017-09-06 12:57:24 -07:00
KDSBrowne
9193ae8849
handle UserLockedInMeetingEvtMsg
2017-09-06 12:53:07 -07:00
Oleksandr Zhurbenko
251bd22738
PR review fixes
2017-09-06 12:36:52 -07:00
KDSBrowne
31cf7aea42
check for specific meeting id
2017-09-06 11:32:29 -07:00
KDSBrowne
fd9a4cd98e
fix bug in undefined check
2017-09-06 11:13:24 -07:00
KDSBrowne
d34f138b56
check if lock settings are undefined
2017-09-06 10:50:48 -07:00
KDSBrowne
572bb0b8d3
remove ternary operation
2017-09-06 09:08:26 -07:00
KDSBrowne
67ab2d5379
alternate solution test
2017-09-06 07:17:46 -07:00
Oleksandr Zhurbenko
9ee75331bf
Removed an unnecessary rule
2017-09-05 19:02:23 -07:00
Oleksandr Zhurbenko
65da71c12a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-05 18:53:51 -07:00
Oleksandr Zhurbenko
3014b26439
PR review fixes
2017-09-05 18:36:15 -07:00
Oleksandr Zhurbenko
b12e0b84a9
Using previously saved draw settings for the initial wb toolbar values
2017-09-05 15:55:18 -07:00
Oleksandr Zhurbenko
3c750575cf
Fixed font-size normalization for the text-shape
2017-09-05 15:47:13 -07:00
Maxim Khlobystov
1379b533fd
Removed the test command from the git precommit hook.
2017-09-05 13:51:41 -04:00
KDSBrowne
c14e779bb4
add check to payload
2017-09-05 08:53:02 -07:00
Anton Georgiev
718828353e
Merge pull request #4321 from Klauswk/fix-acl-inconsistency
...
[HTML5] Fix inconsistency inside the ACL, #4310
2017-09-05 09:54:40 -04:00
Anton Georgiev
a68222dfff
Merge pull request #4181 from JaeeunCho/destroy_meeting_users
...
[HTML5 2.0] End meeting by moderator
2017-09-05 09:54:19 -04:00
Anton Georgiev
50c7974a30
Merge pull request #4323 from KDSBrowne/x2.0-replace-getElementById-instances
...
[HTML5] - Replace Instances of getElementById
2017-09-05 09:51:57 -04:00
JaeeunCho
7a01c61639
fixed isModerator()
2017-09-01 13:00:55 -07:00
JaeeunCho
99ea26c584
added isModerator at service.js
2017-09-01 12:37:14 -07:00
JaeeunCho
ede90b8a40
removed unused line at css
2017-09-01 11:39:17 -07:00
JaeeunCho
43f6fd9c03
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-09-01 11:22:45 -07:00
Anton Georgiev
d60e06e28f
Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase
...
[HTML5] changed string id to camelCase
2017-09-01 10:05:50 -04:00
Oleksandr Zhurbenko
2a91c6aa0b
Fixed a bug initial cursor/shape coordinates on page zooming
2017-08-31 18:42:00 -07:00
KDSBrowne
b20859d1c9
fix chat being locked for moderators
2017-08-31 14:49:13 -07:00
KDSBrowne
7a9cb7d04f
fix the disabling of chat when locked
2017-08-31 14:29:18 -07:00
KDSBrowne
94e44d6a23
remove unused prop
2017-08-31 13:50:20 -07:00
KDSBrowne
a404cc14d1
remove space typo
2017-08-31 13:47:06 -07:00
KDSBrowne
2f9d4bcc0e
move isMeetingLocked condition check to userlist service
2017-08-31 11:12:53 -07:00
Klaus
5bba87525e
Fix navigation error mention by kert
2017-08-31 14:03:40 -03:00
Oswaldo Acauan
a2268494e6
Move old files to the 2.0 folder
2017-08-31 09:56:51 -03:00
Oswaldo Acauan
6070a4ea25
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x
2017-08-31 09:49:59 -03:00
Oleksandr Zhurbenko
58d21dfef5
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-30 16:13:42 -07:00
Oleksandr Zhurbenko
28f7f8ad11
Minor fixes and adjustments
2017-08-30 16:12:03 -07:00
Oleksandr Zhurbenko
e4c4f4584d
Prevented publishing messages on random clicks for common shapes, and enabled that for pencil
2017-08-30 13:45:47 -07:00
KDSBrowne
c244ef91ec
fix line endings
2017-08-30 11:35:40 -07:00
KDSBrowne
a01451f9fd
handle LockSettingsInMeetingChangedEvtMsg and fix userlistitem lock notification
2017-08-30 11:00:56 -07:00
KDSBrowne
7cdf031a22
fix typo
2017-08-30 09:33:18 -07:00
KDSBrowne
f31a2df133
implement suggested changes
2017-08-30 09:31:08 -07:00
KDSBrowne
14696a3cff
fix lint issue
2017-08-30 08:03:19 -07:00
KDSBrowne
a8137c3054
switch to one function to create headers
2017-08-30 07:58:46 -07:00
Oleksandr Zhurbenko
f78283a17d
Fixes
...
Hide wb toolbar when there is no slide; fixed cursor's text clipping; fixed exceptions thrown on 'Clear All' by reactive-annotation container; fixed shapes' thickness scaling on zoom; fixed dimensions' data types sent to akka (it doesn't accept Doubles)
2017-08-29 18:43:55 -07:00
KDSBrowne
b2fcfef145
move if condition
2017-08-29 16:26:43 -07:00
Oleksandr Zhurbenko
e1cf0ad9d5
Rewrite of the cursor component
2017-08-29 13:58:48 -07:00
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
Klaus
4cd5bd26bb
Fix WAI-ARIA and lint
2017-08-24 10:15:11 -03: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
Klaus
d2b39be2d3
Move the userlist stuff to the right folder
2017-08-23 15:03:50 -03:00
Klaus
bbe4afe3f2
Change jeeung's code to match the rest of code
2017-08-23 14:19:01 -03:00
Klaus
ec458d1b55
Refactor user list
2017-08-23 13:29:21 -03:00
Oleksandr Zhurbenko
af558ff61d
Fixed cursor's rendering including smoothing; adjusted cursor's label
2017-08-22 13:20:12 -07:00
Klaus
43d1b0c8d5
Merge remote-tracking branch 'jeeung/implement_set_promote_demote' into html5-refactor-userlist
2017-08-22 15:39:34 -03:00
Klaus
585a079794
Refactor chat list
2017-08-22 10:32:58 -03:00
Oleksandr Zhurbenko
2686c67ee7
Fixed a bug with pencil data not being added to the collection
2017-08-21 17:32:03 -07:00
JaeeunCho
c51764c7f6
changed name to val
2017-08-21 13:04:38 -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
JaeeunCho
baa5d519f1
added text-ellipsis and max-width
2017-08-21 10:29:01 -07: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
JaeeunCho
73b6054b42
[HTML5] implemented promote/demote user
2017-08-18 11:23:05 -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
Klaus
4fa10ec656
Add proptypes and a few more refactors
2017-08-17 11:18:02 -03: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
Klaus
c87f3054b9
Remove user-actions
2017-08-16 17:25:53 -03: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
Klaus
c32a64c02d
a few refactor made
2017-08-16 11:56:31 -03: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
Klaus
9cd3ac3f87
Merge branch 'bbb-2x-mconf' into fix-presenter-rule
2017-07-25 13:43:26 -03:00
Klaus
22d80b605f
Fix presenter assign
2017-07-25 13:21:07 -03:00
Anton Georgiev
1bdeb248c1
Merge pull request #4117 from Klauswk/html5-2x-fix-audio
...
[HTML5 2.0] Fix join audio on the HTML5 client 2.0
2017-07-25 10:30:43 -04:00
Klaus
51f7161e45
Flat breakouts
2017-07-25 10:51:33 -03:00
Klaus
b1bb4a6866
Flat poll
2017-07-25 09:26:45 -03:00
Oleksandr Zhurbenko
5aed767436
Moved SwitchSlide method to 2.0
2017-07-24 14:04:49 -07:00
Klaus
916713b1df
Add safe true, preventing mess with the arrays, and refactored the shapes
2017-07-24 17:32:35 -03:00
Oleksandr Zhurbenko
a0f9015860
Moved ClearAll and Undo to 2.0
2017-07-24 13:29:02 -07:00
Anton Georgiev
75c39f9340
Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio
2017-07-24 16:06:52 -04:00
Anton Georgiev
350dd16fb7
Merge branch 'html5-2x-fix-audio' of github.com:Klauswk/bigbluebutton into html5-2x-fix-audio
2017-07-24 15:34:18 -04:00
Anton Georgiev
b7d6427e63
rename deskshare to screenshare and adjust condition for viewing
2017-07-24 15:29:34 -04:00
Matthew Marangoni
2f48cca53e
Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x
2017-07-24 12:14:18 -07:00
Klaus
97b38fb0e6
Presentation reflects akkaApps
2017-07-24 15:46:53 -03:00
Matthew Marangoni
8902742573
wrapped BBB instantiation into init function and added to startup
2017-07-24 11:36:56 -07:00
Anton Georgiev
cacac6c9c6
Merge branch 'html5-2x-screenshare' of github.com:Klauswk/bigbluebutton into html5-2x-screenshare
2017-07-24 14:17:04 -04:00
Klaus
78a6fee038
Slides reflecting akkaApps
2017-07-24 14:50:44 -03:00
Klaus
d72df301c6
Move to 2.0
2017-07-24 11:15:46 -03:00
Klaus
5c2369b992
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
2017-07-24 11:00:30 -03:00
Klaus
73068ff8d2
Handling meeting end
2017-07-21 16:34:28 -03:00
Klaus
fade555d55
Add check for user permission
2017-07-21 15:17:25 -03:00
Klaus
39288e6e70
Add clear history, copy and save as chat options
2017-07-21 13:27:28 -03:00
Klaus
a63d8d5cf4
Add function to export public chat to clipboard and file
2017-07-21 11:39:51 -03:00
