BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,833 Commits 13 Branches 260 Tags 1.1 GiB
82742311b5
Commit Graph

11833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oswaldo Acauan
82742311b5 Merge upstream/master 2016-05-03 02:35:15 -03:00
Oswaldo Acauan
31d5b3f4f1 Merge with upstream/master 2016-05-03 17:49:11 -03:00
Anton Georgiev
da137fee86 Merge pull request #3113 from perroned/button-whitespace-fix 
Fixes whitespace issue
 2016-05-03 16:46:01 -04:00
Oswaldo Acauan
ddd38c57ac Add i18n, modular layouts and basic styles 2016-05-03 17:40:46 -03:00
perroned
0abc1fde91 Fixes whitespace issue 2016-05-03 15:02:59 -05:00
Anton Georgiev
5617af9d06 Merge pull request #3112 from iMDT/master 
Fixes infinited tabbed line in html5 chat input controls
 2016-05-03 15:20:04 -04:00
gcampes
86d97b59da Fixes infinited tabbed line in html5 chat input controls 2016-05-03 16:06:59 -03:00
Oswaldo Acauan
a22c759fcc Merge with upstream/master 2016-05-02 19:52:32 -03:00
Oswaldo Acauan
01860a8804 Add basic styles for new design 2016-05-02 19:42:54 -03:00
Richard Alam
7a6c00293f Merge pull request #3109 from capilkey/file-cleanup 
Removing files that should not have been committed
 2016-05-02 15:54:27 -04:00
Chad Pilkey
24c6d48dc2 removing files that should not have been committed 2016-05-02 12:45:25 -07:00
Fred Dixon
d85c94366f Deleting Incorrect file. 
Cleaning up the root directory.
 2016-05-02 07:48:32 -04:00
Fred Dixon
6073632c45 Deleting incorrect file. 
Looks like this file was mistakenly added during a commit.
 2016-05-02 07:47:55 -04:00
Anton Georgiev
22c088795d Merge pull request #3103 from gthacoder/react-client 
HTML5 client: putting some Grunt configs into Meteor settings file + removing Velocity.
 2016-04-29 10:31:38 -04:00
Maxim Khlobystov
88542275d8 Cleanup. 2016-04-28 18:42:04 -04:00
Maxim Khlobystov
1695f58fe6 Split the Meteor command into options stored as Meteor settings. 2016-04-28 18:27:43 -04:00
Maxim Khlobystov
886928ca4d Got rid of the Karma error in the console (removed Velocity). 2016-04-28 17:44:09 -04:00
Oswaldo Acauan
7d31eb43f9 Switch from ion-router to react-router 2016-04-28 15:57:14 -04:00
Anton Georgiev
a5c4d34eda Merge pull request #3101 from gthacoder/react-client 
HTML5 client: modified Grunt setup and switch to CSS Modules + Sass (userlist-only).
 2016-04-28 14:27:33 -04:00
Maxim Khlobystov
7504f51543 Cleaning up. 2016-04-28 14:03:18 -04:00
Maxim Khlobystov
4efdc5d361 Fixed the userlist styling. 2016-04-28 13:58:54 -04:00
Maxim Khlobystov
fad6330d39 Fixed the global Sass file and got back some of the missing userlist styles. 2016-04-28 11:44:24 -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
Maxim Khlobystov
ae26f850bc Translated the main stylesheet to Sass. 2016-04-27 16:33:34 -04:00
Maxim Khlobystov
4cd81f93dc Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into react-client 2016-04-27 16:31:00 -04:00
Maxim Khlobystov
2831e3d414 Added CSS modules support and adjusted the userlist to work with encapsulated Sass. 2016-04-27 14:30:45 -04:00
Chad Pilkey
bf7d3332b9 add two branding images back to the client 2016-04-27 11:26:12 -07:00
Maxim Khlobystov
ee1ea22cd7 Added the ability to dynamically enable/disable the log statements that slow down the whiteboard based on the mode (development/production). 2016-04-26 11:03:09 -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
Maxim Khlobystov
4d94efa89c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into react-client 
Conflicts:
	bigbluebutton-html5/Gruntfile.js
 2016-04-25 09:40:37 -04:00
Maxim Khlobystov
f36b0512ad Added options of running HTML5 client in development/production modes. 2016-04-25 08:56:49 -04: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