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

7889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mateus Dalepiane
ba020a8e52 Merge branch '081-network-monitor' into 090-network-monitor 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-09-12 12:02:51 -03:00
Chad Pilkey
59dbdc55aa Merge remote-tracking branch 'upstream/master' into sort-raisehand-better 2014-09-03 14:34:13 -07:00
Chad Pilkey
b65da7ec25 hide switch presenter for phone users, hide presentation thumbnails when you click the presentation 2014-09-03 14:32:34 -07:00
Richard Alam
2c53427a0d - meeting with duration=0 should be destroyed after a certain period when last user leaves 2014-09-02 15:25:54 -07:00
Chad Pilkey
8825f0a899 Merge remote-tracking branch 'upstream/master' into sort-raisehand-better 2014-09-02 13:42:00 -07:00
Chad Pilkey
ecfe3831b2 stop webrtc hangup from happening twice 2014-09-02 13:41:48 -07:00
Chad Pilkey
5fa76a872f adjust the positioning of the webrtc chrome title window 2014-09-02 13:41:22 -07:00
Richard Alam
c300eb81e6 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-09-02 13:18:13 -07:00
Richard Alam
4bf941b108 - although the page number is not used in whiteboard recording processing, just match the page number with the goto slide event in events.xml 2014-09-02 13:17:28 -07:00
Calvin Walton
c7967810b2 Revert the presentation publish page index altering 
This was added because BigBlueButton 0.9 started using 1-based page
numbers in the events.xml file. That change has been reverted, so as
to avoid behaviour changes from 0.81 in places where it's unnecessary.
 2014-09-02 15:46:52 -04:00
Richard Alam
d5d541a2c5 - subtract 1 from GotoSlideEvent and ResizeAndMoveSlideEvent to events.xml so that the recording is backwards compatible with 0.81 and earlier 2014-09-02 12:44:52 -07:00
Richard Alam
0d3e23db21 - update locales 2014-09-02 12:01:20 -07:00
Richard Alam
a1ded8fdb5 - add current time on header of JSON messages so we can display the correct time instead of calculating from the timestamp 2014-09-02 11:43:05 -07:00
Richard Alam
372b571b7b - add pretty create date, duration, and user has joined info on getMeeting api response 2014-09-02 10:22:24 -07:00
Richard Alam
98c96c3613 - a meeting that has duration zero (runs infinitely) should be cleaned-up if no one has ever joined on it 2014-09-02 10:21:06 -07:00
Fred Dixon
34bb061312 Change 0.9.0-dev to 0.9.0-beta on index.html 2014-09-01 20:36:20 -04:00
Fred Dixon
b00be616da More tweaks on the language in index.html 2014-09-01 20:14:02 -04:00
Fred Dixon
7301d35941 Updates to text and tutorial videos on home page 2014-09-01 20:00:01 -04:00
Fred Dixon
93f6dcafab Upping version from 0.9.0-dev to 0.9.0-beta 2014-09-01 17:05:33 -04:00
Fred Dixon
e02476071d Make clear this is a private echo test 2014-09-01 16:48:00 -04:00
Richard Alam
8bdf8e28e9 kick off recording processing when meeting is ended 2014-09-01 15:21:01 -04:00
Richard Alam
44236df171 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-29 13:29:25 -07:00
Richard Alam
2c67bf44ea - move deskshare view control to the top of the window 2014-08-29 13:29:01 -07:00
Jesus Federico
ecdcc45d9b bbb-lti: Updated bbb-conf to fix issue with re-installations 2014-08-29 15:32:34 -04:00
Jesus Federico
78f756bfee bbb-lti: Updated bbb-conf to fix issue with re-installations 2014-08-29 13:51:20 -04:00
Jesus Federico
0851da3306 bbb-lti: Implemented mode configuration based on custom parameter 
The parameter custom_mode=[simple|extended] overrides the mode set by default in lti.properties
 2014-08-29 13:20:16 -04:00
Jesus Federico
e31c97c27a bbb-lti: Updated README file 2014-08-29 12:57:02 -04:00
Jesus Federico
d0df58cf44 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-29 09:45:52 -07:00
Jesus Federico
4ea162adff Updated bbb-conf to support changes in bbb-lti configuration file 2014-08-29 12:44:26 -04:00
Richard Alam
a79bea7a3d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-29 08:58:01 -07:00
Richard Alam
172738534c - fix issue where rectangle shape gets lost when zooming 2014-08-29 08:57:34 -07:00
Richard Alam
117c69e557 - try to fix error when querying for browser type 2014-08-29 08:57:02 -07:00
Richard Alam
84a16cdfe4 - add meeting name and duration on meetingCreated message 2014-08-29 08:56:36 -07:00
Fred Dixon
88a0455248 Tweak phrasing for private echo test 2014-08-29 11:51:31 -04:00
Fred Dixon
1683067559 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-29 11:48:39 -04:00
Fred Dixon
c3e4a0b5fd Merge pull request #386 from bigbluebutton/recording-updates-merge 
Recording updates merge
 2014-08-29 11:38:15 -04:00
Calvin Walton
15fe621523 Use the timestamp from the meeting ID to calculate the real start time 
With the switch to a different clock source in red5, the timestamps
in the events file are no longer real-time, but are rather in
seconds since computer boot.

The timestamp in the meeting id is still realtime, so use that as
the start time. Calculate the end time by adding the meeting length
to the start time.
 2014-08-29 11:19:59 -04:00
Jesus Federico
12692e66cb Updated OAuth library 2014-08-29 10:47:46 -04:00
Jesus Federico
c53b172ff8 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-28 15:38:37 -07:00
Jesus Federico
98a2c1a3d1 Fixed an issue happening when custom parameters were not included 2014-08-28 18:36:51 -04:00
Richard Alam
58aa55530b Merge pull request #385 from speakserve/remove-shell-scroolbars 
Remove shell scrollbars and improved mdiCanvas height binding
 2014-08-28 18:28:28 -04:00
Ghazi Triki
1c74e58a9f MainApplicationShell mdiCanvas height binded to the application height instead of its parent heignt. 2014-08-28 23:26:01 +01:00
Ghazi Triki
8db78cbe6d Renamed BigBlueButtonMainPanel to BigBlueButtonMainContainer and transformed to a Canvas. 2014-08-28 23:25:16 +01:00
Jesus Federico
2e15e33cc5 Merge pull request #384 from jfederico/master 
Changes to the LTI componet
 2014-08-28 18:14:33 -04:00
Jesus Federico
e4c461c9ee Clean up and updates to Controller, Services and UrlMapping 2014-08-28 18:10:34 -04:00
Fred Dixon
9380a73dac Added message to let administration know that monit will restart bbb-record-core and LibreOffice. Tweaked the language for audio settings dialog. 2014-08-28 17:39:59 -04:00
Richard Alam
66fa77d57b - tool to cleanup transifex downloaded files 2014-08-28 14:09:35 -07:00
Richard Alam
2ece654c09 - init on creation complete not when added to stage as sometimes it may create multiple windows 2014-08-28 13:39:32 -07:00
Richard Alam
f347e7f2db - make joining of voice and closing mic settings window a 2-step process to prevent race condition 2014-08-28 12:59:17 -07:00
Jesus Federico
d4e8ef8aa5 Merge pull request #383 from jfederico/master 
Changes to the LTI componet
 2014-08-28 15:04:12 -04:00