Commit Graph

5915 Commits

Author SHA1 Message Date
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
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
Fred Dixon
ba7ba649b2 Added direct link to developer video 2013-06-02 04:27:54 -07:00
Richard Alam
482972a309 - add raise hand JS api 2013-05-31 20:55:12 +00:00
Tyler Copeland
067e33d64b Updated images on demo landing page 2013-05-31 16:42:06 -04:00
Tyler Copeland
663dcac797 demo landing page updates 2013-05-31 16:38:44 -04:00
Richard Alam
0435c2ef06 - fix display kick button 2013-05-31 18:10:19 +00:00
Calvin Walton
085294af6d Fix typo 'defaulLayout' in join parameters 2013-05-30 17:47:26 -04:00
Richard Alam
253563b7ec - clean up client output dir 2013-05-30 21:45:04 +00:00
Richard Alam
8fec851cb4 - fix switch presenter displaying of the button on the video windows 2013-05-30 20:14:32 +00:00
Richard Alam
b2545ee5d7 - pass the avatarURL into some of the events for JS API 2013-05-30 20:01:58 +00:00
Richard Alam
870b2b97d9 - force hangup of user when he leaves the meeting. When users call in through the phone, they don't get ejected
from the meeting when they logout.
2013-05-29 20:37:09 +00:00
Richard Alam
6ea934b7f1 - fix regexp matching for voice userid 2013-05-29 20:35:07 +00:00
Richard Alam
4bdc8b90ab - display presenter icon for moderators who is not presenter 2013-05-29 18:32:52 +00:00
Richard Alam
c8f1a89e7a - notify 3rd-party apps when a user has been kicked out passing the userID 2013-05-29 16:06:02 +00:00
Richard Alam
19d8cb4ddd - allow removing of close button from config.xml 2013-05-28 17:15:12 +00: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
dd6358cf92 - reset videoHolder dimensions and position to display properly when user publish,stop, then publish webcam 2013-05-28 16:19:38 +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
Markos Calderon
ffbabcf51d remove and add strings for the localization file 2013-05-27 17:56:48 -05:00
Fred Dixon
bac46b09ef Slight refactoring of getJoinURLwithDynamicConfigXML() to make consistent with other functions in bbb_api.jsp 2013-05-26 11:09:13 -07:00
Richard Alam
a2846271a2 - fixed problem where senders message gets displayed on all tabs in his private chat message window 2013-05-25 20:54:03 +00:00
Richard Alam
8afdc50c9b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-05-25 19:56:23 +00:00