Commit Graph

12643 Commits

Author SHA1 Message Date
gcampes
86d97b59da Fixes infinited tabbed line in html5 chat input controls 2016-05-03 16:06:59 -03:00
Chad Pilkey
dc5bacc578 fix issue #3106 2016-05-03 10:09:30 -07:00
Oswaldo Acauan
82742311b5 Merge upstream/master 2016-05-03 02:35:15 -03:00
Oswaldo Acauan
31d5b3f4f1 Merge with upstream/master 2016-05-03 17:49:11 -03:00
Oswaldo Acauan
ddd38c57ac Add i18n, modular layouts and basic styles 2016-05-03 17:40:46 -03:00
Oswaldo Acauan
a22c759fcc Merge with upstream/master 2016-05-02 19:52:32 -03:00
Oswaldo Acauan
01860a8804 Add basic styles for new design 2016-05-02 19:42:54 -03:00
Richard Alam
7a6c00293f Merge pull request #3109 from capilkey/file-cleanup
Removing files that should not have been committed
2016-05-02 15:54:27 -04:00
Chad Pilkey
24c6d48dc2 removing files that should not have been committed 2016-05-02 12:45:25 -07:00
Chad Pilkey
eb36a03774 First try at video for new UI 2016-05-02 11:59:27 -04:00
Anton Georgiev
573c1772b3 server side rearrangements 2016-05-02 14:48:20 +00:00
Fred Dixon
d85c94366f Deleting Incorrect file.
Cleaning up the root directory.
2016-05-02 07:48:32 -04:00
Fred Dixon
6073632c45 Deleting incorrect file.
Looks like this file was mistakenly added during a commit.
2016-05-02 07:47:55 -04:00
Chad Pilkey
2f69f04ce0 Fix the Flex 4 client meeting name 2016-04-29 17:24:01 -04:00
Leonardo Crauss Daronco
427a288dfe Fix clicks on the thumbnails in the playback page
Wasn't binding to events in the proper order, causing cliks in a thumbnail
not to behave properly.
2016-04-29 16:11:48 -04:00
Leonardo Crauss Daronco
0d5bda9d73 Improve playback buttons and update colors in the playback page
Bigger and more well spaced buttons, specially in small screens.
Also updated the colors to match the latest design definitions.
2016-04-29 15:59:45 -04:00
Anton Georgiev
22c088795d Merge pull request #3103 from gthacoder/react-client
HTML5 client: putting some Grunt configs into Meteor settings file + removing Velocity.
2016-04-29 10:31:38 -04:00
Chad Pilkey
2edfdf450c Added chat to the new Flex 4 UI 2016-04-28 19:07:15 -04:00
Leonardo Crauss Daronco
af27a69ef8 Fix playback of recordings not loading on firefox mobile
The event "loadeddata" is only triggered on firefox mobile once the
video/audio is played, so it requires the user to click on the play button
for it to be triggered.
The playback page was waiting for the event to be triggered before
removing the "loading" page, and that would never happen on firefox mobile.

Now we don't wait anymore for the video to be loaded, we just wait for
the slides and the initial setup.
2016-04-28 18:55:09 -04:00
Maxim Khlobystov
88542275d8 Cleanup. 2016-04-28 18:42:04 -04:00
Maxim Khlobystov
1695f58fe6 Split the Meteor command into options stored as Meteor settings. 2016-04-28 18:27:43 -04:00
Anton Georgiev
1c8436170e move the redis configs outside the Meteor obj 2016-04-28 22:01:43 +00:00
Richard Alam
e9cfe1c51e Merge pull request #7 from maxdoumit/bbb-1.1-dev-java8
Bbb 1.1 dev java8
2016-04-28 17:48:20 -04:00
Maxim Khlobystov
886928ca4d Got rid of the Karma error in the console (removed Velocity). 2016-04-28 17:44:09 -04:00
Anton Georgiev
0b10a861bb move log out of Meteor 2016-04-28 21:37:15 +00:00
Anton Georgiev
e299281a0a move collections out of Meteor 2016-04-28 21:10:43 +00:00
Chad Pilkey
73ddb24c92 Fixed a race condition with presentation resizing 2016-04-28 16:36:02 -04:00
Chad Pilkey
0d83f28467 Added functionality for participants open/close 2016-04-28 16:35:20 -04:00
Oswaldo Acauan
7d31eb43f9 Switch from ion-router to react-router 2016-04-28 15:57:14 -04:00
Chad Pilkey
60b99a2fb8 Added skins for top toolbar buttons 2016-04-28 15:45:25 -04:00
maxdoumit
e00ca4f184 Update build.gradle
Change the build.gradle to make is work with gradle 2.12
2016-04-28 14:38:06 -05:00
maxdoumit
046741fa44 Merge branch 'bbb-1.1-dev-java8' of https://github.com/maxdoumit/bigbluebutton into bbb-1.1-dev-java8 2016-04-28 14:37:33 -05:00
maxdoumit
72780e7914 Update documentation
Changed the links for cloning red5.
Added missing checkout branches.
2016-04-28 17:21:33 -04:00
Chad Pilkey
11aff1a28e Embeded Source Sans Pro font in Flex 4 client 2016-04-28 15:20:04 -04:00
Chad Pilkey
635765bfe1 Added a Flex 4 top toolbar 2016-04-28 15:19:34 -04:00
Anton Georgiev
fc52155db0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router
Conflicts:
	bigbluebutton-html5/server/redispubsub.js
2016-04-28 18:49:41 +00:00
Leonardo Crauss Daronco
6094c8ceee Stack recording playback components when in portrait mode 2016-04-28 14:35:47 -04:00
Anton Georgiev
a5c4d34eda Merge pull request #3101 from gthacoder/react-client
HTML5 client: modified Grunt setup and switch to CSS Modules + Sass (userlist-only).
2016-04-28 14:27:33 -04:00
Maxim Khlobystov
7504f51543 Cleaning up. 2016-04-28 14:03:18 -04:00
Maxim Khlobystov
4efdc5d361 Fixed the userlist styling. 2016-04-28 13:58:54 -04:00
Chad Pilkey
d803b32400 Apply temporary English labels to menu buttons 2016-04-28 13:26:33 -04:00
Chad Pilkey
163aae54f3 Fix common-library VoiceConnection to use internID 2016-04-28 13:26:06 -04:00
Chad Pilkey
741fc0da19 MenuButtons added to Flex 4 UI 2016-04-28 13:18:19 -04:00
Chad Pilkey
8457799e51 Added a CSS sheet for Flex 4 UI 2016-04-28 13:16:46 -04:00
maxdoumit
181d29c77c Add extra documentation
Added extra documentation for installing the dev tools, including download locations
2016-04-28 11:55:38 -04:00
Maxim Khlobystov
fad6330d39 Fixed the global Sass file and got back some of the missing userlist styles. 2016-04-28 11:44:24 -04:00
Richard Alam
36c1b0028e Merge pull request #3100 from capilkey/fix-missing-assets
Add two branding images back to the client
2016-04-28 11:18:26 -04:00
Leonardo Crauss Daronco
2b20824b99 Small fix/protection in the js of the playback page 2016-04-28 10:36:39 -04:00
Chad Pilkey
1c4973f1cc Removed unneeded code from VariableDividedBox 2016-04-27 19:43:28 -04:00
Oleksandr Zhurbenko
db667ae58d Linter fixes 2016-04-27 16:38:57 -07:00