BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,356 Commits 13 Branches 260 Tags 1.1 GiB
7db33c594b
Commit Graph

16356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ghazi Triki
93a21b88b7 Fix checking branding options. 2017-05-23 15:27:32 +01: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
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
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
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
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
Richard Alam
0c827a7d49 - start refactoring meetings in bbb-web 2017-05-18 12:43:29 -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
Richard Alam
f993593b1c - setup meeting properties 2017-05-17 14:57:12 -07:00
Richard Alam
2f9a94608a - refactor bbb-web 2017-05-17 14:39:50 -07:00
Anton Georgiev
71d4e8b0e0 catch Meteor error on userLeaving 2017-05-17 15:17:27 -04:00
Richard Alam
9bb77173e8 - start refactoring bbb-web 2017-05-17 10:50:58 -07:00
Anton Georgiev
746ef9478c Merge pull request #3939 from KDSBrowne/userlist-accessibility 
[HTML5] - Userlist accessibility improvement
 2017-05-17 11:52:52 -04:00
Anton Georgiev
e9eef8119b recover meeting propery needed for lock settings 2017-05-17 11:51:25 -04:00
Anton Georgiev
b4f3c41993 Merge pull request #3951 from KDSBrowne/x0-change-locale-string-format 
[HTML5] - Change the format of locale strings
 2017-05-17 11:42:39 -04:00
KDSBrowne
a2520dbbbc change format for other locales 2017-05-17 08:35:24 -07:00
Anton Georgiev
a89c70a04c Merge branch 'userlist-accessibility' of github.com:KDSBrowne/bigbluebutton into userlist-accessibility 2017-05-17 11:27:17 -04:00
Anton Georgiev
fc831440c3 Merge pull request #3932 from antobinary/address-error-500-and-stuck-users 
HTML5: Auto allow benign actions (logoutSelf); Disallow meteor calls if credentials are null
 2017-05-17 11:25:16 -04:00
Anton Georgiev
49a1f09536 minor improve syntax based on review comment 2017-05-17 11:24:12 -04:00
Richard Alam
aeb4445453 - finish wiring up actor system for bbb-apps 2017-05-17 08:20:01 -07:00
Anton Georgiev
0579506e2e Merge pull request #3944 from Klauswk/FixUnselectableOption 
Fix unselectable 'Choose Language' and fallback lang error.
 2017-05-17 11:17:38 -04:00
KDSBrowne
985cf43a93 change message descriptions 2017-05-17 07:32:35 -07:00
Ghazi Triki
43d05ffa0b Remove presenterShareOnly option and all its implementation. 2017-05-17 14:30:54 +01:00
Ghazi Triki
f0d2a5dec2 Map presenterShareOnly options to lock settings. (reverted from commit 450c5d28f3) 2017-05-17 10:16:44 +01:00
Richard Alam
c4c629f699 - continue wiring bbb-apps actor system 2017-05-16 19:13:06 -07:00
KDSBrowne
97514dc5c5 remove default messages 2017-05-16 17:30:42 -07:00
KDSBrowne
2f79f3ff20 change locale stringformat 2017-05-16 17:02:27 -07:00
Richard Alam
414a4e0fd9 - start wiring bbb-apps actor system 2017-05-16 14:58:49 -07:00