BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,069 Commits 13 Branches 260 Tags 1.1 GiB
221327e4c5
Commit Graph

12156 Commits

Author SHA1 Message Date
Jaeeun Cho
9eacf32497 fixes html5 clinet logout and nav-bar 2016-06-28 15:30:43 -04:00
Jaeeun Cho
eded89d5f0 fixes html5 clinet logout and nav-bar 2016-06-28 14:50:44 -04:00
Oswaldo Acauan
a70ec42c6e Fix styles for big messages 2016-06-28 16:18:37 +00:00
Gabriel Carvalho de Campes
6e88731ebc Updates the userlist 2016-06-28 13:10:20 +00:00
Oleksandr Zhurbenko
390935e304 Changed 'let' to 'const' where it was possible and adjusted imports 2016-06-27 14:48:46 -07:00
Oswaldo Acauan
d2e8d3d954 Improve auto-scroll behaviour 2016-06-27 19:00:10 +00:00
Oleksandr Zhurbenko
3d0132685f Fixed a bug with Polls deletion from all meetings 
Which happened when we published a poll, cleared a collection, and then received a poll_stopped_message
 2016-06-27 11:30:37 -07:00
Oleksandr Zhurbenko
8b4747a89d Fixed all the 120+ linter warnings 2016-06-27 11:24:37 -07:00
Oleksandr Zhurbenko
40cedc28bc Fixed a bug with the deletion of the Poll 
It was always undefined here
 2016-06-27 09:31:15 -07:00
Oleksandr Zhurbenko
2b4aced77d Fixed naming according to the BBB's style guide 2016-06-27 07:48:17 -07:00
Jaeeun Cho
3d36d3fed2 fixes html5 clinet logout and nav-bar 2016-06-24 19:09:32 -04:00
Oleksandr Zhurbenko
29e8524de0 Polishing 2016-06-24 14:30:37 -07:00
Jaeeun Cho
991034b5bf Merge remote-tracking branch 'upstream/master' into logOut 2016-06-24 10:48:52 -04:00
Jaeeun Cho
3325ac4974 fixes html5 clinet logout and nav-bar 2016-06-24 10:48:09 -04:00
Oleksandr Zhurbenko
1e694b2a01 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 2016-06-23 13:55:40 -07:00
Oleksandr Zhurbenko
6920d8b2a6 Added a check for unknown shape types 2016-06-22 15:58:28 -07:00
Oleksandr Zhurbenko
22ab079f5c Optimized polling strings and centered the strings 2016-06-22 15:20:08 -07:00
Oleksandr Zhurbenko
04e2e940c0 Fixed a but with inherited margin in Firefox 2016-06-22 15:17:31 -07:00
Oleksandr Zhurbenko
bca7b8c005 Added Polling shape functionality 2016-06-21 16:19:39 -07:00
perroned
c1e0605852 Simplfy watch video initiation 2016-06-21 17:38:28 +00:00
Anton Georgiev
4195905c2b change audio to default to SIP 2016-06-21 15:34:10 +00:00
Jaeeun Cho
73c9898698 fixes html5 clinet logout and nav-bar 2016-06-17 18:15:11 -04:00
perroned
86035fce39 Adds verto manager window functions 2016-06-17 17:47:24 +00:00
Oswaldo Acauan
406c55f1c2 Fix renderCircle and add hideLabel prop 2016-06-17 16:42:17 +00:00
Oleksandr Zhurbenko
0d1ad108f0 Fixed polling for the HTML5 viewers 2016-06-15 14:04:25 -07:00
perroned
a95ed82293 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
 2016-06-15 20:07:42 +00:00
Oleksandr Zhurbenko
9bd1d6f15a Moved check for polling to AddShapeToCollection 
So that it worked for both get_whiteboard_shapes_reply and send_whiteboard_shape_message
 2016-06-15 11:09:05 -07:00
