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
Felipe Cecagno
89eb28393e
include extra recording events to bbb-webhooks ( fix #257 )
2016-06-12 22:32:11 -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
eed8a390c7
Merge branch 'issue-257' into mconf-live0.7.5
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
2016-06-10 17:51:27 -03:00
Felipe Cecagno
78fb35833d
refactor the way bbb-web publishes on redis the events of publish, unpublish and delete of recordings
2016-06-10 17:48:09 -03: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
Fred Dixon
ad746beb5d
Merge pull request #3137 from ffdixon/v1.0.x-release
...
Added blank pages to defaut.pdf for whiteboard
2016-05-14 09:50:55 -04:00
Fred Dixon
6964f69acd
Added blank pages to defaut.pdf for whiteboard
2016-05-14 09:49:50 -04:00
Fred Dixon
fdafa590fa
Merge pull request #3136 from ffdixon/v1.0.x-release
...
Move from 1.0-RC to 1.0
2016-05-14 09:47:37 -04:00
Fred Dixon
2a5469f269
Move from 1.0-RC to 1.0
2016-05-14 09:45:26 -04:00
Richard Alam
c1fbc94320
Merge pull request #3134 from ritzalam/update-locales-may-11-2016
...
Update locales may 11 2016
2016-05-12 11:28:23 -04: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
Richard Alam
40ae49ab7e
Merge pull request #3120 from capilkey/1.0-client-fixed
...
1.0 client fixes
2016-05-06 10:29:17 -04: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
Leonardo Crauss Daronco
427a288dfe
Fix clicks on the thumbnails in the playback page
...
Wasn't binding to events in the proper order, causing cliks in a thumbnail
not to behave properly.
2016-04-29 16:11:48 -04:00
Leonardo Crauss Daronco
0d5bda9d73
Improve playback buttons and update colors in the playback page
...
Bigger and more well spaced buttons, specially in small screens.
Also updated the colors to match the latest design definitions.
2016-04-29 15:59:45 -04:00
Leonardo Crauss Daronco
af27a69ef8
Fix playback of recordings not loading on firefox mobile
...
The event "loadeddata" is only triggered on firefox mobile once the
video/audio is played, so it requires the user to click on the play button
for it to be triggered.
The playback page was waiting for the event to be triggered before
removing the "loading" page, and that would never happen on firefox mobile.
Now we don't wait anymore for the video to be loaded, we just wait for
the slides and the initial setup.
2016-04-28 18:55:09 -04:00
Leonardo Crauss Daronco
6094c8ceee
Stack recording playback components when in portrait mode
2016-04-28 14:35:47 -04:00
Leonardo Crauss Daronco
2b20824b99
Small fix/protection in the js of the playback page
2016-04-28 10:36:39 -04:00
Leonardo Crauss Daronco
f35c010864
Fix the slide size on video/presentation swap in a paused playback
...
Resize the slides after swapping presentation and video, so that it fits
the new region properly.
2016-04-27 16:20:31 -04:00
Leonardo Crauss Daronco
488734abc1
Add protections to the js and improve the swap in the playback page
...
When swapping video and presentation now the presentation is updated
properly, before it would not show any slide until there was a slide
change.
Also added a few protections to prevent js code from breaking.
2016-04-27 15:53:39 -04:00
Leonardo Crauss Daronco
b55a7c4ad5
Show BigBlueButton's logo in the playback page as bg when loaded
2016-04-27 11:13:36 -04:00
Leonardo Crauss Daronco
1a3b5381d4
Fix pan and zoom in the responsive playback page
...
When pan/zoom was done, the image would zoom and move inside the svg, that
occupied a larger area than the viewbox we wanted to show.
Had to control the size of the container that has the svg via javascript,
to make it exactly the size we want to display the presentations and with
this crop all parts of the presentation that lie outside the container.
2016-04-27 10:46:29 -04:00
Leonardo Crauss Daronco
a3afed36fe
Better visual for copyright and chat in the playback page
...
Small changes in text formatting and positioning.
2016-04-26 19:04:27 -04:00
Leonardo Crauss Daronco
2778768521
Fix cursor position in the playback page when the sidebar is open
...
The cursor was being moved to the right more than it should when the
sidebar was opened.
2016-04-26 17:58:54 -04:00
Leonardo Crauss Daronco
7fb5b134db
Fix recording playback layout when there's no video
2016-04-26 17:53:11 -04:00
Leonardo Crauss Daronco
eb1940d4e3
Set the meeting name as title in the recording playback page
2016-04-26 17:14:41 -04:00
Leonardo Crauss Daronco
327a63bd9f
Move the copyright msg to the bottom in the rec playback page
...
And some small improvements in the thumbnails.
2016-04-26 16:36:37 -04:00
Leonardo Crauss Daronco
59842c7134
Add thumbnails to the responsive recording playback page
2016-04-26 16:18:42 -04:00
Leonardo Crauss Daronco
f0b511baf5
Fix cursor positioning in the recording playback page
...
Wasn't being shown after the page was made responsive. Now it shows up
in the correct place and disappears when not necessary.
2016-04-26 14:03:24 -04:00
Leonardo Crauss Daronco
af5e9fc2d5
Better and more consistent rec playback layout for small/large screens
2016-04-25 18:24:56 -04:00
Richard Alam
4c437aebb7
Merge pull request #3087 from capilkey/1.0-access-bugfix3
...
Third round of 1.0 accessibility bug fixes
2016-04-19 15:38:56 -04: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
Fred Dixon
694d25f846
Merge pull request #3083 from ffdixon/move-to-rc
...
Change from 1.0.0-Beta to 1.0.0-RC
2016-04-13 17:16:00 -04:00
Fred Dixon
7dc0871a28
Change from 1.0.0-Beta to 1.0.0-RC
2016-04-13 17:14:40 -04:00
Fred Dixon
58fe07a77e
Merge pull request #3082 from ffdixon/fix-3081-cron-job
...
Fixes 3081
2016-04-10 18:22:44 -04:00
Fred Dixon
e8243e0f9f
Fixes 332
2016-04-10 18:18:41 -04:00
RafaFP
fd1ee65bb2
improved avoid multiple wav files by removing critical section race condition issue
2016-04-08 18:23:23 +00:00
Fred Dixon
af5c97e159
Merge pull request #3080 from ritzalam/update-locales-apr-6-2016
...
Updating locales
2016-04-06 15:04:05 -04:00