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

8644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perroned
1ddd2e439c Changed title 2014-09-04 10:06:36 -07:00
perroned
37577b3ce4 Fixed server version 2014-09-04 09:46:02 -07:00
Anton Georgiev
1ed41ceb59 splitting "recorded" into "currentlyBeingRecorded" and "intendedForRecording" 2014-09-04 16:34:18 +00:00
perroned
a0163e5117 Fixed meeting recording status. 2014-09-04 09:32:24 -07:00
Anton Georgiev
206a2e23ea Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merging-html5-with-master 2014-09-04 15:04:42 +00:00
perroned
29cdfe1530 Added code for getting proper voice bridge pin 2014-09-04 07:48:50 -07:00
Anton Georgiev
4a88ebdcaf support voice_conf and duration in meeting_create_message. put empty strings for these params in get_all_meetings_reply 2014-09-04 14:47:32 +00:00
perroned
c6a91079bd Added newline and fixed operator. 2014-09-04 07:37:36 -07:00
perroned
acc85a1bf8 Fixed errors when data doesn't load properly. 2014-09-04 06:45:17 -07:00
perroned
65024217a7 Navbar elements do not rely on data being present anymore. So now if there is a connection or data issue the UI doesn't misbehave and disappear. 2014-09-03 13:11:56 -07:00
perroned
12eb51523d Changing the way UI relies on data. 2014-09-03 13:02:00 -07:00
perroned
8c00dcc56d Removed not needed code. Changing UI elements' dependencies to data always being available. 2014-09-03 12:22:08 -07:00
perroned
867928a0b6 Merge remote-tracking branch 'anton/merging-html5-with-master' into creating-better-templates 2014-09-03 10:44:33 -07:00
Anton Georgiev
f5fd9ee664 log when meeting_created_message was received 2014-09-03 15:09:34 +00:00
Anton Georgiev
4f25f2ced1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master 2014-09-02 21:08:03 +00: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
Anton Georgiev
cf125781db Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-09-02 17:54:14 +00: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
Anton Georgiev
149b21936d not sure if I should commit these 2014-09-02 15:59:50 +00:00
Anton Georgiev
70a3553ae9 cleaning up 2014-09-02 15:19:50 +00:00
Anton Georgiev
27e05e112a some work on presentation_page_resized_message 2014-09-02 15:19:21 +00: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