Oswaldo Acauan
|
b77b8ce971
|
Fix Welcome message not being parsed
|
2016-06-02 16:34:17 -03:00 |
|
Oswaldo Acauan
|
f204e6007a
|
Sanitize chat messages client and server-side
|
2016-06-02 16:08:17 -03:00 |
|
Oswaldo Acauan
|
d642cb1c99
|
Add chat send message functionality
|
2016-06-02 15:40:27 -03:00 |
|
Anton Georgiev
|
1854855218
|
adjust captions and deskshare to use eventBus in akka apps
|
2016-06-02 16:06:01 +00:00 |
|
Oswaldo Acauan
|
8d74db562a
|
Fix getters on auth service
|
2016-06-02 10:48:39 -03:00 |
|
Oswaldo Acauan
|
f39b7171af
|
Move session/auth logic to separated services
|
2016-06-02 10:46:35 -03:00 |
|
Oswaldo Acauan
|
f4fbc658e0
|
Fetch chat messages from server instead of mock
|
2016-06-02 10:00:57 -03:00 |
|
Oleksandr Zhurbenko
|
6db05cf0f4
|
Added scaling on window resize for the slide
|
2016-06-01 16:37:51 -07:00 |
|
Oleksandr Zhurbenko
|
06e18808b3
|
Fixed a layout bug for the Firefox
|
2016-06-01 14:59:10 -07:00 |
|
Oleksandr Zhurbenko
|
7730d50948
|
Centered the slide
|
2016-06-01 14:57:19 -07:00 |
|
Anton Georgiev
|
9cf03a8ce8
|
move helpers; extract nodejsApp
|
2016-06-01 17:18:13 +00:00 |
|
Oswaldo Acauan
|
378c94ce7b
|
Resolve merge conflicts
|
2016-06-01 13:45:01 -03:00 |
|
Oswaldo Acauan
|
1d8a36564d
|
Add base components and style for Chat
|
2016-06-01 13:33:19 -03:00 |
|
perroned
|
844210faea
|
Fixes audio permission, render tag
|
2016-06-01 15:56:12 +00:00 |
|
Anton Georgiev
|
36c36d4291
|
Merge pull request #3158 from Gcampes/html-userlist
Adds html5 user list and user avatar components
|
2016-06-01 10:17:09 -04:00 |
|
gcampes
|
b6366ff451
|
removes .js and .jsx from startup/routes in html5
|
2016-06-01 10:04:23 -03:00 |
|
gcampes
|
2d71964791
|
Revert changes to start.sh and remove useless file added on my last commit
|
2016-05-31 17:39:11 -03:00 |
|
gcampes
|
957dcb9a8f
|
Finish first iteration of the html5 userlist and adds user avatar component
|
2016-05-31 17:25:42 -03:00 |
|
gcampes
|
ce32ae5b20
|
Merge branch 'html5-new-userlist' into html-userlist
|
2016-05-31 08:37:14 -03:00 |
|
gcampes
|
430435e660
|
Changes html5 userlist service
|
2016-05-31 08:29:38 -03:00 |
|
Oleksandr Zhurbenko
|
6046c6c5a9
|
Removed unnecessary wrappers and adjusted styling
|
2016-05-30 16:10:01 -07:00 |
|
Oleksandr Zhurbenko
|
949511f9b5
|
Linting, changed line endings from Windows to Unix
|
2016-05-30 15:07:02 -07:00 |
|
Richard Alam
|
362cf62a5e
|
Merge pull request #3157 from ritzalam/upgrade-screenshare
update screenshare jws jar libraries
|
2016-05-30 14:44:45 -04:00 |
|
Richard Alam
|
6695883fe5
|
- update screenshare jws jar libraries
|
2016-05-30 18:41:49 +00:00 |
|
Richard Alam
|
f246ea453d
|
Merge pull request #3156 from bigbluebutton/ritzalam-akka-apps-application-conf
Setup application config
|
2016-05-30 14:18:53 -04:00 |
|
Oleksandr Zhurbenko
|
ba7cdca648
|
Added fade in for the slides and a default content
|
2016-05-30 11:12:02 -07:00 |
|
Richard Alam
|
f2819a6282
|
Setup application config
Need to tell service location of application config.
|
2016-05-30 14:11:32 -04:00 |
|
Oleksandr Zhurbenko
|
36cfffd2db
|
Fixed multiple rerenderings while changing slides
Media container is supposed to know only if a current presentation exists, not slide
|
2016-05-30 10:33:35 -07:00 |
|
perroned
|
4977950081
|
Fixes crash when starting video view
|
2016-05-30 17:21:30 +00:00 |
|
Fred Dixon
|
6bf6e89b76
|
Merge pull request #3155 from bigbluebutton/ffdixon-remove-deskshare-config-xml
Remove XML block for older deskshare module
|
2016-05-29 21:58:08 -04:00 |
|
Fred Dixon
|
cd1779afbe
|
Remove XML block for older deskshare module
|
2016-05-29 21:58:00 -04:00 |
|
Fred Dixon
|
84d9c5a5b5
|
Merge pull request #3154 from ffdixon/comment-deskshare
Commented out Deskshare in config.xml.template
|
2016-05-28 16:04:00 -04:00 |
|
Fred Dixon
|
098cb8e560
|
Commented out Deskshare in config.xml.template
|
2016-05-28 16:03:37 -04:00 |
|
Fred Dixon
|
d119be85de
|
Merge pull request #3153 from ffdixon/bump-1-1
Updated releaes environment variable to 1.1.0-dev
|
2016-05-28 15:59:24 -04:00 |
|
Fred Dixon
|
3500aa2303
|
Updated releaes environment variable to 1.1.0-dev
|
2016-05-28 15:50:57 -04:00 |
|
Fred Dixon
|
9d8d0fcff1
|
Merge pull request #3152 from bigbluebutton/ffdixon-bump-1.1-dev
Bump version on index.html page to 1.1-dev
|
2016-05-28 13:03:34 -04:00 |
|
Fred Dixon
|
bd9124d286
|
Bump version on index.html page to 1.1-dev
|
2016-05-28 13:03:26 -04:00 |
|
Oleksandr Zhurbenko
|
179ce3c2bd
|
Swapping whiteboard with default view if there is no current slide
|
2016-05-27 18:10:34 -07:00 |
|
perroned
|
c8fdf66099
|
Lints
|
2016-05-27 16:34:03 +00:00 |
|
perroned
|
393b49fdbe
|
Cleans up duplicate code
|
2016-05-27 16:17:16 +00:00 |
|
Oleksandr Zhurbenko
|
84318b10f0
|
Adjusted imports, cleaned up
|
2016-05-26 17:13:53 -07:00 |
|
Oleksandr Zhurbenko
|
16c46d50af
|
Adjusted the whiteboard files to the new structure
|
2016-05-26 17:03:30 -07:00 |
|
perroned
|
8fc4c98090
|
Fixes race condition while loading verto libs
|
2016-05-26 20:46:11 +00:00 |
|
perroned
|
2f9afaa8d6
|
Uses same name for voiceBridge where possible
|
2016-05-26 20:25:55 +00:00 |
|
perroned
|
2145cc0d1e
|
Stops fucntion that broke video viewing on html5
|
2016-05-26 20:25:27 +00:00 |
|
perroned
|
ac60620ac9
|
Makes WebRTC call when data changes
|
2016-05-26 20:03:45 +00:00 |
|
perroned
|
b8ae3a5304
|
Fixes some imports
|
2016-05-26 20:01:49 +00:00 |
|
perroned
|
53fdb67652
|
Loads jquery json lib
|
2016-05-26 19:58:30 +00:00 |
|
perroned
|
c1adc40315
|
Fix library loading callback
|
2016-05-26 19:57:44 +00:00 |
|
Oleksandr Zhurbenko
|
50597726d9
|
Ported changes in addShapeToCollection func and the structure of the text shape obj to the new server side structure
|
2016-05-26 09:37:54 -07:00 |
|