Oleksandr Zhurbenko
0ad772345a Removed unused properties 2016-06-14 13:02:37 -07:00
Oleksandr Zhurbenko
a0bfbe8433 Added Text shape functionality 2016-06-14 13:01:11 -07:00
Anton Georgiev
dddcc064cb Merge pull request #3171 from oswaldoacauan/feature-chat-2 
User List Sorting & Chat Lock
 2016-06-14 12:50:20 -04:00
perroned
e9fd499851 Readding verto sharing 2016-06-14 16:11:04 +00:00
Richard Alam
59fca31316 Merge pull request #3175 from antobinary/fix-meetings-querry 
Fix querrying for existing meetings for html5 client
 2016-06-14 10:13:39 -04:00
Anton Georgiev
7fb2184c02 fix querry for existing meetings 2016-06-13 21:39:31 +00:00
Oswaldo Acauan
62e2005eef Add /check endpoint for HTML5 client 2016-06-13 14:56:41 -03:00
Oswaldo Acauan
6414d6358a Remove debug messages 2016-06-13 14:15:15 -03:00
Oswaldo Acauan
6b8da33c29 Merge branch 'master' into feature-chat-2 
* master:
  - improve webstart searching time for native libraries
  Fix button className inheritance
 2016-06-13 14:05:05 -03:00
Oswaldo Acauan
5474591552 Change localStorage to sessionStorage 2016-06-13 14:00:57 -03:00
Oswaldo Acauan
76b8aca4bb Add lock behavior to HTML5 chat 2016-06-13 14:00:38 -03:00
Oleksandr Zhurbenko
2ff5afd056 Fixed issues with adding and updating Text shape objects to the db 2016-06-10 10:39:47 -07:00
Oleksandr Zhurbenko
7f845ed8d9 Added clippath, so that users can't see anything outside of the viewBox 2016-06-09 12:00:44 -07:00
Oleksandr Zhurbenko
12eff5d568 Added Rectangle shape functionality 2016-06-09 11:58:41 -07:00
perroned
c2702522ca Upgrades html5 client for new verto code 2016-06-08 20:09:43 +00:00
Oleksandr Zhurbenko
2a46f618f5 Added Triangle shape functionality 2016-06-08 10:13:25 -07:00
Oleksandr Zhurbenko
17dcbd7bfe Added Pencil shape functionality 2016-06-08 10:12:24 -07:00
Oleksandr Zhurbenko
2f359d80ae Rounded the Line shape endings 2016-06-07 11:33:31 -07:00
Oleksandr Zhurbenko
cdf00b6faf Fixed linter warnings and a bug with the thickness while zooming in 2016-06-07 11:30:44 -07:00
Oleksandr Zhurbenko
fbe6a4ca36 Added zoom and pan 2016-06-07 11:08:25 -07:00
Oswaldo Acauan
9803f55fda Fix user-list sorting on phone users case 2016-06-07 13:46:24 -03:00
Oswaldo Acauan
c11447cc62 Fix button className inheritance 2016-06-07 11:33:22 -03:00
Oswaldo Acauan
23a5045cec Add disable property for chat form 2016-06-07 11:19:19 -03:00
Oswaldo Acauan
cdb137091d Improve user-list sorting 2016-06-07 10:58:51 -03:00
Matthew Marangoni
6b18f8192b Added styles file 2016-06-06 14:18:00 -07:00
Matthew Marangoni
c19d130693 Merge remote-tracking branch 'upstream/master' into html5test 
Conflicts:
	bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
 2016-06-06 14:15:08 -07:00
Matthew Marangoni
67a7227c26 Change settings UI components and content structure 
Added proper settings buttons and icons, created containers to align content
with style guide, populated submenu's with content to match style guide,
numerous CSS changes for each submenu and its contents.
 2016-06-06 12:52:03 -07:00
