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

11858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perroned
4a7938e1c0 Adds settings and styling 2016-05-06 12:46:14 -05:00
perroned
1f3fcf611f Fixes button import path 2016-05-05 16:15:32 -05:00
perroned
3769c67534 Adds font control for settings 2016-05-05 16:15:15 -05:00
perroned
d602a66d7f Begins adding modals 2016-05-05 16:14:39 -05:00
perroned
f8893d61da Cleans polling 2016-05-05 14:50:11 -05:00
perroned
e9b5e11ac2 Begins adding polling component 2016-05-05 13:50:18 -05:00
Anton Georgiev
5200641ca0 Merge pull request #3117 from antobinary/router-merging 
html5client: server side restructuring adapting to Meteor 1.3 and ECMA6 modules
 2016-05-05 10:22:04 -04:00
Anton Georgiev
863c64dd86 Merge pull request #3114 from oswaldoacauan/new-router 
Barebone for the new design and patterns
 2016-05-04 18:20:55 -04:00
Anton Georgiev
eddef1e1b6 incorrectly merged these 2016-05-04 22:19:41 +00:00
Anton Georgiev
0deaadfd87 Merge branch 'new-router' of github.com:oswaldoacauan/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/client/MainContainer.jsx
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/client/lib/bbb_api_bridge.js
	bigbluebutton-html5/client/whiteboard_models/whiteboard_paper.js
	bigbluebutton-html5/imports/ui/chat/Chat.jsx
	bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
	bigbluebutton-html5/imports/ui/userlist/UserListService.js
	bigbluebutton-html5/imports/ui/whiteboard/EmojiContainer.jsx
	bigbluebutton-html5/imports/ui/whiteboard/Slide.jsx
	bigbluebutton-html5/imports/ui/whiteboard/UploaderControls.jsx
	bigbluebutton-html5/imports/ui/whiteboard/WhiteboardControls.jsx
 2016-05-04 22:04:08 +00:00
Anton Georgiev
fcadb61545 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/Gruntfile.js
	bigbluebutton-html5/imports/ui/chat/Chat.jsx
	bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
 2016-05-04 21:58:35 +00:00
Anton Georgiev
fe8f73d592 linting 2016-05-04 21:49:01 +00:00
Anton Georgiev
0c6c73f891 extract event handlers from redispubsub. rename to camelCase 2016-05-04 20:25:34 +00:00
Anton Georgiev
7b0b3eb177 move files to imports 2016-05-04 18:29:43 +00:00
Anton Georgiev
863fcef7f6 extract logger, redispubsub; export all 2016-05-04 17:00:57 +00:00
Oswaldo Acauan
2d57d7cbed Rename Actionsbar and Navbar to ActionsBar and NavBar 2016-05-04 11:48:53 -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
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
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
Oswaldo Acauan
ddd38c57ac Add i18n, modular layouts and basic styles 2016-05-03 17:40:46 -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
Anton Georgiev
573c1772b3 server side rearrangements 2016-05-02 14:48:20 +00: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
Anton Georgiev
1c8436170e move the redis configs outside the Meteor obj 2016-04-28 22:01:43 +00:00
Maxim Khlobystov
886928ca4d Got rid of the Karma error in the console (removed Velocity). 2016-04-28 17:44:09 -04:00
Anton Georgiev
0b10a861bb move log out of Meteor 2016-04-28 21:37:15 +00:00
Anton Georgiev
e299281a0a move collections out of Meteor 2016-04-28 21:10:43 +00:00
Oswaldo Acauan
7d31eb43f9 Switch from ion-router to react-router 2016-04-28 15:57:14 -04:00
Anton Georgiev
fc52155db0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router 
Conflicts:
	bigbluebutton-html5/server/redispubsub.js
 2016-04-28 18:49:41 +00: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
Anton Georgiev
892083aa00 working on modules/removing global vars part2 2016-04-27 21:36:22 +00:00
Anton Georgiev
796b5a2d18 working on modules/removing global vars 2016-04-27 21:04:15 +00: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