Commit Graph

6455 Commits

Author SHA1 Message Date
Richard Alam
a88898215f - start refactoring layout application 2013-09-30 21:13:20 +00:00
Richard Alam
bad2631de7 - add gradle properties file to externalize version numbers 2013-09-30 18:09:21 +00:00
Richard Alam
78be69ecc8 - add spring rabbit, integrations, data-redis dependencies 2013-09-30 18:08:40 +00:00
Richard Alam
e878600ef6 Merge branch 'new-polling-feature' into play-with-spring-amqp 2013-09-30 15:03:21 +00:00
Richard Alam
d8ae699a36 - update gradle build 2013-09-27 17:43:32 +00:00
Richard Alam
4bc735e1ef Merge branch 'upgrade-to-grails-2.3' into embed-flash-client-in-another-app 2013-09-23 20:42:50 +00:00
Richard Alam
f2ce380a57 - skip check for cam setting even when starting sharing manually 2013-09-23 19:20:09 +00:00
Richard Alam
8a137a61ae Merge branch 'master' into new-polling-feature 2013-09-23 15:56:32 +00:00
Richard Alam
c1d30dc72b - add config param to skip camera settings check 2013-09-23 15:24:07 +00:00
Richard Alam
129b281982 - star refactoring meeting service 2013-09-20 21:12:23 +00:00
Richard Alam
e173bfe682 - cleanup 2013-09-20 20:21:34 +00:00
Richard Alam
f851cbc449 - add build file 2013-09-20 19:50:02 +00:00
Richard Alam
827709edd1 - add .gitignore 2013-09-20 19:49:40 +00:00
Richard Alam
9616b073c9 - add .gitignore to meeting-service project 2013-09-20 19:48:58 +00:00
Richard Alam
e3cb7f3368 - remove .gitignore from ignored files as it ignores .gitignore files in children dirs 2013-09-20 19:47:49 +00:00
Richard Alam
ae15249281 - extract meeting classes from bbb-web 2013-09-20 19:38:48 +00:00
Richard Alam
f6b5959992 Merge branch 'master' into embed-flash-client-in-another-app 2013-09-19 21:27:52 +00:00
Richard Alam
252d7129a7 - fix race condition where video share button doesn't show up somtimes when presenterShareOnly=true 2013-09-19 17:27:30 +00:00
Richard Alam
9d0fa68ed7 - add the dependency jars 2013-09-18 18:41:50 +00:00
Richard Alam
7b3a6b9054 - setup a new bbb-web-api project for grails 2.3 2013-09-18 18:41:02 +00:00
Richard Alam
dd367c2941 Merge branch 'master' into upgrade-to-gradle-1.7 2013-09-17 18:13:11 +00:00
Richard Alam
a939588df8 - upgrade to gradle 1.7
STEPS
cd ~/dev/tools
wget http://services.gradle.org/distributions/gradle-1.7-bin.zip
unzip gradle-1.7-bin.zip
ln -s gradle-1.7 gradle
vi ~/.profile

export GRADLE_HOME=$HOME/dev/tools/gradle
export PATH=$PATH:$GRADLE_HOME/bin

source ~/.profile
2013-09-17 18:10:52 +00:00
Richard Alam
fc4382d626 - fix problem where no one can share when presenterShareOnly is set to TRUE 2013-09-16 21:27:47 +00:00
Richard Alam
35ae1a5720 - cleanup and add header 2013-09-16 20:57:06 +00:00
Richard Alam
1f4149e859 - move all of BigBlueBUtton.mxml code into a panel to be embedded in another app 2013-09-16 18:09:41 +00:00
BigBlueButton
03614548eb - Move BBB UI into panel so it's easy to embed into another flash app
- Need to move other initialization code from BigBlueButton.mxml
2013-09-16 17:50:15 +00:00
Richard Alam
9dcdedcf55 - fix issue where question is displayed as multiple choice when it's supposed to be multi-select 2013-09-13 18:24:14 +00:00
Richard Alam
1db314c60a - remove poll from display when deleted. 2013-09-13 17:51:29 +00:00
Richard Alam
300287e71d - just rename the directory 2013-09-13 15:37:25 +00:00
Richard Alam
817a86637f - add init.d script for bbb-callback 2013-09-13 15:34:51 +00:00
Richard Alam
8ac1beb606 - add show and hide poll result messages 2013-09-12 18:13:49 +00:00
Richard Alam
090f7e44d0 - automatically share presentation when completing conversion. This is a workaround where there is a race
condition between creating the meeting and processing pre-uploaded presentations.
2013-09-12 15:46:12 +00:00
Ubuntu
1dccf2fbb3 Merge branch 'master' into new-polling-feature 2013-09-11 19:28:12 +00:00
Ubuntu
be264746b8 Merge branch 'new-polling-feature' into redis-backed-bbb-live-data 2013-09-11 19:18:01 +00:00
Richard Alam
9f8f7fa419 Merge pull request #251 from SenecaCDOT-BigBlueButton/fix-issue-1611
removed the colour change from the chat item renderer and improved the layout when there's a long name
2013-09-11 12:00:13 -07:00
Chad Pilkey
dfe2bfd6de removed the colour change from the chat item renderer and improved the layout when there's a long name 2013-09-09 14:27:10 -07:00
Richard Alam
d402f7b333 Merge branch 'master'
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
2013-09-09 18:42:21 +00:00
Fred Dixon
6b95448865 Merge pull request #249 from SenecaCDOT-BigBlueButton/fix-logout-window-localisation
added two strings in the log out window to locales
2013-09-04 15:11:04 -07:00
Chad Pilkey
dfc444ab6f added two strings in the log out window to locales 2013-09-04 15:01:23 -07:00
Nadia Noori
c2c344ed79 Changing lable to RC1 2013-09-04 14:24:19 -04:00
Richard Alam
d514465e3b Merge pull request #246 from bigbluebutton/fix-logout-url-call
Logout URL was never called when API signOut call fail.
2013-09-04 08:26:26 -07:00
Fred Dixon
be5c2c5433 Merge pull request #248 from SenecaCDOT-BigBlueButton/fix-chattab-localization
Fix chattab localization
2013-09-03 15:36:33 -07:00
Chad Pilkey
e8ef9f3b1a added check to make sure tabs exist 2013-09-03 15:34:45 -07:00
Chad Pilkey
6ab6ec3ec3 the Public and Option chat tabs now match the selected locale at all times 2013-09-03 15:24:52 -07:00
Gustavo Salazar
2007d6d7bb delete transifex dir in locales 2013-09-02 13:59:36 -05:00
Gustavo Salazar
214cef8c1c Merge pull request #247 from jent46/master
Update locales
2013-09-02 11:05:42 -07:00
jent46
8e8e162c7c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-09-02 10:45:34 -07:00
jent46
8561c02d18 update locales 2013-09-02 10:44:52 -07:00
Tiago Daniel Jacobs
3d9cd8b63d Logout URL was never called when API signOut call fail. 2013-08-30 21:17:44 -03:00
Fred Dixon
7949c6af9a Merge pull request #245 from jent46/master
fix issue in the demo10_helper.
2013-08-30 17:06:35 -07:00