6295 Commits

Author	SHA1	Message	Date
Chad Pilkey	c90c6491d9	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into improve-client-annotation-edit	2017-08-22 19:11:16 -04:00
Chad Pilkey	472230299b	initialize whiteboard thickness correctly	2017-08-22 18:51:23 -04:00
Fred Dixon	ecde0a5351	Update bbbResources.properties ... Modified wording of enabling download of presentation	2017-08-22 18:32:22 -04:00
Richard Alam	dc51f97a2f	Merge pull request #4298 from ritzalam/move-record-alert-windows ... - reposition record alert windows	2017-08-22 18:01:15 -04:00
Richard Alam	f7a0a4a20c	- reposition record alert windows	2017-08-22 15:00:09 -07:00
Richard Alam	07f9bcd25e	Merge pull request #4296 from ritzalam/minor-ui-tweaks ... Minor ui tweaks	2017-08-22 16:59:57 -04:00
Richard Alam	17632bb9f7	- change slider background	2017-08-22 13:58:57 -07:00
Richard Alam	2d9badb058	- move upload presentation button	2017-08-22 13:58:42 -07:00
Richard Alam	478caab88f	- change copyright text	2017-08-22 13:58:22 -07:00
Richard Alam	349500b4ef	- randomly change position of new shared notes popup	2017-08-22 13:57:41 -07:00
Fred Dixon	d825aa44d5	Merge pull request #4295 from pedrobmarin/fullscreen-fix ... Flash client's chrome fullscreen fix	2017-08-22 16:20:25 -04:00
Pedro Beschorner Marin	5a388961d7	Included allowfullscreeninteractive param when loading the swf file in chrome	2017-08-22 19:36:02 +00:00
Richard Alam	5f3672d62a	- pahabol: change public chat options font size	2017-08-22 11:42:19 -07:00
Richard Alam	61326d82c4	- set default window name for new shared notes	2017-08-22 11:11:57 -07:00
Richard Alam	8f3f549ed8	Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf	2017-08-22 07:53:32 -07:00
Richard Alam	0d25282d4f	- reposition screenshare publish window	2017-08-22 07:21:19 -07:00
Ghazi Triki	c38b19f2bf	Remove presentation zoom labels and show percentage in zoom slider data tip.	2017-08-22 14:44:11 +01:00
Ghazi Triki	83f60e4d64	Larger ShortcutHelpWindow size.	2017-08-22 12:14:42 +01:00
Ghazi Triki	d24dca219c	Smaller whiteboard toolbar buttons.	2017-08-22 12:14:16 +01:00
Ghazi Triki	1fd76bd616	Remove tooltip from meeting name in the title bar.	2017-08-22 12:13:42 +01:00
Ghazi Triki	571899bbc8	Updated layout.xml with larger central area.	2017-08-22 11:54:09 +01:00
Ghazi Triki	1573e6a716	Typo and default values fixes to configuration options.	2017-08-22 11:39:03 +01:00
Richard Alam	22ac6e8fc1	- increase default font for shared notes	2017-08-21 13:30:43 -07:00
Richard Alam	557a9ea1ca	Merge branch '2.0-shared-notes-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-shared-notes-fixes	2017-08-21 13:09:43 -07:00
Richard Alam	f6da20c174	Merge pull request #4284 from ritzalam/hide-rtt ... - hide rtt for now in client as we keep tract of this on the server …	2017-08-21 16:04:26 -04:00
Richard Alam	5e1283bb22	- hide rtt for now in client as we keep tract of this on the server side	2017-08-21 13:01:52 -07:00
Pedro Beschorner Marin	2cc03d5d54	Avoiding bad resync in shared notes	2017-08-21 19:50:32 +00:00
Richard Alam	a339e5f534	Merge pull request #4283 from ritzalam/shared-notes-window ... - prevent shared notes window from closing as we don't have a way to…	2017-08-21 15:39:08 -04:00
Richard Alam	b74ba45cfd	- prevent shared notes window from closing as we don't have a way to re-open them.	2017-08-21 12:38:03 -07:00
Richard Alam	3219e978e0	Merge pull request #4282 from ritzalam/change-log-target ... - change target name in log element of config.xml so as not to confl…	2017-08-21 15:10:55 -04:00
Richard Alam	c7a9fa6947	- change target name in log element of config.xml so as not to conflict with "target" on branding during ... post install	2017-08-21 12:08:49 -07:00
Richard Alam	0dc6fd4af4	Merge pull request #4281 from ritzalam/public-chat-options ... - move public chat save, copy, and clean into chat options box for accessibility	2017-08-21 14:47:53 -04:00
Richard Alam	f32ede3a5b	- move public chat save, copy, and clean into chat options box for accessibility	2017-08-21 11:42:57 -07:00
Pedro Beschorner Marin	06d937958f	Setting maximum size to shared notes and pastes	2017-08-21 18:23:33 +00:00
Fred Dixon	97148ac99b	Added home.html to redirect to bigbluebutton.org when user clicks lower left text	2017-08-21 12:58:58 -05:00
Richard Alam	1a90735675	Merge pull request #4279 from ritzalam/multi-user-cursor ... - show name beside cursor only when multi-user wb is on	2017-08-21 13:37:08 -04:00
Richard Alam	d6b4c7ac21	- show name beside cursor only when multi-user wb is on	2017-08-21 10:35:53 -07:00
Richard Alam	043d8f2867	Merge pull request #4278 from ritzalam/minor-ui-adjustments ... - reposition screen share publish window	2017-08-21 12:29:19 -04:00
Richard Alam	aa35dcddf0	- reposition screen share publish window ... - resize shortcut help window	2017-08-21 09:27:35 -07:00
Richard Alam	3aec506154	- add build version placeholder	2017-08-21 07:24:40 -07:00
Richard Alam	dbc95de135	- add back way to put build version in client	2017-08-18 14:54:47 -07:00
Richard Alam	5f16b22ae1	Merge pull request #4271 from capilkey/minor-client-fixes-2.0 ... Increase chat size and set presentation download to false	2017-08-18 16:56:51 -04:00
Chad Pilkey	c7f3c0173d	set presentation download checkbox default to false	2017-08-18 16:03:00 -04:00
Chad Pilkey	d3f09252f8	bump chat default size from 12 to 14	2017-08-18 16:01:25 -04:00
Pedro Beschorner Marin	da32a11771	Moving the close button event listener instantiation to the end of the additional shared note window creation	2017-08-18 19:43:35 +00:00
Pedro Beschorner Marin	3f383a8b40	Making role bindable so binding utils will be triggered when it changes	2017-08-18 16:06:02 +00:00
Richard Alam	b9adb75a0d	- show join url button	2017-08-17 14:48:08 -07:00
Richard Alam	c3f159f51d	- use breakoutId in message to request for join url	2017-08-17 14:37:42 -07:00
Richard Alam	5ee470a34a	- fix bind warning	2017-08-17 14:25:02 -07:00
Richard Alam	a62742e1e7	Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme	2017-08-17 12:41:58 -07:00