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

162 Commits

Author SHA1 Message Date
Richard Alam
6cf30e9f07 - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
Richard Alam
ff333b9232 - handle get presentation info message 2014-02-08 14:20:05 -05:00
Richard Alam
1c5c3cbdf3 - try to fix presentation messages 2014-02-07 17:23:11 -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
Felipe Cecagno
3440ed0fe3 Merge branch 'v0.81' into record-button 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-01-14 14:05:41 -02:00
Guilherme Augusto Dias
1d421f2d4a Retrieve duration 
BBB Web retrieves playback length from metadata.xml when it is available, otherwise playback length is calculated with start/stop meeting timestamps.
 2013-11-06 18:13:43 +00:00
Richard Alam
a58120f322 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1680 2013-11-05 18:28:12 +00:00
Richard Alam
a141928824 - Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1671 
Remove the beginning . (dot) from uploaded presentation.
 2013-10-23 16:21:49 +00:00
Markos Calderon
1df0a4c4ba fix for precreated poll 2013-07-17 18:46:32 -05:00
Richard Alam
34a9875766 - enable webhooks 2013-07-11 19:20:11 +00:00
Richard Alam
14d3b615bc - handle prescreated polls and display them in client 2013-07-10 20:56:32 +00:00
Richard Alam
7d3e5afb5f - remove re-encoding of posted XML data as grails 1.3.9 doesn't unencode automatically the data 2013-07-10 19:14:25 +00:00
Richard Alam
c6611f6f4e - have bbb-web send create/destroy meeting to red5 2013-07-09 20:52:57 +00:00
Markos Calderon
5a09b5a6d2 adding a response when server is down 2013-06-25 18:26:49 -05:00
Markos Calderon
f520bef467 mark bbb-apss down if server doesn't respond back 2013-06-24 17:33:39 -05:00
Markos Calderon
b327e16e56 sending and handling keepalive messages 2013-06-21 20:38:14 -05:00
Markos Calderon
2597d47bba listen to events in bbb-callbacks 2013-06-12 18:49:32 -05:00
Markos Calderon
51279ec549 API calls for subscribing to events 2013-06-10 18:38:35 -05:00
Markos Calderon
8ca16a3953 updating bbb-apps to handle polls 2013-06-06 18:53:57 -05:00
Markos Calderon
7f748fd809 reading polls from create API call 2013-06-05 17:56:03 -05:00
Markos Calderon
47eadc0fe5 Adding poll models 2013-06-04 19:13:54 -05:00
Richard Alam
11f41b8d70 Revert " - allow removing of close button for avatar and publish window through config.xml" 
This reverts commit 961626f46a.
 2013-05-28 16:24:54 +00:00
Richard Alam
961626f46a - allow removing of close button for avatar and publish window through config.xml 2013-05-28 16:18:48 +00:00
Richard Alam
b28cb66f32 - change how we create the base string and calculate checksum for setConfigXML API 2013-05-24 15:11:36 +00:00
Richard Alam
27af71f208 - handle passing of config xml 2013-03-27 16:06:03 +00:00
Richard Alam
d9bbc14d80 - remove decoding of config xml to utf-8...I still think we need to encode 
the config xml to utf-8 and decode it
 2013-03-22 15:32:44 +00:00
Richard Alam
0e386adab2 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-15 21:03:13 +00:00
jfederico
f56c4474e6 bigbluebutton-web: Added a footer to welcome message. A disclaimer or copyright signature can be placed here for all the meetings in a server. 2013-03-13 15:01:14 -04:00
Markos Calderon
1929526a4d added custom data parameter when a user joins to a meeting 2013-02-14 15:59:52 -05:00
Richard Alam
e6fe97db36 Merge branch 'master' into merge-master-into-dynamic-config 2013-02-07 18:53:01 +00:00
Markos Calderon
740123942d a fix when the name param is not passed in the API 2013-01-23 16:43:06 -05:00
Markos Calderon
f93d40adfe Added property for set max swf file size 2013-01-23 16:01:01 -05:00
Markos Calderon
983f93b0e4 Added license for bigbluebutton-web 2013-01-18 18:24:35 -05:00
Richard Alam
5a95875968 - hash the meeting id with the config xml 2012-12-10 19:05:41 +00:00
Richard Alam
a70d56ff56 - tie tokens to a meeting 2012-12-09 20:35:09 +00:00
Richard Alam
a0d4c61082 - add ability to post config xml for meeting 2012-12-09 19:29:48 +00:00
Richard Alam
1f620583a2 - allow passing of configURL in create and join api calls 2012-12-09 00:23:33 +00:00
Richard Alam
1cd682e1e0 - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
Richard Alam
787e1de310 - pass external meeting id to the client and provide JS api to query it 2012-11-20 19:30:08 +00:00
Richard Alam
e63bbfc449 - pass defaultLayout in join api call 2012-11-12 21:05:23 +00:00
jfederico
93b1bbda72 bbb-lti 0.1: Added functionality for passing IMS Global Certification test 
Signed-off-by: jfederico <jesus@123it.ca>
 2012-10-24 16:04:40 -04:00
Markos Calderon
3c7419c5ef load textfile from the client 2012-07-17 16:39:32 -07:00
Markos Calderon
3d0b3f9307 added extract text from presentations 2012-07-12 15:49:33 -07:00
Markos Calderon
9fed546de9 Initial changes for extract text 2012-07-11 15:37:31 -07:00
Markos Calderon
0b63acb6bc Update bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java 2012-04-19 14:08:52 -05:00
Markos Calderon
6183dab2c5 a better way to support old date format 2012-04-14 13:47:31 -07:00
Markos Calderon
1720b4bdda Adding support for old date format 2012-04-14 11:20:01 -07:00
Richard Alam
5177a1737a - allow admin to turn off recording for whole server 2012-03-29 16:26:10 +00:00
Markos Calderon
c4d866419c change date format in getRecordings for bigbluebutton 0.8 2012-03-26 13:47:35 -07:00
Richard Alam
d8274e0920 - send the number of slide completed instead of page number 2012-03-09 22:17:43 +00:00