kreismann
e27c291ee0
Recording playback shows whiteboard annotations on deskshare video as well
...
Pending issues:
- Image and ViewBox sizes are hardcoded (1280x720 - a full screen deskshare video). In order to work with region deskshare videos, we must get the flvs resolutions and set shapes.svg and panzooms accordingly.
- We're not considering the deskshare annotations history yet
2016-11-29 15:08:28 -02:00
Pedro Beschorner Marin
c8acfbf65a
Getting slides associated text from a single JSON file
2016-11-29 14:00:19 +00:00
Felipe Cecagno
a05a7ca642
fix url for shared notes on config.xml
2016-11-20 21:21:26 -02:00
Felipe Cecagno
8f4ca962cc
Merge branch 'undo-stack-size' of github.com:pedrobmarin/bigbluebutton into mconf
...
Conflicts:
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
2016-11-20 21:20:16 -02:00
Felipe Cecagno
1ff4d5829e
Merge branch 'priority-video-aspect' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-20 21:19:16 -02:00
Felipe Cecagno
f8b2107ec5
Merge branch 'fix-354' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-20 21:15:47 -02:00
Felipe Cecagno
3511120022
Merge branch 'fix-38' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-20 19:23:26 -02:00
Felipe Cecagno
454f8d0284
update strings for the record button tooltip
2016-11-20 19:23:13 -02:00
Felipe Cecagno
7d0d27f020
Merge branch 'wont-record-metadata' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-20 15:54:38 -02:00
Felipe Cecagno
1014aa77fa
changed possible values for inactivity_deadline to (1 minute; 6 hours), and inactivity_timeleft to (30 seconds; 30 minutes); changed client strings related to inactivity
2016-11-20 15:50:42 -02:00
Felipe Cecagno
82a7945886
fix blur after the record notification on the first audio user
2016-11-20 00:56:31 -02:00
Felipe Cecagno
faba97fdee
Merge branch 'inactivity-metadata' of github.com:pedrobmarin/bigbluebutton into mconf
...
Conflicts:
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
2016-11-20 00:41:28 -02:00
Felipe Cecagno
0cba31fa24
cleanup unused images
...
used the following command line to find and remove:
```
for i in `find resources/ src/ -name "*.png" -o -name "*.jpg" -o -name "*.jpeg" -o -name "*.svg" -o -name "*.gif"`; do j=$(basename $i); if [ `grep -I "$j" . -R | wc -l` == 0 ]; then rm -f $i; fi; done
```
2016-11-20 00:02:12 -02:00
Felipe Cecagno
8a75219ad6
fix position of lock and unlock images in the user list; change emoji order
2016-11-19 23:44:10 -02:00
Felipe Cecagno
e13aba9184
Merge branch 'status-icons' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-19 23:07:43 -02:00
Felipe Cecagno
4fffca0638
revert to the previous implementation of the column width distribution in the user list, which is much simpler
2016-11-19 23:04:44 -02:00
Felipe Cecagno
158c1ffd89
fix column width in the users list
2016-11-19 22:57:39 -02:00
kreismann
9aef8832c7
Setting current whiteboard id on page change
2016-11-18 13:18:36 -02:00
kreismann
4d13d7e20f
Updating poll id and setting polling whiteboard id according to the poll Id
2016-11-17 16:04:19 -02:00
Pedro Beschorner Marin
e87420e44c
Fixed a maximum stack size for shared notes undo feature and refactored resync detection
2016-11-16 14:41:31 +00:00
kreismann
66deee9fb2
Fixing some race conditions
...
- whiteboard canvas is added to SlideView after a loaded page event;
- We don't load slide annotations while deskshare is active (this situation occurs only in a race condition)
2016-11-14 17:42:21 -02:00
Felipe Cecagno
7661289345
add pt_BR strings for the undo in the deskshare
2016-11-14 17:40:27 -02:00
Felipe Cecagno
132e4ebc0d
Merge branch 'sharednotes-undo' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-14 17:40:04 -02:00
Felipe Cecagno
92a7d32818
Merge branch 'client-audio-process' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-14 14:19:49 -02:00
Felipe Cecagno
4dbe313209
increase gap between icons in the media column to 8
2016-11-14 14:11:44 -02:00
Felipe Cecagno
91fbf63621
Merge branch 'users-buttons' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-14 14:09:46 -02:00
Felipe Cecagno
9ff6980f34
Merge branch 'apply-layout-to-moderators' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-14 13:20:49 -02:00
Felipe Cecagno
c831a0a8e7
Merge branch 'sharednotes-timer' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-14 13:19:08 -02:00
Felipe Cecagno
8dca32d23b
Merge branch 'mood-menu' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-14 13:16:17 -02:00
Felipe Cecagno
4ecd1adc9f
Merge branch 'fixed-presentation-minimizing' of github.com:pedrobmarin/bigbluebutton into mconf
2016-11-14 13:12:42 -02:00
kreismann
8720c9d954
Showing only the deskshare tab while deskshare is running
2016-11-11 15:01:03 -02:00
Pedro Beschorner Marin
888d51abbd
Removed unnecessary parameter initialization
2016-11-11 12:20:50 +00:00
kreismann
c7e0f9e5b0
Deskshare has its own whiteboard page
2016-11-10 18:20:00 -02:00
Pedro Beschorner Marin
6384b8c9e8
Priority video will care about its own aspect ratio when positioning itself at videodock
2016-11-10 20:18:40 +00:00
Pedro Beschorner Marin
a7fa62781f
Better handling no webcam scenarios. Reverted to the old disabling button logic because I couldnt justify myself any other way
2016-11-08 20:00:10 +00:00
Pedro Beschorner Marin
e288b8271e
Fixed videoconf autoStart-skipCheck race condition
2016-11-08 14:55:35 +00:00
Pedro Beschorner Marin
51dc8322f0
Fixed layout lock issues and adjusted shared notes minimized window bar layout
2016-11-07 16:40:21 +00:00
Pedro Beschorner Marin
7d43bed1ff
Renamed inactivity metadata ids to fit a naming pattern
2016-11-01 19:58:42 +00:00
Pedro Beschorner Marin
5ad77eda18
Client reading meeting metadata for wont record message
2016-11-01 19:44:56 +00:00
kreismann
c3b0bd46b2
Deskshare video positioning
...
Applying slide resizing algorithm to deskshare video as well. Also, removing deskshare-video-area.
2016-11-01 17:39:06 -02:00
Pedro Beschorner Marin
4331aaa8d6
Any sign of activity will interrupt and clean the inactivity warning message
2016-10-31 17:28:56 +00:00
Pedro Beschorner Marin
1e014f9298
Included metadata reading at server. Setting meeting timeleft and deadline as meta_inactivity-timeleft and meta_inactivity-deadline on create params
2016-10-31 16:51:07 +00:00
Pedro Beschorner Marin
5416d01dcc
Syncing note if a problem is detected while patching
2016-10-26 17:25:49 +00:00
Pedro Beschorner Marin
079c24a75f
An applause icon that better fit the other hand icons theme
2016-10-24 19:37:47 +00:00
Pedro Beschorner Marin
af7ba7caac
Added applause status and fixed icons dimensions and colors
2016-10-24 19:20:01 +00:00
Pedro Beschorner Marin
67189dff4e
Sending sharednotes undo and redo status with current documents message as client starts
2016-10-24 15:42:45 +00:00
Pedro Beschorner Marin
cc13708a27
Capturing CTRL-Z and CTRL-Y as undo and redo events
2016-10-24 13:04:55 +00:00
Pedro Beschorner Marin
c2decd1d2a
Cleanup
2016-10-21 19:46:32 +00:00
Pedro Beschorner Marin
ddd1459d4c
Refactored sharednotes UNDO operation and implemented REDO
2016-10-21 19:33:30 +00:00
Pedro Beschorner Marin
1eb1aea65e
More sofisticated control of sharednotes undo button
2016-10-20 19:56:57 +00:00