Oleksandr Zhurbenko
23b00440bc Line shape functionality 2016-06-06 10:12:14 -07:00
Oswaldo Acauan
6318235f8f Add sorting to the user-list 2016-06-06 13:45:30 -03:00
Oleksandr Zhurbenko
cd500ea654 Added functionality for the Circle shape 2016-06-04 16:09:50 -07:00
Oleksandr Zhurbenko
1ec7a842c4 Commented out logs to improve the whiteboard's performance 2016-06-03 15:40:46 -07:00
Oleksandr Zhurbenko
af077961e3 Added helpers for the shape components 2016-06-03 15:39:28 -07:00
Oleksandr Zhurbenko
e39963d4de Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 
Conflicts:
	bigbluebutton-html5/package.json
 2016-06-02 15:20:41 -07:00
Oleksandr Zhurbenko
25b55ba9d7 Switched to CSS scaling for SVG 2016-06-02 15:09:28 -07:00
Richard Alam
424de0f2f9 Merge pull request #3161 from antobinary/captions 
recover caption funct; prepare akka-apps for captions on bbb-html5
 2016-06-02 17:02:03 -04:00
Oswaldo Acauan
c7225d9738 Add i18n to chat form 2016-06-02 17:32:42 -03:00
Oswaldo Acauan
b77b8ce971 Fix Welcome message not being parsed 2016-06-02 16:34:17 -03:00
Oswaldo Acauan
f204e6007a Sanitize chat messages client and server-side 2016-06-02 16:08:17 -03:00
Oswaldo Acauan
d642cb1c99 Add chat send message functionality 2016-06-02 15:40:27 -03:00
Oswaldo Acauan
8d74db562a Fix getters on auth service 2016-06-02 10:48:39 -03:00
Oswaldo Acauan
f39b7171af Move session/auth logic to separated services 2016-06-02 10:46:35 -03:00
Oswaldo Acauan
f4fbc658e0 Fetch chat messages from server instead of mock 2016-06-02 10:00:57 -03:00
Oleksandr Zhurbenko
6db05cf0f4 Added scaling on window resize for the slide 2016-06-01 16:37:51 -07:00
Oleksandr Zhurbenko
06e18808b3 Fixed a layout bug for the Firefox 2016-06-01 14:59:10 -07:00
Oleksandr Zhurbenko
7730d50948 Centered the slide 2016-06-01 14:57:19 -07:00
Anton Georgiev
9cf03a8ce8 move helpers; extract nodejsApp 2016-06-01 17:18:13 +00:00
Oswaldo Acauan
378c94ce7b Resolve merge conflicts 2016-06-01 13:45:01 -03:00
Oswaldo Acauan
1d8a36564d Add base components and style for Chat 2016-06-01 13:33:19 -03:00
perroned
844210faea Fixes audio permission, render tag 2016-06-01 15:56:12 +00:00
gcampes
b6366ff451 removes .js and .jsx from startup/routes in html5 2016-06-01 10:04:23 -03:00
gcampes
957dcb9a8f Finish first iteration of the html5 userlist and adds user avatar component 2016-05-31 17:25:42 -03:00
gcampes
ce32ae5b20 Merge branch 'html5-new-userlist' into html-userlist 2016-05-31 08:37:14 -03:00
gcampes
430435e660 Changes html5 userlist service 2016-05-31 08:29:38 -03:00
Oleksandr Zhurbenko
6046c6c5a9 Removed unnecessary wrappers and adjusted styling 2016-05-30 16:10:01 -07:00
Oleksandr Zhurbenko
949511f9b5 Linting, changed line endings from Windows to Unix 2016-05-30 15:07:02 -07:00
Oleksandr Zhurbenko
ba7cdca648 Added fade in for the slides and a default content 2016-05-30 11:12:02 -07:00
Oleksandr Zhurbenko
36cfffd2db Fixed multiple rerenderings while changing slides 
Media container is supposed to know only if a current presentation exists, not slide
 2016-05-30 10:33:35 -07:00
