Richard Alam
|
7ece7dcb34
|
- add a way to send message to client using shared object
|
2013-05-18 00:56:57 -07:00 |
|
Richard Alam
|
f5730f0d18
|
remove scala dependencis
|
2013-05-18 00:56:20 -07:00 |
|
Richard Alam
|
42afda8f5c
|
- upgrade to red5 r4641
|
2013-05-14 18:47:23 +00:00 |
|
Richard Alam
|
67185ee9e5
|
- upgrade to red5 r4639
|
2013-05-08 19:16:43 +00:00 |
|
Richard Alam
|
0b902805b0
|
- seems like it's picking the wrong jar
|
2013-04-30 15:43:56 +00:00 |
|
Richard Alam
|
75fb9c9a09
|
- upgrade to red5 r4635 to get fix for RTMPT kepp alive
|
2013-04-30 15:11:28 +00:00 |
|
Richard Alam
|
607d09e7cb
|
- upgrading to latest red5 with fix to rtmpt
|
2013-04-28 23:38:54 +00:00 |
|
Richard Alam
|
91176431ca
|
- upgrade to red5 r4360
|
2013-04-28 20:11:19 +00:00 |
|
Richard Alam
|
dfa65a5d91
|
- upgrade to red5 r4628
|
2013-04-27 23:07:28 +00:00 |
|
Richard Alam
|
c06334f24d
|
- upgrade to red5 r4627
|
2013-04-26 20:59:33 +00:00 |
|
Richard Alam
|
5d3bb5fb70
|
- remove extra parameters when connecting to bbb-apps
|
2013-03-22 14:48:20 +00:00 |
|
Richard Alam
|
aebc524125
|
- Fix NPE when removing voice conference when all users have left
|
2013-03-22 14:16:31 +00:00 |
|
Richard Alam
|
2074ef0d5e
|
- need to clean up scopes properly and try to minimize dependency on scope lifecycle
|
2013-03-21 20:00:58 +00:00 |
|
Richard Alam
|
c6ac009b86
|
Merge branch 'master' into upgrade-to-red5-r4597
|
2013-03-19 18:28:38 +00:00 |
|
Richard Alam
|
0cb6721147
|
- upgrade to red5 r4599
|
2013-03-19 18:27:22 +00:00 |
|
Richard Alam
|
d28a7ecf02
|
- upgrade to red5 r4597
|
2013-03-18 18:05:35 +00:00 |
|
Markos Calderon
|
9babc757fc
|
fix close cam if it's not available
|
2013-03-18 12:58:09 -05:00 |
|
Richard Alam
|
02296cf267
|
- upgrade to red5 r4592
|
2013-03-11 15:00:48 +00:00 |
|
Richard Alam
|
ece4ef7f1f
|
- BBB now starts properly on red5 r4582. Need a bit more testing though.
|
2013-03-08 22:49:11 +00:00 |
|
Richard Alam
|
412f44690b
|
- try making sure that the different components execute the lifecycle properly
|
2013-03-08 22:21:31 +00:00 |
|
Richard Alam
|
7c4326a22e
|
- make bbb start on red5 r4582
|
2013-03-08 20:39:37 +00:00 |
|
Richard Alam
|
e6da7afcdd
|
- upgrade to red5 r4582
|
2013-03-07 19:48:03 +00:00 |
|
Richard Alam
|
63a3420b76
|
Merge branch 'master' into upgrade-to-red5-r4580
|
2013-03-07 18:42:25 +00:00 |
|
Richard Alam
|
556131dce5
|
- eject all users from voice conference when meeting ends
|
2013-03-07 15:19:16 +00:00 |
|
Richard Alam
|
310c283dd1
|
- initialize shared objects not on roomstart but on room connect
|
2013-03-06 15:59:40 +00:00 |
|
Richard Alam
|
3c53ceecec
|
- upgrade to red5 r4581
|
2013-03-06 15:58:56 +00:00 |
|
Richard Alam
|
601afeaae3
|
- upgrade red5 to r4580
|
2013-03-04 18:12:07 +00:00 |
|
Richard Alam
|
eadd1e3ef0
|
- upgrade builds to red5 r4578
|
2013-03-03 12:34:25 +00:00 |
|
Richard Alam
|
29864cc734
|
- create and executor to send messages
|
2013-02-28 19:08:38 +00:00 |
|
Richard Alam
|
99443dc3cb
|
- removing clientID as we don't use the Red5 connect id anymore
|
2013-02-28 18:27:41 +00:00 |
|
Richard Alam
|
19d2472fd0
|
- move logback config into resources dir so we don't need to copy it as last step in gradle war
|
2013-02-28 01:03:31 +00:00 |
|
Richard Alam
|
e3cbd49bae
|
- minor cleanup
|
2013-02-28 00:27:10 +00:00 |
|
Richard Alam
|
ed64da0f9b
|
- build bbb-apps on red5 r4573
|
2013-02-27 23:35:16 +00:00 |
|
Richard Alam
|
cc859b94f8
|
Merge branch 'master' into upgrade-to-red5-r4573
|
2013-02-26 14:48:01 +00:00 |
|
Richard Alam
|
5f0b2a7ea7
|
- change logging history from 30 days to 5 days...don't need that much history
|
2013-02-26 14:08:12 +00:00 |
|
Richard Alam
|
4838840aa5
|
- upgrading red5 jar
|
2013-02-25 20:41:50 +00:00 |
|
Richard Alam
|
93311e6464
|
Merge branch 'master' into merge-master-into-polling-module
Conflicts:
bigbluebutton-client/build.xml
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/src/BigBlueButton.mxml
|
2013-02-04 19:34:23 +00:00 |
|
Richard Alam
|
8e2e2c83ca
|
Revert "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."
This reverts commit a7156aa0a6.
Command used: git revert a7156aa0a6
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
|
2013-02-01 17:53:08 +00:00 |
|
Richard Alam
|
77d8df50da
|
- try to figure out why listener doesn't get displayed
|
2013-02-01 16:35:23 +00:00 |
|
Richard Alam
|
ea8488af38
|
Merge branch 'master' into external_freeswitch
|
2013-01-31 22:10:56 +00:00 |
|
Markos Calderon
|
8a7149b0b2
|
Added license for bigbluebutton-apps
|
2013-01-18 17:49:50 -05:00 |
|
Richard Alam
|
cbcd54cd7b
|
- update broadcast module to work on master
|
2012-12-21 20:34:33 +00:00 |
|
Richard Alam
|
5c8ab54570
|
- make properties for icecast stream configurable
|
2012-11-15 18:59:19 +00:00 |
|
Richard Alam
|
b9eae232d3
|
- external icecast protocol property
|
2012-11-14 20:40:12 +00:00 |
|
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 |
|