BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,483 Commits 13 Branches 260 Tags 1.1 GiB
0a802d63db
Commit Graph

4983 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
0a802d63db This fixes issue #328. Empty polling button when changing presenter 2016-06-23 17:54:49 +00:00
Pedro Beschorner Marin
4373a59a05 Reverting some line ending changes made in while merging 2016-06-23 12:48:02 +00:00
Pedro Beschorner Marin
c2b69e885c Merge remote-tracking branch 'rafael/fix-1670' into rafafp-branches-merged-1.0 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/SharedNotesRichTextEditor.mxml
 2016-06-22 14:34:24 +00:00
Pedro Beschorner Marin
78313fda46 Merge remote-tracking branch 'rafael/feature-1944' into rafafp-branches-merged-1.0 2016-06-22 14:23:59 +00:00
Pedro Beschorner Marin
4c432ee5bd Merge branch 'feature-1931' into rafafp-branches-merged-1.0 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatToolbar.mxml
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-06-22 13:06:51 +00:00
Pedro Beschorner Marin
9500542944 Cleanup 2016-06-21 21:06:55 +00:00
Pedro Beschorner Marin
cbef362744 Merge remote-tracking branch 'rafael/fix-1825-with-feature-1827' into rafafp-branches-merged-1.0 2016-06-21 15:38:25 +00:00
Pedro Beschorner Marin
e12af55dc8 Merge remote-tracking branch 'rafael/fix-1969' into rafafp-branches-merged-1.0 2016-06-21 14:14:00 +00:00
Pedro Beschorner Marin
e47cd67903 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 
Conflicts:
	bbb-video/build.gradle
	bbb-voice/build.gradle
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	deskshare/app/build.gradle
	deskshare/build.gradle
 2016-06-20 16:11:04 +00:00
Pedro Beschorner Marin
17fc566975 Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0 
Conflicts:
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
	bigbluebutton-config/web/default.pdf
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2016-06-17 18:00:51 +00:00
RafaFP
f8af8852e6 Revert "removing unnecessary parameter from LayoutEvent" 
We actually need that parameter

This reverts commit 9ee0317d94.
 2016-06-14 20:48:23 +00:00
Felipe Cecagno
f9cb88a1f5 Merge remote-tracking branch 'RafaFP/fix-1822' into mconf-live0.7.5 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2016-06-13 16:42:51 -03:00
Felipe Cecagno
fa18948ce6 add proper tooltip to the presentation download button when it's disabled 2016-06-13 12:07:03 -03:00
Felipe Cecagno
0b26840403 Merge remote-tracking branch 'RafaFP/feature-1851' into mconf-live0.7.5 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2016-06-13 11:44:04 -03:00
Felipe Cecagno
f0fd4de8f4 Merge remote-tracking branch 'RafaFP/fix-1852' into mconf-live0.7.5 2016-06-12 22:35:53 -03:00
RafaFP
9ee0317d94 removing unnecessary parameter from LayoutEvent 2016-06-10 23:08:39 +00:00
RafaFP
d23fcbdf43 updatdated the solution for custom layout naming and saving to reflect the comments: 
- replaced unnecessary popup windows with simplified alerts
- improved the logic used to compare pre-defined layout names
 2016-06-10 22:44:21 +00:00
Felipe Cecagno
43082d04ec remove limit of 32 characters for layout names and the restriction of only letters and numbers; define fixed with for layouts combobox 2016-06-06 17:55:48 -03:00
Felipe Cecagno
e2168fdc2b Merge remote-tracking branch 'RafaFP/feature-1826' into mconf-live0.7.4 2016-06-06 16:57:57 -03:00
Felipe Cecagno
23492e76ca define toolbar color and alphas through config.xml 2016-06-03 13:52:14 -03:00
RafaFP
a6d84e142c fix sharednotes scrolling back to user's cursor when receiving patches. #319 2016-06-02 19:34:03 +00:00
Richard Alam
b2a4a150c4 - add Occitan locale 2016-05-12 15:19:13 +00:00
Richard Alam
5719ab2973 - fix offending locale that breaks build 2016-05-11 17:55:01 +00:00
Richard Alam
1e203d2617 Merge branch 'v1.0.x-release' of github.com:bigbluebutton/bigbluebutton into v1.0.x-release 2016-05-11 17:35:45 +00:00
Richard Alam
a3838ec143 Update locales 
Update locales as of May 11, 2016.
 2016-05-11 17:35:04 +00:00