perroned
4977950081 Fixes crash when starting video view 2016-05-30 17:21:30 +00:00
Oleksandr Zhurbenko
179ce3c2bd Swapping whiteboard with default view if there is no current slide 2016-05-27 18:10:34 -07:00
perroned
c8fdf66099 Lints 2016-05-27 16:34:03 +00:00
perroned
393b49fdbe Cleans up duplicate code 2016-05-27 16:17:16 +00:00
Oleksandr Zhurbenko
84318b10f0 Adjusted imports, cleaned up 2016-05-26 17:13:53 -07:00
Oleksandr Zhurbenko
16c46d50af Adjusted the whiteboard files to the new structure 2016-05-26 17:03:30 -07:00
perroned
2f9afaa8d6 Uses same name for voiceBridge where possible 2016-05-26 20:25:55 +00:00
perroned
ac60620ac9 Makes WebRTC call when data changes 2016-05-26 20:03:45 +00:00
perroned
b8ae3a5304 Fixes some imports 2016-05-26 20:01:49 +00:00
Oleksandr Zhurbenko
50597726d9 Ported changes in addShapeToCollection func and the structure of the text shape obj to the new server side structure 2016-05-26 09:37:54 -07:00
Oleksandr Zhurbenko
1c4c2befb3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 
Conflicts:
	bigbluebutton-html5/Gruntfile.js
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/imports/ui/chat/Chat.jsx
	bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
	bigbluebutton-html5/imports/ui/chat/PrivateChatToolBar.jsx
	bigbluebutton-html5/imports/ui/shared/Button.jsx
	bigbluebutton-html5/imports/ui/whiteboard/Whiteboard.jsx
	bigbluebutton-html5/package.json
	bigbluebutton-html5/server/collection_methods/shapes.js
	bigbluebutton-html5/server/collection_methods/slides.js
	bigbluebutton-html5/server/server.js
 2016-05-25 15:04:20 -07:00
Anton Georgiev
02f03205a4 minor edit to handle voice events 2016-05-25 16:32:23 -03:00
Anton Georgiev
61236078c7 bring callback out of if/else 2016-05-25 16:32:11 -03:00
gcampes
6b22b49922 Changes to the html5 userlist 2016-05-25 16:29:22 -03:00
Oleksandr Zhurbenko
eaeaf90289 Was able to add -webkit-tap-highlight-color property to svg elements 2016-05-25 12:24:01 -07:00
Oleksandr Zhurbenko
9d71e48333 Fixed all the bugs related to calls from shape-factory to all the shape components, except the 'text' shape 2016-05-24 15:50:22 -07:00
perroned
d57fc2ed44 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 2016-05-24 14:02:25 +00:00
Oswaldo Acauan
877e91a43e Rename to new structure 2016-05-23 10:09:47 -03:00
Oleksandr Zhurbenko
654b80126f Fixed namespace problem (for FF) 2016-05-20 11:36:20 -07:00
Oleksandr Zhurbenko
82c45ef6de Removed Svg component; added the ability to display an image from the new Slide component 2016-05-20 11:28:52 -07:00
Oswaldo Acauan
216bfd2ac2 Fix nav-bar userlist toggle icon 2016-05-20 13:39:58 -03:00
Oswaldo Acauan
37b86d9176 Improve some basic styles 2016-05-20 13:35:15 -03:00
Oswaldo Acauan
29c09afee9 Add basic nav-bar styles 2016-05-20 13:29:55 -03:00
Oswaldo Acauan
2612fef112 Improve Button styles 2016-05-20 13:17:39 -03:00
Oswaldo Acauan
0e9b8f7eff Add basic styles for actions-bar 2016-05-20 13:17:21 -03:00
Oswaldo Acauan
0e6c6f1f99 Improve some styles on the media 2016-05-20 12:02:57 -03:00
Oswaldo Acauan
a69d7faab9 Add iconRight option to Button component 2016-05-20 11:49:28 -03:00
Oswaldo Acauan
dc7cdb337f Add examples to Button component 2016-05-20 11:13:06 -03:00
Oswaldo Acauan
99c2e94c80 Remove unnecessary extension on imports 2016-05-20 10:46:30 -03:00
Oswaldo Acauan
d3d997d211 Rename navbar, media, whiteboard and videodock to the new structure 2016-05-20 10:44:27 -03:00
Oswaldo Acauan
7aac407e35 Remove unnecessary component background colors 2016-05-20 10:41:15 -03:00
Oswaldo Acauan
d81cb28f35 Add new component button and some basic styles 2016-05-20 10:37:19 -03:00
perroned
ef56169ebb Access sip function through window 2016-05-19 20:18:20 +00:00
perroned
e8229b1851 Some linting 2016-05-19 19:27:49 +00:00
perroned
3934ae3dce Adds some work for verto calling 2016-05-19 18:33:27 +00:00
gcampes
18e4f98f1d Adds html5 new userlist, WIP 2016-05-19 15:22:56 -03:00
perroned
428941f896 Hangs up from sip audio 2016-05-19 16:21:22 +00:00
perroned
8117f91ec9 Fixes some imports 2016-05-19 16:14:12 +00:00
perroned
97c94ecace Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js
	bigbluebutton-html5/imports/api/phone/index.js
	bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js
 2016-05-19 15:47:47 +00:00
