BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,774 Commits 13 Branches 260 Tags 1.1 GiB
25ff17d906
Commit Graph

9774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
25ff17d906 Merge branch '090-guest-role' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-25 21:01:10 -02:00
Felipe Cecagno
7dba55cdbb new set of icons for guest management 2015-01-25 20:52:41 -02:00
Felipe Cecagno
f6d6e4e40c Merge branch '090-guest-role' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2015-01-25 18:36:30 -02:00
Felipe Cecagno
3a89cab752 Merge branch '090-java-detection' into mconf-live0.6.2 2015-01-25 18:20:48 -02:00
Felipe Cecagno
b7130a379f Merge branch '090-java-detection' into HEAD 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
 2015-01-25 18:19:13 -02:00
Felipe Cecagno
89de32ad1a Merge branch 'smooth-toolbar-transition' into mconf-live0.6.2 2015-01-25 17:45:14 -02:00
Felipe Cecagno
b0f39a6ab3 Merge branch 'smooth-toolbar-transition' into HEAD 2015-01-25 17:44:56 -02:00
Felipe Cecagno
8b36827e13 Merge branch '090-white-startup' into mconf-live0.6.2 2015-01-25 17:33:00 -02:00
Felipe Cecagno
7978bf7aa0 Merge branch '090-white-startup' into HEAD 2015-01-25 17:32:29 -02:00
Felipe Cecagno
4a2eac0b94 Merge branch '090-network-monitor' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-25 17:31:07 -02:00
Felipe Cecagno
50a6e9ed4e changed the icon set for the network monitor feature 2015-01-25 17:29:03 -02:00
Felipe Cecagno
b2cd417049 Merge branch '090-network-monitor' into HEAD 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/resources/config.xml.template
 2015-01-25 16:26:11 -02:00
Felipe Cecagno
899cfd1358 Merge branch '090-multinotes' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
 2015-01-25 12:50:49 -02:00
Felipe Cecagno
d76337fe6a changed the icons set for the shared notes window 2015-01-25 12:45:00 -02:00
Felipe Cecagno
2c255dc9ae Merge branch '090-multinotes' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
 2015-01-25 12:12:53 -02:00
Felipe Cecagno
a7e286ae33 Merge branch '090-mconf-branding' into mconf-live0.6.2 2015-01-25 12:00:59 -02:00
Felipe Cecagno
0843ec1361 Merge branch '090-mconf-branding' into HEAD 
Conflicts:
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-config/web/default.pdf
 2015-01-25 11:59:45 -02:00
Felipe Cecagno
68b6a4ea8c Merge branch '090-logout-url' into mconf-live0.6.2 2015-01-25 11:49:25 -02:00
Felipe Cecagno
9aa9dd356a Merge branch '090-logout-url' into HEAD 2015-01-25 11:48:45 -02:00
Felipe Cecagno
1289e8a41e Merge branch '090-get-recordings-metadata-filter' into mconf-live0.6.2 2015-01-25 00:44:52 -02:00
Felipe Cecagno
f7225848c9 Merge branch '090-get-recordings-metadata-filter' into HEAD 2015-01-25 00:44:14 -02:00
Felipe Cecagno
9f7ec7068b Merge branch '090-fullscreen' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-01-24 23:45:14 -02:00
Felipe Cecagno
d4422f8591 changed the full screen button icon; using a different icon to enter and exit the full screen mode; removed the vertical gap of the main application shell 2015-01-24 23:43:05 -02:00
Felipe Cecagno
0ee4905b69 Merge branch '090-fullscreen' into HEAD 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-01-24 17:53:42 -02:00
Felipe Cecagno
df1fe03c29 Merge branch '090-expanded-status' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-24 17:48:19 -02:00
Felipe Cecagno
e65fa1d28e Merge branch '090-expanded-status' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-24 17:34:53 -02:00
Felipe Cecagno
703d206b0d Merge branch '090-download-presentation' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-24 17:20:35 -02:00
Felipe Cecagno
3cf904d8d7 replaced some icons from the presentation module by the google's material design icons 2015-01-24 17:18:30 -02:00
Felipe Cecagno
b86efc9119 Merge branch '090-download-presentation' into HEAD 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2015-01-24 16:44:26 -02:00
Felipe Cecagno
2b59824075 Merge branch '090-download-chat' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2015-01-24 16:39:47 -02:00
Felipe Cecagno
6746cf0b26 reduce the padding between chat messages 2015-01-24 16:37:30 -02:00
Felipe Cecagno
12bf57bbce changed the chat renderer so the name doesn't get truncated when a message is first presented 2015-01-24 16:29:03 -02:00
Felipe Cecagno
488faed991 Merge branch '090-download-chat' into HEAD 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
 2015-01-24 16:28:08 -02:00
Felipe Cecagno
00dedc4396 fix the visibility of the close button for the main shared notes window 2015-01-24 15:39:02 -02:00
Felipe Cecagno
e0acedce5f Merge branch '090-change-role' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
 2015-01-23 17:57:22 -02:00
Felipe Cecagno
4a8667ca28 Merge branch '090-change-role' into HEAD 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
 2015-01-23 17:50:18 -02:00
Felipe Cecagno
408e573478 Merge branch '090-branding-logo' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2015-01-23 15:43:52 -02:00
Felipe Cecagno
e44e65dc70 Merge branch '090-branding-logo' into HEAD 2015-01-23 15:42:06 -02:00
Felipe Cecagno
f2d1e24580 Merge branch '090-audio-video-on-api' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java
 2015-01-23 15:36:52 -02:00
Felipe Cecagno
1ea57596d0 Merge branch '090-audio-video-on-api' into HEAD 2015-01-23 15:05:18 -02:00
Felipe Cecagno
38e27ecfca Merge branch '090-presentation-export' into mconf-live0.6.2 
Conflicts:
	record-and-playback/deploy.sh
 2015-01-23 14:50:06 -02:00
Felipe Cecagno
871705d38a cleanup 2015-01-23 14:17:07 -02:00
Felipe Cecagno
1255f4520f made presentation_export a post_publish script 2015-01-23 14:11:45 -02:00
Felipe Cecagno
b3daaf72b3 Merge branch 'presentation-export' into 090-presentation-export 2015-01-22 15:58:16 -02:00
Felipe Cecagno
2761c31e52 Merge branch '090-encrypted-recording' into mconf-live0.6.2 
Conflicts:
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2015-01-21 18:11:56 -02:00
Felipe Cecagno
8e12c909c5 Merge branch '090-encrypted-recording' into HEAD 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/core/Gemfile
	record-and-playback/deploy.sh
 2015-01-21 15:51:29 -02:00
Fred Dixon
ab9753344a Merge pull request #489 from bigbluebutton/update-spanish-locales 
- update locales from transifex
 2015-01-20 13:52:51 -05:00
Richard Alam
26c6ca0fd1 - update locales from transifex 2015-01-20 18:47:19 +00:00
Fred Dixon
39e9ccf1e5 Merge pull request #488 from bigbluebutton/update-locales-jan-20-2015 
- updating locales
 2015-01-19 17:17:04 -05:00
Richard Alam
95776a62bd - updating locales 2015-01-19 18:38:00 +00:00