Richard Alam
4dda35a3e3
Merge pull request #3961 from riadvice/2x-ui-improve
...
Fix checking branding options
2017-05-23 13:56:11 -04:00
Richard Alam
afa320dcbc
Merge pull request #3959 from riadvice/merge-master-into-2x
...
Merge master into 2x branch
2017-05-23 13:54:46 -04:00
JaeeunCho
de89b9760a
Merge remote-tracking branch 'upstream/master' into disappear_dialog
2017-05-23 09:28:36 -07:00
Fred Dixon
3749e513ce
Merge pull request #3963 from ffdixon/fix-ip-detection
...
Improved the detection if IP addresses in bbb-conf
2017-05-23 11:29:37 -04:00
Fred Dixon
66aa72e1e7
Improved the detection if IP addresses in bbb-conf
2017-05-23 10:29:16 -05:00
Ghazi Triki
93a21b88b7
Fix checking branding options.
2017-05-23 15:27:32 +01:00
KDSBrowne
eabf5cb4e1
use += and -= operator
2017-05-23 06:45:28 -07:00
KDSBrowne
f4dd6628ee
remove switch statment
2017-05-23 06:35:55 -07:00
KDSBrowne
477ca85615
fix hoisting issue and switch to keydown event
2017-05-23 06:23:26 -07:00
Oleksandr Zhurbenko
c4250c3fa9
Removing event listeners in handleHide
2017-05-22 16:50:32 -07:00
Oleksandr Zhurbenko
98ab79507b
Fixed click listeners' initialization
2017-05-22 16:39:08 -07:00
Ghazi Triki
7d283cd154
Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x
...
# Conflicts:
# bigbluebutton-client/resources/config.xml.template
# bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
# bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
# record-and-playback/core/scripts/rap-process-worker.rb
2017-05-22 17:35:24 +01:00
Fred Dixon
8096c2e5a2
Merge pull request #3958 from ffdixon/1.1-0-release
...
Bump version number to 1.1.0
2017-05-22 11:25:06 -04:00
Fred Dixon
eabfd7e862
Bump version number to 1.1.0
2017-05-22 10:23:55 -05:00
Maxim Khlobystov
220fa275b4
Add two test cases to verify that user can't enter the client without a username
...
This commit does the following:
- Adds two specs to test the landing page behaviour with no username entered (clicking the Join button or pressing Enter key)
- Fixes the test case that checks the landing page title (it previously didn't really do the job)
2017-05-22 02:38:42 +00:00
Maxim Khlobystov
d69fc3bfaa
Test both ways of joining HTML5 client from the landing page: clicking the Join button and pressing Enter
...
This commit improves the landing page test spec by introducing the way to enter the client by pressing Enter. We also temporarily switch to Chrome in the main config file due to the bug in Geckodriver that doesn't allow us to use keyboard keys.
2017-05-22 01:56:02 +00:00
Maxim Khlobystov
e6cce3d0e6
Set the Selenium test runner to log everything.
2017-05-22 01:24:41 +00:00
Chad Pilkey
206822f141
fix race conditions in the presentation and whiteboard startup
2017-05-20 16:06:23 -04:00
Fred Dixon
237c6f8fbc
Update BigBlueButton.html
2017-05-20 12:33:42 -04:00
Richard Alam
d30b5c4aac
- start up the client
2017-05-19 20:00:20 -07:00
Richard Alam
82371a41de
- try to start system
2017-05-19 19:27:09 -07:00
Richard Alam
6b14d31853
- wire up bbb-web
2017-05-19 19:13:25 -07:00
Ghazi Triki
a9de960d47
Make the use of non module options in config.xml transparent for the developers. There is no more need to add properties to Config class.
2017-05-19 23:24:52 +01:00
Chad Pilkey
381b8dae29
refactor of WhiteboardCanvas to be more isolated and easier to duplicate
2017-05-19 17:30:00 -04:00
Richard Alam
8e3efa5df3
- handle meetign created event
2017-05-19 13:38:00 -07:00
Richard Alam
d305b02a42
- rename messages
2017-05-19 12:52:52 -07:00
Richard Alam
330faf317d
- rename core message
2017-05-19 11:37:13 -07:00
KDSBrowne
ff1a152f0b
remove new lines being rendered in log/development.log
2017-05-19 09:05:09 -07:00
Richard Alam
d9647b8292
- start handling create meeting
2017-05-19 08:50:13 -07:00
Jesus Federico
4c2df2e529
Merge pull request #3955 from jfederico/bbb-web
...
bbb-web: Fixed issue in getRecordings not responding the meetingID co…
2017-05-19 11:21:34 -04:00
jfederico
a4b0cb7436
bbb-web: Fixed issue in getRecordings not responding the meetingID correctly
2017-05-19 15:11:08 +00:00
KDSBrowne
beddf61532
remove new operator
2017-05-19 07:25:24 -07:00
Anton Georgiev
bb75ca73e1
Merge pull request #3953 from antobinary/adjust-3934
...
Revisit pull request #3934
2017-05-19 10:22:55 -04:00
Ghazi Triki
b59e64b21f
Additional improvements to the configuration parsing.
2017-05-19 10:39:12 +01:00
Richard Alam
63f26e901b
- add voice user
2017-05-18 19:07:34 -07:00
Ghazi Triki
a8102d1936
Config class cleanup and move classes to the right packages.
2017-05-19 00:32:32 +01:00
Ghazi Triki
96835619ab
Remove obsolete configuration options.
2017-05-19 00:20:25 +01:00
KDSBrowne
159a47694e
add suggested changes
2017-05-18 16:16:17 -07:00
Ghazi Triki
97a9335921
Refactor the way options are read to make sure the XML data are read only once and a single instance is being used of each across all the application.
2017-05-18 22:54:14 +01:00
Richard Alam
1266579ee0
- user custom data
2017-05-18 13:59:49 -07:00
JaeeunCho
607a3f4e5d
HTML5 - put the order at media class
2017-05-18 13:03:35 -07:00
JaeeunCho
050994fc06
HTML5 - removed unused media query
2017-05-18 12:58:21 -07:00
Richard Alam
0c827a7d49
- start refactoring meetings in bbb-web
2017-05-18 12:43:29 -07:00
JaeeunCho
bba5170f43
Merge remote-tracking branch 'upstream/master' into hidden_closedCaption
2017-05-18 12:42:45 -07:00
KDSBrowne
de6e7093f3
remove custom aria prop name
2017-05-18 11:38:07 -07:00
KDSBrowne
f6a701b103
remove PascalCase notation
2017-05-18 10:29:25 -07:00
KDSBrowne
225f8aef68
switch to arrow functions
2017-05-18 10:23:23 -07:00
Chad Pilkey
7a46382e86
Merge pull request #3946 from riadvice/fix-presenter-share-only
...
Delete the option "presenterShareOnly" in favor of lock settings
2017-05-18 12:29:21 -04:00
Anton Georgiev
409a471ab5
bring catch clause on the same line as closing curly brace
2017-05-18 10:52:59 -04:00
Richard Alam
d1779d9948
- refactor bbb-web
2017-05-17 19:43:08 -07:00
