Commit Graph

11819 Commits

Author SHA1 Message Date
Chad Pilkey
2f69f04ce0 Fix the Flex 4 client meeting name 2016-04-29 17:24:01 -04:00
Chad Pilkey
2edfdf450c Added chat to the new Flex 4 UI 2016-04-28 19:07:15 -04:00
Chad Pilkey
73ddb24c92 Fixed a race condition with presentation resizing 2016-04-28 16:36:02 -04:00
Chad Pilkey
0d83f28467 Added functionality for participants open/close 2016-04-28 16:35:20 -04:00
Chad Pilkey
60b99a2fb8 Added skins for top toolbar buttons 2016-04-28 15:45:25 -04:00
Chad Pilkey
11aff1a28e Embeded Source Sans Pro font in Flex 4 client 2016-04-28 15:20:04 -04:00
Chad Pilkey
635765bfe1 Added a Flex 4 top toolbar 2016-04-28 15:19:34 -04:00
Chad Pilkey
d803b32400 Apply temporary English labels to menu buttons 2016-04-28 13:26:33 -04:00
Chad Pilkey
163aae54f3 Fix common-library VoiceConnection to use internID 2016-04-28 13:26:06 -04:00
Chad Pilkey
741fc0da19 MenuButtons added to Flex 4 UI 2016-04-28 13:18:19 -04:00
Chad Pilkey
8457799e51 Added a CSS sheet for Flex 4 UI 2016-04-28 13:16:46 -04:00
Chad Pilkey
1c4973f1cc Removed unneeded code from VariableDividedBox 2016-04-27 19:43:28 -04:00
Chad Pilkey
db39b80d16 Basic presentation now shows up in Flex 4 UI 2016-04-27 19:22:04 -04:00
Chad Pilkey
e78e487ae1 Flex 4 shell can connect to a server now 2016-04-27 17:03:08 -04:00
Chad Pilkey
a9847039e5 Created basic shell for Flex 4 UI 2016-04-27 15:34:47 -04:00
Chad Pilkey
47e31cd2e5 Removed some more unused files from Flex 4 2016-04-27 15:33:50 -04:00
Chad Pilkey
bc4802963b Merge pull request #3097 from riadvice/mobile-client
Mobile client pull request cleanup
2016-04-26 09:37:45 -04:00
Ghaz Triki
11d86f6aa8 Merge 'branch air-ui' into 'mobile-client' 2016-04-26 09:19:17 +01:00
Ghaz Triki
01335b6e8a Merge branch 'master' into mobile-client 2016-04-25 19:58:13 +01:00
Anton Georgiev
121889dd96 Merge pull request #3089 from antobinary/html5-server-changes
html5client: rework giant if-else on server side, other server side changes
2016-04-25 08:04:06 -04:00
Anton Georgiev
fe5ff34792 Merge branch 'html5-server-changes' of github.com:antobinary/bigbluebutton into meteor-react-alex
Conflicts:
	bigbluebutton-html5/server/server.js
