Commit Graph

2669 Commits

Author SHA1 Message Date
Lyubomir Marinov c9edc0ae15 Merge branch 'master' into kkrisstoff-task/dropdown-aui-changes 2016-10-19 19:06:58 -05:00
Lyubomir Marinov 242c1419fd Format source code for (some) consistency 2016-10-19 18:54:21 -05:00
yanas 8ca0943881 Merge pull request #880 from jitsi/ring-overlay-style
style(LargeVideo): Rename LARGE_VIDEO_AVATAR_DISPLAYED event
2016-10-19 16:24:34 -05:00
hristoterezov 58a07355fb style(RingOverlay): Rename onAvatarDisplayed to onAvatarVisible 2016-10-19 15:58:36 -05:00
hristoterezov 4acfb033c8 style(LargeVideo): Rename LARGE_VIDEO_AVATAR_DISPLAYED event 2016-10-19 15:57:02 -05:00
Lyubomir Marinov 572fb20dd4 Merge branch 'task/dropdown-aui-changes' of https://github.com/kkrisstoff/jitsi-meet into kkrisstoff-task/dropdown-aui-changes 2016-10-19 13:38:38 -05:00
Lyubomir Marinov d15413cd18 Merge branch 'mlaux-bugfix/android-launcher-intent' 2016-10-19 12:24:37 -05:00
Matt Laux c18caf52d0 Fix Android launcher intent so that app appears in drawer. 2016-10-19 10:59:09 -05:00
Lyubomir Marinov 1ff0bdbcfd Fix the in-app icons on Android
Bundle our custom icon font jitsi.ttf in the Android app (which we
already do for the iOS app).

