alexbbb
|
e3646bca4a
|
Fix of the previous commit to remove unnecessary System.out.println
|
2012-11-12 17:04:55 +01:00 |
|
alexbbb
|
a7156aa0a6
|
Modified API to be able to map conferences by their name instead of their voiceBridge number. To preserve backwards compatibility is sufficient to pass the voiceBridge number as the conference name in the API call.
|
2012-11-12 16:59:15 +01:00 |
|
Richard Alam
|
e583c3d603
|
- embed scala lib
|
2012-10-30 16:27:19 +00:00 |
|
Richard Alam
|
00f4cefca1
|
- inject conn invoker
|
2012-10-30 14:08:26 +00:00 |
|
Richard Alam
|
9c57e83796
|
- try to consolidate apps
|
2012-10-30 14:08:05 +00:00 |
|
Richard Alam
|
d3f1c22e46
|
- try to consolidate apps
|
2012-10-30 14:07:43 +00:00 |
|
Chad Pilkey
|
0c6e5a0632
|
Merge remote branch 'origin/master' into poll-access
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/core/managers/UserManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
record-and-playback/presentation/playback/presentation/acornmediaplayer/acornmediaplayer.base.css
record-and-playback/presentation/playback/presentation/acornmediaplayer/jquery.acornmediaplayer.js
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/acorn.access.css
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-light.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-light.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/barebones/acorn.barebones.css
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/acorn.darkglass.css
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-caption.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-exit-fullscreen.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-fullscreen.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-pause.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-play.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-transcript.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume-full.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume.png
record-and-playback/presentation/playback/presentation/css/bbb.playback.css
record-and-playback/presentation/playback/presentation/playback.html
|
2012-10-29 16:03:09 -04:00 |
|
Richard Alam
|
2d6d1f83c5
|
- cleanup
|
2012-10-29 19:52:37 +00:00 |
|
Richard Alam
|
4b2bbb0cf8
|
- cleanup chat
|
2012-10-29 19:40:56 +00:00 |
|
Richard Alam
|
87fe30e30b
|
- add hook to send public chat message from JS
|
2012-10-18 20:17:51 +00:00 |
|
Richard Alam
|
9aa4f274c3
|
- pass utc time and timezone offset when sending chat message so we can display the send time by converting to local time
|
2012-10-17 15:41:41 +00:00 |
|
Richard Alam
|
0cfc9fabec
|
- request for chat history when joining the meeting
|
2012-10-17 14:34:34 +00:00 |
|
Richard Alam
|
314d0edf39
|
- send message to self when sending private chat
|
2012-10-16 21:30:49 +00:00 |
|
Richard Alam
|
b4e1bee033
|
- display private chat message
|
2012-10-16 18:46:49 +00:00 |
|
Richard Alam
|
a6b4559c34
|
- display public chat message
|
2012-10-16 17:40:52 +00:00 |
|
Richard Alam
|
4f2db7678a
|
- send and receive chat messages using conn invoke instead of shared object
|
2012-10-15 19:43:49 +00:00 |
|
Chad Pilkey
|
172eae1891
|
Merge remote branch 'origin/master' into poll-access
Conflicts:
bigbluebutton-client/locale/en_US/bbbResources.properties
|
2012-10-12 15:43:18 +00:00 |
|
Richard Alam
|
ceff2ea131
|
- start refactoring chat module to have a proper data model so we can expose to JS API
|
2012-10-11 22:08:18 +00:00 |
|
Richard Alam
|
e860863502
|
- propagate external user id to clients
|
2012-10-10 21:38:20 +00:00 |
|
Richard Alam
|
3852a2383b
|
- allow broadcasting even if the meeting isn't being recorded
|
2012-10-10 21:05:30 +00:00 |
|
Richard Alam
|
d73a92ab6a
|
- provide a way to stream to outcast
|
2012-10-10 20:52:20 +00:00 |
|
Chad Pilkey
|
dea6a89dd0
|
Merge remote branch 'origin/master' into poll-access
|
2012-10-02 14:58:41 +00:00 |
|
Markos Calderon
|
a72f91968b
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into change-internaluserid
|
2012-10-01 16:41:45 -05:00 |
|
Markos Calderon
|
5dafac2b25
|
change long to string
|
2012-10-01 16:41:33 -05:00 |
|
Richard Alam
|
5338c823c2
|
- use connection invoke instead of shared object when sending mouse cursor events in presentation
|
2012-10-01 15:44:54 +00:00 |
|
Chad Pilkey
|
a7f3e5aec1
|
fixed polling module to work with new version of red5
|
2012-09-24 19:36:56 +00:00 |
|
Chad Pilkey
|
1557318b32
|
Merge remote branch 'origin/master' into poll-access
|
2012-09-24 19:01:36 +00:00 |
|
Chad Pilkey
|
f9b501f1f0
|
Merge remote branch 'origin/master' into poll-access
|
2012-09-24 15:16:02 +00:00 |
|
Richard Alam
|
2b71f9f964
|
- fix history for latecomers
|
2012-09-21 20:44:15 +00:00 |
|
Richard Alam
|
ad35b2ab08
|
- upgrade to red5 r4415
|
2012-09-12 20:39:34 +00:00 |
|
Richard Alam
|
046e4aa9d8
|
Merge branch 'master' into upgrading-red5-r4406
|
2012-09-05 14:43:03 +00:00 |
|
Gustavo Salazar
|
6920db9123
|
Accept updates when drawing a shape.
|
2012-09-03 21:10:09 -05:00 |
|
Richard Alam
|
420d5f13dd
|
- try to fix why it's not working properly
|
2012-09-03 18:39:51 +00:00 |
|
Richard Alam
|
808588cb5d
|
- try upgrading to red5 r4406
|
2012-09-03 17:15:46 +00:00 |
|
Richard Alam
|
26c4077723
|
- missed one spot to change the userid
|
2012-08-24 20:52:51 +00:00 |
|
Richard Alam
|
ebf89cb65f
|
Merge branch 'use-generated-userid' into merge-master-with-use-generated-userid
|
2012-08-23 21:31:30 +00:00 |
|
Richard Alam
|
62b92a825c
|
- fix font size for late joiner
|
2012-08-23 21:29:54 +00:00 |
|
Richard Alam
|
d9e5c80c6c
|
- try generating userid instead of using red5 connection id as userid
|
2012-08-23 19:49:31 +00:00 |
|
Richard Alam
|
13261976f9
|
- fix ClassCastException once more
|
2012-08-23 15:58:50 +00:00 |
|
jtrobinson
|
50a2e83153
|
Fixed permission issue
|
2012-08-22 16:23:18 +00:00 |
|
Richard Alam
|
888e3d9a2f
|
- cleanup
|
2012-08-21 20:07:17 +00:00 |
|
Richard Alam
|
9749a80026
|
- fix annotation history when user joins late
|
2012-08-21 19:42:53 +00:00 |
|
Richard Alam
|
44b2e55d52
|
- try and fix synching of annotations for late joiners
|
2012-08-21 16:00:41 +00:00 |
|
Richard Alam
|
cdb81be8d9
|
- try another way to fix Integer to Double class cast exception
|
2012-08-20 14:43:48 +00:00 |
|
Richard Alam
|
2563966a7d
|
- cleanup
|
2012-08-17 15:41:27 +00:00 |
|
Richard Alam
|
f182abf812
|
- record text annotations properly
|
2012-08-17 15:40:01 +00:00 |
|
Richard Alam
|
40dbd9bab5
|
- fix NPE when querying for annotations history
|
2012-08-17 14:41:42 +00:00 |
|
Richard Alam
|
06df24ab9c
|
- display text properly to latecomers
|
2012-08-15 17:51:13 +00:00 |
|
Richard Alam
|
5a2e5912d6
|
- fix ClassCastException when drawing scribble that results in gaps in the whiteboard marks
|
2012-08-15 17:19:38 +00:00 |
|
Richard Alam
|
fbfc49fd5d
|
- draw square when control key is pressed
|
2012-08-05 06:34:40 +00:00 |
|
Markos Calderon
|
234078b09e
|
Added username for record in participants module
|
2012-07-31 15:34:56 -07:00 |
|
Richard Alam
|
35bc56625b
|
- fix undo logic
|
2012-07-30 18:51:15 +00:00 |
|
Richard Alam
|
da3086b4b3
|
- handle start and update of whiteboard shapes properly
|
2012-07-27 20:25:45 +00:00 |
|
Richard Alam
|
3cf19d6616
|
- try to fix zooming of text
|
2012-07-24 20:27:19 +00:00 |
|
Richard Alam
|
66cc2e26e5
|
store annotations so latecomers can query them
|
2012-07-24 17:58:00 +00:00 |
|
Richard Alam
|
309e7f32c3
|
- send and receive whiteboard messages
|
2012-07-17 22:48:51 +00:00 |
|
Richard Alam
|
47b882c917
|
- slowly making it work
|
2012-07-16 20:16:28 +00:00 |
|
Richard Alam
|
a8e80c3a9c
|
- make it compile
|
2012-07-16 19:03:12 +00:00 |
|
Richard Alam
|
5742f2764a
|
Merge remote branch 'ajay/bbb-whiteboard-additions' into merge-whiteboard-features
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/IWhiteboardRoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Page.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/ShapeGraphic.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text_icon.png
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardCanvasEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
|
2012-07-16 18:08:21 +00:00 |
|
Ajay Gopinath
|
27b2e5ad10
|
Finalized licenses and deleted random backup files and cleaned up repo.
|
2012-07-15 14:49:42 -04:00 |
|
Ajay Gopinath
|
9544daa34d
|
Backing up before reverting to attempt to fix really dumb problem.
|
2012-07-14 23:55:01 -04:00 |
|
Ajay Gopinath
|
ddf0cf8df4
|
Commented most of the new code. Need to fix grid not appearing, shapes being received oddly, and zooming with text toolbar.
|
2012-07-14 01:46:41 -04:00 |
|
Richard Alam
|
0b78831ffa
|
- add method to delete annotation
|
2012-07-13 21:53:00 +00:00 |
|
Richard Alam
|
5c3e6888f4
|
- cleanup
|
2012-07-13 21:34:10 +00:00 |
|
Richard Alam
|
1fab7a430c
|
- send and handle change page
|
2012-07-13 21:00:02 +00:00 |
|
Richard Alam
|
45faed3019
|
- broadcast messages to other clients without using shared object
|
2012-07-13 20:30:32 +00:00 |
|
Richard Alam
|
5b55b6930b
|
- listen for messages from server
|
2012-07-13 17:26:46 +00:00 |
|
Richard Alam
|
293d0bb9a7
|
- modify whiteboard server app to be able to store text
|
2012-07-12 22:02:25 +00:00 |
|
Ajay Gopinath
|
c1f5ff0ae5
|
Finished graph/grid toggle tool. Two bugs remaining: 1)text and grid are not showing up when new clients join 2) sync text/grid when changing pages within a document. TOBE fixed.
|
2012-07-10 21:36:21 -04:00 |
|
Ajay Gopinath
|
540ed95984
|
Fixed shapes not being received bug. Fixed text toolbar not moving with window/whiteboard. Added 'text size' feature to text tool options.
|
2012-07-10 14:51:53 -04:00 |
|
Richard Alam
|
575ffb45b8
|
- start modifying server side
|
2012-07-10 12:23:43 +00:00 |
|
Ajay Gopinath
|
c38b719823
|
FINALLY! FINISHED TEXT TOOL.
|
2012-07-08 21:12:37 -04:00 |
|
Ajay Gopinath
|
8715327475
|
Modified record event to include fill color. Need to finish text tool and presentation GUI.
|
2012-07-08 14:30:46 -04:00 |
|
Ajay Gopinath
|
0ef622f959
|
Added triangle tool and made fill color selectable rather than making it the same as the line color of the DrawObject.
|
2012-07-06 22:36:41 -04:00 |
|
Ajay Gopinath
|
a9fabf0028
|
Fixed duplication of GraphicObjects glitch when zooming and changing view modes. Added sprite transformation libraries but need to integrate with program.
|
2012-07-06 15:40:35 -04:00 |
|
Richard Alam
|
459d486309
|
Merge remote branch 'origin/add-pointer-record' into add-more-whiteboard-features
|
2012-07-06 16:00:06 +00:00 |
|
Markos Calderon
|
e378ee146c
|
added changes for record presentation pointer
|
2012-07-05 14:59:13 -07:00 |
|
Ajay Gopinath
|
e2d536a8f4
|
Added eraser and highlighter tool. Fixed text normalization issue. Need to add recogniition of individual objects. Text is buggy.
|
2012-07-05 01:34:51 -04:00 |
|
Ajay Gopinath
|
938103972d
|
Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches.
|
2012-07-04 12:28:29 -04:00 |
|
Ajay Gopinath
|
782154bba9
|
Finished adding fill selection tool and transparency option tool.
|
2012-06-30 18:47:31 -04:00 |
|
Ajay Gopinath
|
7ac7a51ebe
|
red5 opened to dev successfully. Start of development of bbb-apps.
|
2012-06-22 14:41:06 -04:00 |
|
Felipe Cecagno
|
ded77508fe
|
first version of the server side layout module - it allows users to lock and unlock the current layout; the layout is defined as a String, which should be a XML String but may be anything, this way is much easy to extend the layout management, since it won't need to change the server code
|
2012-06-15 11:34:57 -03:00 |
|
Richard Alam
|
b5b6d5f954
|
- update red5 to latest (r4316)
|
2012-04-22 15:03:43 +00:00 |
|
Richard Alam
|
17b3922295
|
- don't use map to determine ESL message
|
2012-04-12 16:31:34 +00:00 |
|
Richard Alam
|
835670f592
|
- retry indefinitely to connect to FreeSWITCH ESL
|
2012-03-27 15:24:50 +00:00 |
|
Richard Alam
|
c23b3be31a
|
- fix cast exception on file upload
- fix "undefined" on fileupload window
|
2012-02-24 20:19:37 +00:00 |
|
Richard Alam
|
5abe4eecb4
|
- remove w,h,x,y from message as we don't use them
|
2012-02-21 19:42:39 +00:00 |
|
Richard Alam
|
4740d1c10a
|
- add more parameters on message from presenter to viewer
|
2012-02-16 18:52:39 +00:00 |
|
Richard Alam
|
e79a650a05
|
- remove optimization for pencil tool
|
2012-02-15 22:48:42 +00:00 |
|
Markos Calderon
|
83ebc7a24e
|
changes in latentFeedback and added a check size in bbb-apps
|
2012-01-23 13:06:58 -08:00 |
|
Richard Alam
|
ecc979e274
|
- generate internal userid to be able to match users across subsytems
|
2012-01-18 15:46:29 +00:00 |
|
Markos Calderon
|
e7b839614f
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-01-09 14:45:08 -08:00 |
|
Markos Calderon
|
ea5331d0c9
|
now, bbb-web uses the internalUserId
|
2012-01-09 14:44:14 -08:00 |
|
Richard Alam
|
6b24878a5c
|
- fail fast when cannot connect to FS-ESL on startup
|
2012-01-09 21:40:46 +00:00 |
|
Richard Alam
|
c858a6919b
|
- try to connect to FS-ESL when the connection has dropped.
|
2012-01-09 19:16:34 +00:00 |
|
Markos Calderon
|
66831d0808
|
Merge branch 'updating-jedis-config'
|
2011-12-14 14:18:56 -08:00 |
|
Markos Calderon
|
f889d23fc0
|
fix for userid mismatch in API
|
2011-12-13 14:44:17 -08:00 |
|
Markos Calderon
|
e84a27c51c
|
added config file for jedispool
|
2011-12-12 15:18:52 -08:00 |
|
Richard Alam
|
0bbe44e785
|
move assign presenter logic to users/participants. This fixes a race condition where the first moderator
doesn't become presenter by default.
|
2011-12-08 21:43:16 +00:00 |
|
Richard Alam
|
aa923319a7
|
Merge branch 'master' into refactor-chat-client
|
2011-11-22 15:36:25 +00:00 |
|