BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,030 Commits 13 Branches 260 Tags 1.1 GiB
a19b6241d4
Commit Graph

12030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
a19b6241d4 Merge branch 'bbb-1.1-dev-java8' of github.com:ritzalam/bigbluebutton into bbb-1.1-dev-java8 2016-04-26 20:57:47 -04:00
Richard Alam
92b05d0151 Merge pull request #6 from maxdoumit/bbb-1.1-dev-java8 
Add extra documentation
 2016-04-28 11:58:31 -04:00
maxdoumit
181d29c77c Add extra documentation 
Added extra documentation for installing the dev tools, including download locations
 2016-04-28 11:55:38 -04:00
Richard Alam
5e45bcf2d7 Merge fix to missing images for brnading. 2016-04-26 20:16:31 -04:00
Richard Alam
36c1b0028e Merge pull request #3100 from capilkey/fix-missing-assets 
Add two branding images back to the client
 2016-04-28 11:18:26 -04:00
Chad Pilkey
bf7d3332b9 add two branding images back to the client 2016-04-27 11:26:12 -07:00
Richard Alam
b86f32b8c1 Sync with upstream repository 
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 2016-04-26 20:01:20 -04:00
Richard Alam
0323b7203a Add logging on why cannot find user session 
We need to know which part of the code failed to get the user's session.
 2016-04-26 14:41:22 -04:00
Richard Alam
e5579c876e Update DEVELOPMENT.md 2016-04-27 17:34:35 -04:00
Richard Alam
b6fdb27bf7 Build cllient locale 
Change command how to build specific locale. To build a locale
   ant locale  (builds en_US by default)

   ant locale -DLOCALE=en_US  (builds the passed locale)
 2016-04-26 14:38:01 -04:00
Richard Alam
62c9aee040 Update DEVELOPMENT.md 2016-04-27 17:29:11 -04:00
Richard Alam
76f0c18d5a Update DEVELOPMENT.md 
Add more instructions.
 2016-04-27 17:05:07 -04:00
Richard Alam
d50bd9f306 Start development instruction document 
Instructions on how to setup development environment for BBB 1.1.
 2016-04-27 16:48:59 -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
Oleksandr Zhurbenko
7c698eab3f Fixed a reactive chat update when a chat opponent disappears 2016-04-18 15:59:22 -07:00
Anton Georgiev
41e014e083 use default EventEmitter instead of new pckg 2016-04-18 22:53:05 +00:00
Anton Georgiev
02ebc17100 cleanup 2016-04-18 22:47:11 +00:00