Additionally, remove icon font files which are not in use.
2016-10-19 09:10:11 -05:00
Kostiantyn Pashura 736b98869f dropdown restyle 2016-10-19 12:40:03 +03:00
Kostiantyn Pashura 91fd16e9b4 aui checkbox removed 2016-10-19 12:40:03 +03:00
Kostiantyn Pashura 8118b4aea1 aui select and checkbox added 2016-10-19 12:40:03 +03:00
Дамян Минков f62d7dbdf7 Merge pull request #1040 from jitsi/fix-feedback-color-and-size
Fix feedback button color and star size
2016-10-18 15:25:40 -05:00
yanas 1bf2920f3e Fix feedback button color and star size 2016-10-18 15:23:52 -05:00
Дамян Минков 8ecf079a3f Merge pull request #1039 from jitsi/stop-logging-servers-in-the-name
Stop logging servers in the event name
2016-10-18 15:18:44 -05:00
Emil Ivov 05ae9134a8 Update conference.js 2016-10-18 15:15:47 -05:00
Дамян Минков d97ed17052 Merge pull request #1038 from jitsi/api_commands
fix(iframe_api): toggleScreenSharing command
2016-10-18 14:52:21 -05:00
hristoterezov dc43135980 fix(iframe_api): toggleScreenSharing command 2016-10-18 14:37:55 -05:00
Дамян Минков 27158752b0 Merge pull request #1025 from BeatC/display-name-required-dialog-fixes
fix display name required dialog
2016-10-18 14:36:03 -05:00
Дамян Минков 5c6f897ce7 Merge pull request #1030 from coresh/patch-1
Fixes issue of method 'setTooltip'
2016-10-18 14:35:53 -05:00
Дамян Минков d415a15e93 Merge pull request #1037 from jitsi/add-specific-read-only-color
Add specific color for read-only input
2016-10-18 14:35:47 -05:00
yanas 19709cd3fc Adds comments. 2016-10-18 14:30:59 -05:00
yanas 89e15b6d3d Add specific color for read-only input 2016-10-18 14:27:16 -05:00
yanas dcf2d64067 Merge pull request #1036 from jitsi/fix-placeholder-style
Fixes placeholder color
2016-10-18 13:00:22 -05:00
yanas c459e3cffd Merge pull request #1031 from BeatC/invite-dialog-visual-bugs
Fix some visual bugs
2016-10-18 11:59:11 -05:00
yanas 8eb7303bd9 Fixes placeholder color 2016-10-18 11:57:38 -05:00
yanas de67abd21d Merge pull request #1032 from kkrisstoff/Feedback-dialog-theme
feedback style variables
2016-10-18 11:20:44 -05:00
yanas bb5495b495 Merge pull request #990 from jitsi/chatmessage_position
fix(chat): Issue with position of chat messages
2016-10-18 11:13:26 -05:00
Kostiantyn Pashura 124303b8b8 feedback style variables 2016-10-18 18:37:32 +03:00
Lyubomir Marinov a91deca6cd Remove source code duplication
An error was discovered and fixed by GitHub user blackneck in
jitsi/jitsi-meet PR #1017. The faulty source code was a piece of
duplication though. Remove the source code duplication there to reduce
the risks of bugs.
2016-10-18 09:39:17 -05:00
Lyubomir Marinov cf3ea2b8af Merge branch 'blackneck-master' 2016-10-18 09:05:46 -05:00
Ilya Daynatovich a4c3348630 Fix some visual bugs 2016-10-18 16:53:28 +03:00
coresh 6bd5d6e4d5 Fixes issue of method 'setTooltip'
Fixes issue of method 'setTooltip' in modules/UI/util/UIUtil.js: Excluded 'Uncaught TypeError':
```
UIUtil.js:134 Uncaught TypeError: Cannot read property 'setAttribute' of null
```
2016-10-18 09:34:09 +00:00
yanas 442d2fa316 Merge pull request #1024 from BeatC/shortcut-dialog-fixes
Fix shortcut dialog toggling
2016-10-17 23:40:22 -05:00
Lyubomir Marinov 3ecc24d85e Remove obsolete Temasys workaround on React Native
jitsi/lib-jitsi-meet#66b601e disabled the execution of Temasys'
adapter.screenshare.js on browsers on which we don't use Temasys such as
React Native. Henceforth, no Temasys workarounds are necessary on React
Native.
2016-10-17 19:51:58 -05:00
Lyubomir Marinov 5e3193e087 Fix the iOS enterprise deployment build 2016-10-17 18:57:15 -05:00
yanas b96743f4de Merge pull request #1028 from jitsi/fix-profile-title
Trivial fix of capital letters.
2016-10-17 17:20:00 -05:00
yanas 2eec52485d Fixes Profile panel title 2016-10-17 17:18:06 -05:00
Дамян Минков c2085a5a9d Merge pull request #1027 from jitsi/fix-contact-list-resizing
Some contact list styling adjustments
2016-10-17 17:17:22 -05:00
yanas f8733b2501 Remove semicolon 2016-10-17 16:53:16 -05:00
yanas 5597847190 Some contact list styling adjustments 2016-10-17 16:49:31 -05:00
Дамян Минков 13d187b878 Merge pull request #1019 from jitsi/add-toolbar-splitter-button
Adds toolbar splitter button
2016-10-17 16:35:15 -05:00
yanas 43906a4e30 Fix undefined check. 2016-10-17 16:05:46 -05:00
yanas 9641dbf373 Adds toolbar splitter button 2016-10-17 16:05:46 -05:00
yanas ad2fb28f97 Merge pull request #1023 from BeatC/invite-dialog-enter-for-password
Add possibilty to set password via return key
2016-10-17 14:42:44 -05:00
Дамян Минков 2f11e85304 Updates ios project file, disables LLVM Bitcode. 2016-10-17 10:58:58 -05:00
Ilya Daynatovich 25aeb184af fix display name required dialog 2016-10-17 17:29:41 +03:00
Lyubomir Marinov ba778c50ac Merge branch 'master' of https://github.com/blackneck/jitsi-meet into blackneck-master 2016-10-17 08:56:19 -05:00
Ilya Daynatovich d06aef511f Fix shortcut dialog toggling 2016-10-17 16:35:47 +03:00
Ilya Daynatovich d94b50f1e4 Add possibilty to set password via return key 2016-10-17 15:51:55 +03:00