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

6094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jtrobinson
d2ffbea374 Added PollOptions class to allow for either user-defined or default tab order 2013-06-10 12:56:53 -07:00
jtrobinson
7b3144d548 Merged upstream/master. 2013-06-10 10:34:46 -07:00
jtrobinson
b0d3ffeeaa Merged upstream/master. 2013-06-10 09:51:15 -07:00
Chad Pilkey
8533006c6f Merge remote branch 'upstream/master' into add-meeting-title 2013-06-10 09:05:26 -07:00
jtrobinson
fab89990ec Merged upstream/master. 2013-06-10 08:39:39 -07:00
Chad Pilkey
0eef79116e added whiteboardAccess to config.xml template 2013-06-10 08:21:07 -07:00
Chad Pilkey
683096cb1d Partial implementation of meeting title on the toolbar 2013-06-10 08:14:28 -07:00
Felipe Cecagno
ac66d49812 Create the auto scroll feature on the slides thumbnails. The idea is that everytime the slide changes because of the synchronized playback, the thumbnails div will scroll to keep the current thumbnail centered in the div. The feature can be disabled using a checkbox. 2013-06-09 15:11:50 -03:00
Felipe Cecagno
c8f2079e64 When the user clicks on a slide thumbnail, the URL changes to index that moment so if the user copies and shares the URL after click on a slide thumbnail, the URL copied will go directly to the correct moment. 2013-06-09 14:51:38 -03:00
Fred Dixon
5935f8b1b0 More tweeks to the default presentation 2013-06-08 15:48:26 -07:00
Fred Dixon
b5080d7aca Reording of content on index.html page 2013-06-08 15:03:47 -07:00
Jesus Federico
df73f1096f bbb-tool: Fix for bug on publish/unpublish-delete actions available on extended mode 2013-06-08 17:28:06 -04:00
Fred Dixon
508c5e3b89 Output correct icon URL for LTI in bbb-conf --lti 2013-06-08 14:15:58 -07:00
Fred Dixon
bc0f5c8987 Minor font changes to default presentation for BigBlueButton 0.81 2013-06-08 12:57:06 -07:00
Fred Dixon
16e64ddf06 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-06-08 12:40:30 -07:00
Fred Dixon
086c49633c Updated default presentation for BigBlueButton 0.81 2013-06-08 12:40:20 -07:00
Fred Dixon
f03e005d9a Minor cleanup on API examples 2013-06-08 12:39:44 -07:00
Richard Alam
15d2d63102 - fix displaying of name when userid and name has dash in it 2013-06-08 14:27:59 -04:00
Fred Dixon
2cdaf09be1 Minor updates to index.html page 2013-06-08 10:46:41 -07:00
Jesus Federico
a6c512be3d Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2013-06-08 10:26:55 -07:00
Jesus Federico
d05a434d3f bbb-lti: Updated bbb-conf for fixing icon and base url 2013-06-08 13:26:04 -04:00
Gustavo Salazar
1fb76f425c Merge pull request #176 from gugat/matterhorn-1-4 
support ingest for matterhorn 1.4
 2013-06-07 14:51:40 -07:00
Jesus Federico
c21802e24e bbb-lti: Renamed custom parameters 2013-06-07 17:45:47 -04:00
Gustavo Salazar
0aa1c9867c support ingest for matterhorn 1.4 2013-06-07 16:27:14 -05:00
Fred Dixon
33a9c92b39 Reformatting of the index.html page 2013-06-07 14:14:20 -07:00
Fred Dixon
12f12b2af6 Renamed a parameter for clarity 2013-06-07 14:14:01 -07:00
Jesus Federico
e8d7b2f71e Fixed a bug on full name composition 2013-06-07 16:07:40 -04:00
Richard Alam
0a76c64ff5 Merge pull request #174 from fcecagno/fix1530 
fix #1530
 2013-06-06 17:54:40 -07:00
Richard Alam
ed82abcc3f Merge pull request #173 from fcecagno/fix1520 
fix #1520
 2013-06-06 17:54:21 -07:00
Felipe Cecagno
b47deb925f fix #1520 
When the layout was locked, the viewers still could move or resize each window just once, before the windows get locked. The problem was conceptual, since the properties draggable and resizable have been added to the layout definition, creating a conflict between the definition of the layout (draggable/resizable) and the role definition in addition to the locked state.
 2013-06-06 21:30:09 -03:00
Ricahrd Alam
695bb54ab5 - have upgrade to grails 1.3.9 work 
- remove plugins tomcat, hibernate, jsecurity
    grails --list-plugins
    grails --uninstall-plugin hibernate
    grails --uninstall-plugin jsecurity
    grails --uninstall-plugin tomcat
 2013-06-06 12:49:18 -07:00
Richard Alam
e1879795e9 try to upgrade to grails 1.3.9 - Not starting properly though 2013-06-06 12:17:52 -07:00
Tyler Copeland
813816d18d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-06-05 23:46:05 -04:00
Tyler Copeland
a786af2b57 fixed images on landing page 2013-06-05 23:45:57 -04:00
Richard Alam
8f2fbdbb5f Merge pull request #172 from SenecaCDOT-BigBlueButton/look-into-time-code 
custom start time of recording now works in firefox
 2013-06-05 14:12:56 -07:00
Chad Pilkey
e6a93de055 custom start time of recording now works in firefox 2013-06-05 14:05:15 -07:00
Richard Alam
33e7efe2b1 Merge pull request #171 from SenecaCDOT-BigBlueButton/add-single-hand-lowering 
Add single hand lowering
 2013-06-05 12:15:30 -07:00
Chad Pilkey
1dd9b849b3 Merge remote branch 'upstream/master' into add-single-hand-lowering 2013-06-05 12:05:26 -07:00
Chad Pilkey
9466740722 added the ability to lower a single hand by clicking it 2013-06-05 12:05:03 -07:00
Chad Pilkey
da4a4f06ff Merge pull request #168 from SenecaCDOT-BigBlueButton/fix-handraise-not-resetting 
added a bindable property to access the client's handraise state
 2013-06-05 11:25:04 -07:00
Richard Alam
db6542169f Merge pull request #170 from SenecaCDOT-BigBlueButton/fix-change-slide-with-pen 
can now use the presentation thumbnails with a tool selected
 2013-06-04 14:53:34 -07:00
Chad Pilkey
b3560c6f8f can now use the presentation thumbnails with a tool selected 2013-06-04 13:43:33 -07:00
Markos Calderon
8312bc3cb8 Merge pull request #169 from bigbluebutton/update-localization 
update localization files
 2013-06-04 12:15:23 -07:00
Markos Calderon
d9d044f227 update localization files 2013-06-04 14:11:30 -05:00
Chad Pilkey
6065a1e7a7 added a bindable property to access the client's handraise state 2013-06-04 10:28:40 -07:00
Felipe Cecagno
11f1097f66 fix #1530 
fixed the code that prioritize a video window when the user clicks on it
 2013-06-03 22:01:22 -03:00
Chad Pilkey
d7c625ad49 moderators can have their audio locked again 2013-06-03 14:50:06 -07:00
Richard Alam
e2eb276450 Merge pull request #166 from SenecaCDOT-BigBlueButton/fix-the-tooltips 
Fix the tooltips
 2013-06-03 11:20:44 -07:00
Chad Pilkey
6d5956055b Merge remote branch 'upstream/master' into fix-the-tooltips 2013-06-03 11:17:09 -07:00
Chad Pilkey
b6394ba39f cleaned up some of the localisation strings 2013-06-03 11:16:44 -07:00