Markos Calderon
|
7fb265e756
|
adding sanity check
|
2012-08-13 15:22:53 -05:00 |
|
Markos Calderon
|
b88fda975e
|
deleting wrong files
|
2012-08-06 11:36:15 -05:00 |
|
Richard Alam
|
0f6c6e8e4d
|
- add background and remove intial text
|
2012-08-03 19:36:17 +00:00 |
|
Richard Alam
|
bbbe924b22
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-08-03 19:35:21 +00:00 |
|
Richard Alam
|
e95e4c72f0
|
- figure out why we dispatch a text created event when mouse moves out of canvas
|
2012-08-03 19:04:15 +00:00 |
|
Gustavo Salazar
|
e523dbf9e6
|
Merge pull request #55 from mconf/video-playback-into-master
Video playback
|
2012-08-03 09:08:25 -07:00 |
|
Tiago Daniel Jacobs
|
6a8e5cf5f8
|
Initial commit of applet-jni test.
|
2012-08-03 07:22:16 -03:00 |
|
Markos Calderon
|
9b4a1b4815
|
Merge pull request #54 from bigbluebutton/fix-chat-url
Fix for event urls and support for https
|
2012-08-02 13:16:00 -07:00 |
|
Markos Calderon
|
2e8715988b
|
Fix for event urls and support for https
|
2012-08-01 18:55:50 -05:00 |
|
Gustavo Salazar
|
75e9b45db5
|
Set type to variable "filter"
|
2012-08-01 17:00:29 -05:00 |
|
Felipe Cecagno
|
e8dc780c37
|
integrated the video playback into master, but the whiteboard events playback, as well as the presentation playback, is not functional yet - it seems that the writing.js is broken on master, tried to fix it without success
|
2012-08-01 17:40:58 -03:00 |
|
Markos Calderon
|
309536977b
|
Merge pull request #51 from bigbluebutton/record-username
Added username for record in participants module
|
2012-07-31 15:37:00 -07:00 |
|
Markos Calderon
|
234078b09e
|
Added username for record in participants module
|
2012-07-31 15:34:56 -07:00 |
|
Richard Alam
|
306df55caa
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-07-31 20:03:53 +00:00 |
|
Richard Alam
|
c01b111c3c
|
- try to fix textbox resizing
|
2012-07-31 20:03:16 +00:00 |
|
Richard Alam
|
69c765cb6d
|
- try crating textbox for whiteborad
|
2012-07-31 19:42:19 +00:00 |
|
Fred Dixon
|
75264f4ca8
|
Reverted demo1.jsp back to original logic -- all users join as moderators
|
2012-07-31 14:05:34 -04:00 |
|
Richard Alam
|
c97f806154
|
- comment out some logs to test if we loose some lines when drawing rapidly
|
2012-07-31 17:19:51 +00:00 |
|
Richard Alam
|
3609d409df
|
- query for annotations when loading new page
|
2012-07-31 17:09:20 +00:00 |
|
Richard Alam
|
8d931eb94a
|
- setup toolbar properly when switching presenter
|
2012-07-31 15:49:10 +00:00 |
|
Richard Alam
|
405327d38d
|
Merge branch 'modify-wb-toolbar'
|
2012-07-31 15:02:10 +00:00 |
|
Richard Alam
|
3fb8c458e1
|
- fix buttons
|
2012-07-31 15:00:06 +00:00 |
|
Richard Alam
|
0f591f9d34
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-07-30 22:00:00 +00:00 |
|
Gustavo Salazar
|
b1c94c9262
|
Merge pull request #53 from gugat/fp11
Fp11
|
2012-08-01 14:13:26 -07:00 |
|
Gustavo Salazar
|
95d1a19e1e
|
Download playerglobal 11.2
|
2012-08-01 15:51:50 -05:00 |
|
Gustavo Salazar
|
6c3f430e88
|
Ask if h264 enabled.
|
2012-08-01 14:32:42 -05:00 |
|
Fred Dixon
|
f42a71742b
|
Merge pull request #52 from jfederico/master
Removed hardcoded url on demo_openid.jsp
|
2012-08-01 12:22:02 -07:00 |
|
jfederico
|
55621fc9b3
|
Removed the hardcoded url on demo_openid.jsp
|
2012-08-01 13:48:21 -04:00 |
|
Gustavo Salazar
|
7735ff6d62
|
build client for Flash Player 11
|
2012-07-31 17:49:09 -05:00 |
|
Richard Alam
|
578ef05915
|
- An example how to display textbox
|
2012-07-30 21:59:32 +00:00 |
|
Fred Dixon
|
55e5fd994d
|
Added for openID demo 2c0a2a3104
|
2012-07-30 13:51:42 -04:00 |
|
Fred Dixon
|
2c0a2a3104
|
Merge pull request #50 from jfederico/master
Added demo to join Demo Meeting using OpenID on Google and Yahoo
|
2012-07-30 10:50:32 -07:00 |
|
jfederico
|
93efd7dafe
|
Added demo_openid.jsp to join using OpenID on Google and Yahoo
Signed-off-by: jfederico <jesus@123it.ca>
|
2012-07-30 11:34:18 -04:00 |
|
Richard Alam
|
bdc83d7fdf
|
- separate whiteboard buttons
|
2012-07-30 04:36:45 +00:00 |
|
Richard Alam
|
b34029140f
|
- extract out each button to maintain easily
|
2012-07-30 02:57:42 +00:00 |
|
Richard Alam
|
a26962bf66
|
- don't listen for 'w' and 'd' key chars to enable/disable whiteboard as it consumes text types into text field
|
2012-07-30 19:16:45 +00:00 |
|
Richard Alam
|
881c0c573f
|
- increase size of text field so that text doesn't get chooped when zooming
|
2012-07-30 19:16:12 +00:00 |
|
Richard Alam
|
87e989f34a
|
- fix problem where we don't handle properly if there is only 1 annotation
|
2012-07-30 18:57:02 +00:00 |
|
Richard Alam
|
35bc56625b
|
- fix undo logic
|
2012-07-30 18:51:15 +00:00 |
|
Richard Alam
|
ab92441af0
|
- when zooming/panning text, position the text toolbar properly
|
2012-07-30 18:28:22 +00:00 |
|
Richard Alam
|
06a7759a91
|
- remove scrollbars on presentation window
|
2012-07-30 15:43:49 +00:00 |
|
Richard Alam
|
b7a92c8ff2
|
remove unneeded file
|
2012-07-30 14:05:36 +00:00 |
|
Richard Alam
|
334b29ed78
|
- make switching presentation and page work
|
2012-07-30 13:46:54 +00:00 |
|
Richard Alam
|
251486a62d
|
- query and display annotation history
|
2012-07-30 13:32:07 +00:00 |
|
Richard Alam
|
f518a41d22
|
- query for annotation history
|
2012-07-30 12:24:14 +00:00 |
|
Richard Alam
|
9f335b3ba5
|
- make undo and clear annotations work
|
2012-07-30 12:03:18 +00:00 |
|
Richard Alam
|
f1bc5c7e75
|
- figure out undo
|
2012-07-29 18:39:42 +00:00 |
|
Richard Alam
|
bf76d21e34
|
- rename var to make it clear
|
2012-07-29 17:47:40 +00:00 |
|
Richard Alam
|
58e4539471
|
- make text resize properly
|
2012-07-29 17:33:36 +00:00 |
|
Richard Alam
|
cbe0ee60cc
|
- merge some new stuff
Conflicts:
bigbluebutton-web/.gitignore
|
2012-07-29 16:06:39 +00:00 |
|