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
Richard Alam
2d4d1a1b66
- fix bean wirings
2013-06-07 18:54:09 -04:00
Richard Alam
0dccadbbd6
- move things around
2013-06-07 18:21:32 -04:00
Richard Alam
24361c77f7
- get it to compile
2013-06-07 17:54:32 -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
Richard Alam
e02777fa4f
Merge branch 'master' into merge-polling-module
2013-06-07 17:28:53 -04:00
Richard Alam
424ffdb993
Merge branch 'mod-client-communication' into merge-client-invoke
...
Conflicts:
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
2013-06-07 17:27:17 -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
Markos Calderon
689dde4318
initial changes for api callbacks
2013-06-07 15:47:18 -05:00
Richard Alam
14b6de6577
- move things around
2013-06-07 16:23:31 -04:00
Jesus Federico
e8d7b2f71e
Fixed a bug on full name composition
2013-06-07 16:07:40 -04:00
Richard Alam
62a98fd594
- rename to be consitent with meeting domain
2013-06-07 15:26:24 -04:00
Richard Alam
e23bc094c0
- break down spring config into smaller components so it's easier to maintain
2013-06-07 14:58:26 -04:00
Richard Alam
9e2f8a4e5e
- slowly restructure apps
2013-06-07 14:32:13 -04:00
Richard Alam
7b9a24c825
- separate send and receiver for redis pubsub
2013-06-07 13:57:18 -04:00
Richard Alam
212a2bd156
- refactor redis messaging
2013-06-07 11:56:01 -04:00
Richard Alam
575025a828
Merge branch 'polling-module' into merge-polling-module
2013-06-07 09:43:39 -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
Markos Calderon
8ca16a3953
updating bbb-apps to handle polls
2013-06-06 18:53:57 -05:00
Richard Alam
09a008b601
- setup poll messages
2013-06-06 18:04:26 -04: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
Markos Calderon
7f748fd809
reading polls from create API call
2013-06-05 17:56:03 -05: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
Markos Calderon
47eadc0fe5
Adding poll models
2013-06-04 19:13:54 -05: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