perroned
955c27efcc Beginning to add exiting sip 2016-05-19 15:20:36 +00:00
perroned
a637c29710 Fixes some paths 2016-05-19 15:19:42 +00:00
perroned
d83c96bf5d Changes Meteor.config to an export 2016-05-18 20:19:50 +00:00
perroned
66a391c191 Updates server function to use new argument 2016-05-18 19:31:20 +00:00
perroned
4be18d2156 Updates client side data gathering for audio call 2016-05-18 19:29:28 +00:00
perroned
206e09f37a Updates poll to use new server call method 2016-05-18 19:27:47 +00:00
perroned
ef41eee5b2 Fixes server call method arguments 2016-05-18 19:26:51 +00:00
Oleksandr Zhurbenko
7ff3a7c5d2 Adjusting the structure to the current BBB HTML5 convention 2016-05-17 16:43:19 -07:00
gcampes
e49b0399b5 Merge userlist merge conflicts 2016-05-17 11:17:17 -03:00
gcampes
947721250d Adds the new layout for the user-list 2016-05-17 10:52:27 -03:00
Anton Georgiev
eea6bc0829 adjust path of collections 2016-05-16 20:26:24 +00:00
Anton Georgiev
8d52dc1b40 Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
	bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
	bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
	bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
	bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
	bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
	bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
	bigbluebutton-html5/imports/startup/server/eventHandlers.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-16 19:54:51 +00:00
Anton Georgiev
cbef1c4abd split emitter.on; move to api 2016-05-16 19:12:49 +00:00
perroned
5be138fd31 Fixes cursor structure 2016-05-16 13:13:03 -05:00
perroned
4adad8bb32 Changes credential passing to 1 object 2016-05-16 13:12:27 -05:00
perroned
98aae7aade Changes collection imports 2016-05-16 13:05:44 -05:00
Anton Georgiev
a263c1388b lint mostly 2016-05-16 14:35:59 +00:00
perroned
109a8da350 Fixes whitespace 2016-05-16 09:14:28 -05:00
perroned
d9dbb51023 Moves to api/collection/index 2016-05-16 09:14:02 -05:00
perroned
642a4e45c5 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-13 14:54:19 -05:00
perroned
6adaff0c44 Cleans lint 2016-05-13 11:31:06 -05:00
perroned
6a9ccb355f Updates callServer arguments and passes credential object 2016-05-13 11:17:00 -05:00
Anton Georgiev
57352f193c rework users publish 2016-05-13 16:11:44 +00:00
perroned
544220f7c0 Updating import paths for new structure 2016-05-13 09:47:24 -05:00
perroned
d12c31e324 Moving components to structure 2016-05-13 09:39:10 -05:00
Anton Georgiev
8a6fc308da avoid race cond when subscribing for data 2016-05-13 14:34:29 +00:00
perroned
d966aee2d7 Fixing paths for structure 2016-05-12 14:50:02 -05:00
perroned
3e0c3d1ee1 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-12 14:30:46 -05:00
Anton Georgiev
ecd3b3de17 log in user properly 2016-05-12 19:22:51 +00:00
perroned
3b8c9c2971 Changing structure to /api/list/index.js 2016-05-12 14:04:00 -05:00
perroned
dc3dd43f1a Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/polls/polls.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-12 13:58:06 -05:00
Anton Georgiev
783f150442 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/imports/startup/client/routes.js
 2016-05-12 18:08:44 +00:00