2016-04-25 11:57:35 +00:00
Anton Georgiev
a5f7307e4f Merge pull request #3092 from OZhurbenko/meteor-react
HTML5-React
2016-04-25 07:46:02 -04:00
Ghaz Triki
18aeb28cd1 Removed global stream feature. 2016-04-24 15:45:54 +01:00
Chad Pilkey
fbd6ca1ddc Merge pull request #3094 from bigbluebutton/v1.0.x-release
Update master with the latest 1.0 commits
2016-04-23 19:11:29 -04:00
Oleksandr Zhurbenko
b52738be8e Ran linter and autofixed most of the warnings in the new React code 2016-04-22 16:19:17 -07:00
Oleksandr Zhurbenko
8a97afb89e Removed code and files which are not used anymore 2016-04-22 15:09:46 -07:00
Oleksandr Zhurbenko
22eb834d95 Returned tooltips 2016-04-22 14:57:06 -07:00
Oleksandr Zhurbenko
046c9d376b Partially adopted Meteor's recommended file structure 2016-04-22 14:19:20 -07:00
Ghaz Triki
771fde809f More code cleanup to remove unused features. 2016-04-22 16:01:59 +01:00
Anton Georgiev
13ac424aa3 fix issue with undefined function return 2016-04-21 22:25:15 +00:00
Anton Georgiev
be0be4f6f0 Merge branch 'html5-server-changes' of github.com:antobinary/bigbluebutton into html5-server-changes 2016-04-21 22:23:24 +00:00
Anton Georgiev
361402eafd make start.sh executable 2016-04-21 21:54:30 +00:00
Oleksandr Zhurbenko
5b5f06d714 Upgraded Meteor to 1.3.2.4 2016-04-21 14:30:54 -07:00
Oleksandr Zhurbenko
6cd0de19f9 Added necessary imports and temporary styling to make it all work after the merge 2016-04-21 12:21:01 -07:00
Oleksandr Zhurbenko
92d262a104 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react
Conflicts:
	bigbluebutton-html5/.meteor/packages
	bigbluebutton-html5/app/.meteor/versions
	bigbluebutton-html5/app/client/main.js
	bigbluebutton-html5/app/client/main.jsx
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/client/main.jsx
	bigbluebutton-html5/client/views/chat/chat_bar.html
	bigbluebutton-html5/client/views/chat/chat_bar.js
	bigbluebutton-html5/client/views/whiteboard/slide.js
	bigbluebutton-html5/client/views/whiteboard/whiteboard.js
	bigbluebutton-html5/server/collection_methods/shapes.js
	bigbluebutton-html5/server/redispubsub.js
	bigbluebutton-html5/server/server.js
2016-04-20 16:09:47 -07:00
Oleksandr Zhurbenko
c796180e24 Commented out unused whiteboard code(temporarily before removing completely) 2016-04-20 10:52:47 -07:00
Oleksandr Zhurbenko
b3512d0a42 Wrapped header, whiteboard and chat into the MainContainer and injected in into the 'main' 2016-04-20 10:43:02 -07:00
Oleksandr Zhurbenko
ecf92afeb4 Commented out annecessary helpers (temporarily before removing) and changed scaleWhiteboard func so that is could work with Whiteboard.jsx 2016-04-20 10:33:36 -07:00
Oleksandr Zhurbenko
34d1a02484 Added a classnames package 2016-04-20 10:32:02 -07:00
Oleksandr Zhurbenko
29a4b8db20 Added an additional check for Polling 2016-04-20 09:08:23 -07:00
Oleksandr Zhurbenko
af09761048 Fixed return statement, added scaling, added dynamic class change for the polling and presenter controls 2016-04-19 16:49:24 -07:00
Oleksandr Zhurbenko
90680f31ef class -> className 2016-04-19 16:44:01 -07:00
Anton Georgiev
d258620068 reuse header creation 2016-04-19 21:16:32 +00:00
Richard Alam
4c437aebb7 Merge pull request #3087 from capilkey/1.0-access-bugfix3
Third round of 1.0 accessibility bug fixes
2016-04-19 15:38:56 -04:00
Anton Georgiev
6436d4396d extract out meteor methods 2016-04-19 17:43:31 +00:00
Chad Pilkey
fe53999164 Third round of 1.0 accessibility bug fixes 2016-04-19 09:17:14 -07:00
Oleksandr Zhurbenko
9305da4a26 Fixed Raise Hand Button's view 2016-04-19 08:44:32 -07:00
Anton Georgiev
cc28e5d377 switch to smarter logging 2016-04-19 15:07:57 +00:00
Ghaz Triki
44edda1e70 Move the responsability to set the page title TopBarViewMediator. 2016-04-19 08:45:41 +01:00
Ghaz Triki
c6a2dc7903 Extract services from mediators and use signal and command class instead. 2016-04-19 07:25:50 +01:00