Commit Graph

1043 Commits

Author SHA1 Message Date
Jeremy Thomerson
596cac75f2 work on join meeting call
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2613 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:47:50 +00:00
Jeremy Thomerson
c84d23244d more work on dynamic conferencing api
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2612 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:20:00 +00:00
Jeremy Thomerson
c002986fd1 change url mapping for my api so as not to conflict with richard's and fix bug in create method returning duplicate xml
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2611 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 03:33:24 +00:00
Jeremy Thomerson
2a50f468a1 updating svn ignore on trunk
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2610 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 03:19:28 +00:00
Jeremy Thomerson
71f4dfa7f0 updating svn ignore on trunk
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2609 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 03:19:24 +00:00
Jeremy Thomerson
4b3102e521 merging my branch into trunk
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2608 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 03:00:15 +00:00
Richard Alam
f3c8ee1055 - cleanup, convert println to log
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2601 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:28:56 +00:00
Richard Alam
7ac215b5c5 - modify adhoc controller so it supports xml, form, and json requests
- create a demo on how to call it using jquery

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2600 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:20:19 +00:00
Richard Alam
2e57f81df1 - fix logging
- put logs in /tmp/logs

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2599 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:13:53 +00:00
Richard Alam
cbeb98c867 - setup demo for creating adhoc conf
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2598 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-23 19:56:44 +00:00
Jeremy Thomerson
819d61ebe8 adding XML API source document
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2592 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-23 05:22:23 +00:00
Jeremy Thomerson
c37f52013d update svn ignore to ignore build artifacts and fix .classpath for groovy 1.6.4
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2589 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 22:42:32 +00:00
Jeremy Thomerson
0338f058c0 updating groovy version on trunk to correct version
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2585 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 22:18:13 +00:00
Richard Alam
a589578751 - upgrade groovy to 1.6.4
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2577 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 14:37:52 +00:00
Richard Alam
e3f9a3dba0 - checkin jsecurity 0.4.1
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2576 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 14:23:57 +00:00
Richard Alam
ac32baf6bf - checking in adhoc REST api
- moving to jsecurity 0.4.1


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2572 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-21 20:45:55 +00:00
Richard Alam
f76afe580d - upgrade to grails 1.1.1
- upgrade to jsecurity 0.4
- merge portal controller from Jeremy
- start implement adhoc conference api

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2570 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-20 19:19:50 +00:00
Richard Alam
04ee18e5ce - svn keywords
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@7 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
2009-09-17 14:09:25 +00:00
Fred Dixon
47d2257ec0 desktop sharing icon
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2505 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-15 16:34:24 +00:00
Fred Dixon
de22dd837b reverted bacy to build 1887 for 0.61 release
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2491 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-15 12:27:25 +00:00
Denis Zgonjanin
c2d1578afc fixed issue 183
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2490 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-15 09:12:41 +00:00
Fred Dixon
59ca9890da updated ivysettings in bbb-apps-video
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2489 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-15 00:20:17 +00:00
Fred Dixon
15e52ce95a revert to 2404
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2488 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-15 00:00:05 +00:00
Richard Alam
a78fb03924 - remove addChild for video conf
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2487 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 18:12:59 +00:00
Denis Zgonjanin
f88627a950 Hopeful fix to issue 127
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2486 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 16:51:15 +00:00
Denis Zgonjanin
bcaa64deb5 changed play icon in the video module
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2485 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 16:27:13 +00:00
Richard Alam
ecdb39000e - change the location of logs
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2484 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 16:17:16 +00:00
Denis Zgonjanin
31176dceaa Chenged slider max zoom to 250
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2483 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 15:54:50 +00:00
Richard Alam
2176fb67d5 - resize slider back to 150 from 600
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2482 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 14:53:11 +00:00
Denis Zgonjanin
944b648243 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2481 af16638f-c34d-0410-8cfa-b39d5352b314 2009-09-14 14:09:43 +00:00
Denis Zgonjanin
9bdf0ce3ef Work on highlighter module, bug fixes for 0.61 UI bugs
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2480 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 13:49:36 +00:00
Fred Dixon
5fa71b60dc updates to bbb_banner.jpg
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2479 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 09:50:58 +00:00
Fred Dixon
b06fff789a updates to landing page
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2478 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 09:38:36 +00:00
Fred Dixon
72cbb9fed5 updates to landing page
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2477 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 09:32:17 +00:00
Fred Dixon
eccdf6e29a updates to landing page
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2476 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 09:31:20 +00:00
Fred Dixon
bfd9146d8c removed ambuigity in index page for entering name and password
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2469 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-12 08:36:02 +00:00
Denis Zgonjanin
acc0faa5ce Small refactorings, changes to DeskShare UI
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2468 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-12 01:16:04 +00:00
Richard Alam
764e2ef017 changed resolution to 1280
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@6 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
2009-09-12 01:12:37 +00:00
Richard Alam
1757f1b875 modified maximum screen size for deskshare to test
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@5 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
2009-09-11 21:38:51 +00:00
Richard Alam
ce34b94132 increase zoom
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2467 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-11 21:24:47 +00:00
Richard Alam
75abe5dab3 - don't resize screen capture size
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@4 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
2009-09-11 21:02:48 +00:00
Richard Alam
013b6ea7df commiting deskshare app
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@3 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
2009-09-11 20:04:59 +00:00
Richard Alam
bee6ba317f Initial import.
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@2 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
2009-09-11 20:02:21 +00:00
Richard Alam
123aab7758 - modify logging layout
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2466 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-11 18:54:18 +00:00
Richard Alam
51ffec86ed - change jmsTemplate to messageListener (see http://www.theserverside.com/news/thread.tss?thread_id=37740)
- fix logback.xml

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2465 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-11 18:37:25 +00:00
Richard Alam
1a297b0dc4 initial view
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@1 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
2009-09-11 16:10:53 +00:00
Richard Alam
9cd2e5dbae - add headers
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2464 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-11 16:09:54 +00:00
Richard Alam
d861ee94ca - add header
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2463 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-11 16:01:51 +00:00
Richard Alam
53bcfac046 - add headers
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2462 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-11 16:00:07 +00:00
Richard Alam
a6d7131849 - show deskshare button when participant is presenter
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2461 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-11 14:15:32 +00:00