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

219 Commits

Author SHA1 Message Date
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
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
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
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
Oleksandr Zhurbenko
179ce3c2bd Swapping whiteboard with default view if there is no current slide 2016-05-27 18:10:34 -07: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
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
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
gcampes
18e4f98f1d Adds html5 new userlist, WIP 2016-05-19 15:22:56 -03: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
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
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
perroned
d57fc2ed44 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 2016-05-24 14:02:25 +00: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
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
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