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

264 Commits

Author SHA1 Message Date
Anton Georgiev
b3d55e4ee1 Watches the recordings tree. Parses all files when it starts running. Pushes info to Redis 2014-05-01 21:42:15 +00:00
Richard Alam
23d78524e2 - initial recording api 2014-05-01 15:30:09 +00:00
Richard Alam
bfc4cb178e - setup testing 2014-04-30 15:43:25 +00:00
Richard Alam
5e6caccbac - add oauth signature 2014-04-27 16:38:25 -07:00
Richard Alam
e37cca26f5 - versioned api 2014-04-27 16:29:26 -07:00
Richard Alam
454b37a0df - setup 2014-04-26 19:51:18 -07:00
Richard Alam
79fe7f4b8b - cleanup 2014-04-26 19:48:06 -07:00
Richard Alam
bee1320463 Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2014-04-08 19:07:37 +00:00
Anton Georgiev
2d89a73c0c Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/ivy.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2014-04-08 15:55:04 +00:00
Richard Alam
3956daf327 - playing around with api in coffee 2014-04-02 22:11:59 +00:00
Richard Alam
c77ddd76d3 Merge branch 'master' into merge-polling-with-master 2014-02-10 21:49:36 +00:00
Fred Dixon
b8a04f18d5 Fixed typo that prevented wget from making API call 2014-02-03 11:51:55 -05:00
Richard Alam
5559a2b8cc Merge branch 'master' into merge-polling-with-master 
- there are compile issues we need to fix

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-23 20:49:04 +00:00
Richard Alam
4b07e6d3ab Merge branch 'master' into html5-bridge-new-events 2014-01-06 13:20:35 -08:00
Richard Alam
b975a8ac14 - move the html5 client out of labs 2014-01-06 08:44:15 -08:00
mohamed-ahmed
cad8c8ea4f user list now loads (some bugs though ) 2013-12-17 19:51:46 +00:00
mohamed-ahmed
da39d3efef scoll bar added to messages, also chat bar will scroll to bottom upon new message 2013-12-10 20:47:43 +00:00
mohamed-ahmed
d3055fc9ce all_messages event now working - loads previous messages 2013-12-09 21:47:11 +00:00
mohamed-ahmed
5f8ab24ffd line tool is now working under new message format 2013-11-26 22:09:39 +00:00
mohamed-ahmed
5c51d939fa progress on making pen tool work 2013-11-23 17:26:21 +00:00
mohamed-ahmed
3d472e5894 'makeShake' and 'updateShape' working for triangle 2013-11-19 19:04:25 +00:00
mohamed-ahmed
ae8dff86a6 'makeShake' and 'updateShape' working for ellipse 2013-11-19 16:59:22 +00:00
mohamed-ahmed
c8e48d9e22 'makeShake' and 'updateShape' working for rectangle 2013-11-19 16:34:34 +00:00
mohamed-ahmed
813f10cef0 progress on getting makeShape to work for 'rect' 2013-11-19 00:14:37 +00:00
mohamed-ahmed
7aa31b47b7 removed unecessary events handlers 2013-11-18 19:52:44 +00:00
mohamed-ahmed
d35d00fd55 'all_slides' and move cursor events now working in new msg format 2013-11-18 19:36:27 +00:00
mohamed-ahmed
59adb0d680 now sends public chat messages using new message format 2013-11-14 19:24:49 +00:00
mohamed-ahmed
0a80708464 fixed comment 2013-11-13 20:36:23 +00:00
mohamed-ahmed
5541539d24 use can now connect to html5-client using new message format 2013-11-13 19:15:31 +00:00
mohamed-ahmed
874add53ef client now prints 'socket.on:connct' when the client connects 2013-11-13 18:22:56 +00:00
mohamed-ahmed
c54fb80f2e progress on changing 'user join' event 2013-11-12 22:21:11 +00:00
mohamed-ahmed
7545876fc5 starting to be able to handle user connect 2013-11-11 22:55:39 +00:00
Fred Dixon
d5d502e4e4 minor bug fix in old stress testing script 2013-11-05 07:44:53 -05:00
Richard Alam
82281f1c0f - add more logging 2013-11-04 07:30:26 -08:00
Leonardo Crauss Daronco
9cb5c156cd HTML5: remove all old css files and adjust what's left 2013-11-01 17:25:00 -02:00
Leonardo Crauss Daronco
d3191c84af HTML: layout with fullsize components when in very small screens 
For mobile phones on portrait mode, chat, user list and video are shown
taking the whole screen.
 2013-11-01 15:51:29 -02:00
tylercopeland
c887f2eb92 Public chat style updates 2013-11-01 13:47:53 -04:00
Leonardo Crauss Daronco
8a11f56ce9 HTML5: impemeting the layout positioning for mobile devices 2013-11-01 13:01:58 -02:00
tylercopeland
7fcba312cf Users list style updates 2013-11-01 10:58:09 -04:00
Leonardo Crauss Daronco
10aafeedea HTML5: showing/hiding elements when navbar buttons are clicked 2013-11-01 11:22:02 -02:00
Leonardo Crauss Daronco
cbdd3f30ee HTML5: splitting the css files in several sections 
So we can work on them in paralell to implement the new layout.
 2013-11-01 10:25:05 -02:00
Leonardo Crauss Daronco
a06331f00b HTML5: cleanup session whiteboard view, remove whiteboard controls 
Removed the controls that are not used anymore, are gonna be used only when
the html5 is allowed to be a presenter.
 2013-10-31 22:44:34 -02:00
Leonardo Crauss Daronco
6d8e6b9210 HTML5: pushing layout changes from @tylercopeland 2013-10-31 21:58:18 -02:00
Leonardo Crauss Daronco
3c447287f3 HTML5: remaking the html markup for the chat 
A lot of changes to make it easier to control the design from the css.
The actions in the chat now only add or remove classes from the elements instead
of changing their css, so the css is responsible for showing or hiding them
and controlling how they appear in the screen.
 2013-10-31 21:30:37 -02:00
Leonardo Crauss Daronco
e0d394896f HTML5: restructuring the client's html 
Removing all the styling from the javascript files, it should all be done
in the css. Not finished yet, the chat and login screens still need a lot
of work.
 2013-10-31 17:36:38 -02:00
Leonardo Crauss Daronco
c0a8fb7b57 HTML5: setup bootstrap and update font-awesome 
Versions:
- Bootstrap v3.0.1
- Font Awesome 4.0.1

Haven't added bootstrap-theme, can be add in the future if needed.
 2013-10-31 15:40:17 -02:00
Leonardo Crauss Daronco
a20f3f3f6d HTML5: use less instead of plain css 
Using connect-assets to automatically compile less files into css files and
serve them. All less files should be under assets/css/.
The current layout file is using less but it's a plain css, with its content
simply copied from the old layout.css file.
 2013-10-31 12:50:52 -02:00
Leonardo Crauss Daronco
d6158115f1 HTML5: comment out wrong method call in RedisPublisher 
Temporary, the method called doesn't exist anymore. Have to check it better,
but commented it for now so the app doesn't break.
 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
ab6c73ca92 HTML5: fixing undo and clearPaper events in the server 2013-10-31 12:04:25 -02:00
Leonardo Crauss Daronco
814b6172fa HTML5: update redis to 0.9.0, solves a few bugs 
Apparently solved errors on user joins, the error was:
Error: node_redis command queue state error. If you can reproduce this, please report it
 2013-10-31 12:04:25 -02:00