Anton Georgiev
6a92c9400b restructure modifiers and methods 2016-05-12 17:43:59 +00:00
perroned
3971bdb548 Lints 2016-05-12 11:10:43 -05:00
perroned
dff3dd2436 Moves serverCall to imports service api 2016-05-12 11:10:20 -05:00
perroned
f1f24acda8 Adds some services 2016-05-12 10:43:09 -05:00
perroned
666c96dab9 Adds server call wrapper to service 2016-05-12 10:41:51 -05:00
perroned
38d2bff789 Loads sip li. Adds audio tag 2016-05-11 15:43:07 -05:00
Anton Georgiev
699fde7344 accommodate for poll and deskshare 2016-05-10 20:25:24 +00:00
Anton Georgiev
298927cf4f Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/collections/collections.js
	bigbluebutton-html5/imports/api/meetings/server/meetings.js
	bigbluebutton-html5/imports/startup/server/collectionManagers/poll.js
	bigbluebutton-html5/imports/startup/server/eventHandlers.js
	bigbluebutton-html5/imports/startup/server/helpers.js
	bigbluebutton-html5/imports/startup/server/meteorMethods/publishVoteMessage.js
	bigbluebutton-html5/imports/startup/server/publish.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
	bigbluebutton-html5/server/server.js
 2016-05-10 19:39:01 +00:00
Anton Georgiev
45342b8a04 restructure; subscribe for remaining collections 2016-05-10 18:53:05 +00:00
perroned
84acf39fd3 Begins adding phone service 2016-05-10 10:54:55 -05:00
perroned
57add2fa50 rename poll -> polls.js 2016-05-10 10:34:13 -05:00
perroned
587627562c Fixes some api structure 2016-05-10 10:23:22 -05:00
Oleksandr Zhurbenko
1b47318edd Added reactive data source for the slide and shapes 2016-05-09 16:54:53 -07:00
Oleksandr Zhurbenko
84944ebffe Created Initial Draw Components 2016-05-09 15:06:03 -07:00
Anton Georgiev
bfd4afd07d Users collection now available on client side 2016-05-09 21:19:45 +00:00
Anton Georgiev
dcce6d3122 set baseUrl to html5client/ 2016-05-09 19:19:52 +00:00
perroned
67115c0169 Begins adding deskshare functionality 2016-05-06 15:15:47 -05:00
Anton Georgiev
76d599eb32 join route handled via localStorage 2016-05-06 19:12:28 +00:00
perroned
4a7938e1c0 Adds settings and styling 2016-05-06 12:46:14 -05:00
Anton Georgiev
b95c380b56 working on join route 2016-05-06 15:34:00 +00:00
Maxim Khlobystov
67bb61c975 Code style cleanup. 2016-05-05 18:30:57 -04: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
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
perroned
0abc1fde91 Fixes whitespace issue 2016-05-03 15:02:59 -05:00
gcampes
86d97b59da Fixes infinited tabbed line in html5 chat input controls 2016-05-03 16:06:59 -03:00
Oswaldo Acauan
ddd38c57ac Add i18n, modular layouts and basic styles 2016-05-03 17:40:46 -03:00
Oswaldo Acauan
01860a8804 Add basic styles for new design 2016-05-02 19:42:54 -03:00
Maxim Khlobystov
88542275d8 Cleanup. 2016-04-28 18:42:04 -04: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
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
Oleksandr Zhurbenko
db667ae58d Linter fixes 2016-04-27 16:38:57 -07:00
Maxim Khlobystov
ae26f850bc Translated the main stylesheet to Sass. 2016-04-27 16:33:34 -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
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