Chad Pilkey
ce1adcffc8 fix shortcut key inconsistencies 2016-05-05 16:15:09 -07:00
Chad Pilkey
c9486b6c5e fix issue #3088 2016-05-05 16:14:01 -07:00
Chad Pilkey
dc5bacc578 fix issue #3106 2016-05-03 10:09:30 -07:00
RafaFP
105c2ae9ee delete key will no longer generate a visible invalid character in sharednotes' and chatbox's textAreas 
refs #1670
 2016-04-19 19:03:05 +00:00
Chad Pilkey
fe53999164 Third round of 1.0 accessibility bug fixes 2016-04-19 09:17:14 -07:00
Richard Alam
b0d6cf51ef Updating locales 
Update locales as of Apr 6, 2016
 2016-04-06 18:59:41 +00:00
Fred Dixon
b9b23dc87b Merge pull request #3078 from capilkey/1.0-access-bugfix3 
Correction to #3074
 2016-04-05 18:54:11 -04:00
Chad Pilkey
8a5294b6b5 added callback getters to VideoWithWarnings 2016-04-05 14:36:24 -07:00
Richard Alam
6b6f1622dc Merge pull request #3073 from perroned/edge-as-chrome 
Fixes #3068 - Detecting Microsoft Edge as Google Chrome
 2016-04-05 14:04:37 -04:00
Richard Alam
d1c0a22a4a Merge pull request #3074 from capilkey/1.0-access-bugfix2 
Fixed some accessibility bugs in 1.0
 2016-04-05 14:03:37 -04:00
RafaFP
7b9e5328ca Fixed a message number of arguments incorrect bug. 
Fixed a type definition warning.

refs #1931
 2016-04-04 21:28:17 +00:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
perroned
eb5eb45669 Moves deskshare browser checks into central location 2016-04-02 19:59:58 -05:00
perroned
5ab6e5b960 Checks for Edge browser on deskshare publish window 2016-04-02 19:45:27 -05:00
perroned
088d3eb4cd Linker checks for Edge browser 2016-04-02 19:32:29 -05:00
perroned
6bce9350cb Adds Edge browser warning to en_US locale 2016-04-02 19:31:34 -05:00
RafaFP
6a93432709 implemented a button to give moderators the option to end the meeting when they logout 
refs #1944
 2016-03-29 20:55:23 +00:00
Ghaz Triki
618c01a442 Merge branch 'master' into close-popups-at-logout 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
 2016-03-16 08:15:59 +01:00
Richard Alam
3fca40ba36 Merge pull request #3053 from riadvice/fix-shortcuts-locale-switch 
Refresh the shortcuts ArrayCollection.
 2016-03-15 13:31:00 -04:00
Richard Alam
ab8055d11a Merge pull request #3052 from riadvice/client-improve 
Minor client improvements
 2016-03-15 13:29:55 -04:00
Ghaz Triki
d5bc96c668 Reverted back navigate to logout URL. 2016-03-11 23:04:05 +01:00
Ghaz Triki
e0273aac7d Containers created with PopUpManager and toolbars are removed from the display list when the user is logged out from the application. 2016-03-11 23:02:10 +01:00
Ghaz Triki
5608889fd0 - Extracted locales strings from views. (reverted from commit 0b32f39041) 
- Removed no more used ChromeChangeMicImage and FirefoxChangeMicImage.
 2016-03-11 22:00:14 +01:00
Ghaz Triki
d435f7dd55 Refresh the shortcuts ArrayCollection. 2016-03-11 17:48:25 +01:00
Ghaz Triki
0b32f39041 Extracted locales strings from views. 2016-03-11 17:33:30 +01:00