Igor Zhukov 2dbffb6154 Merge branch 'pr/508' ... Also improved styles for new material design Conflicts: app/css/desktop.css app/partials/desktop/im.html app/vendor/jquery.emojiarea/jquery.emojiarea.js		2015-01-02 15:12:08 +01:00
..
audio_player.html	Fixed audio player mime, empty volume	2014-11-12 00:15:13 +03:00
changelog_modal.html	Bump to 0.3.9 + changelog	2014-12-31 18:14:16 +01:00
chat_create_modal.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
chat_edit_modal.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
chat_modal.html	Style fixes	2014-12-15 12:04:05 -08:00
confirm_modal.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
contacts_modal.html	Improved login page	2014-12-31 18:07:27 +01:00
country_select_modal.html	Improved login page	2014-12-31 18:07:27 +01:00
dialog.html	Added sticker view support	2015-01-02 13:31:29 +01:00
document_modal.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
edit_contact_modal.html	Improved login page	2014-12-31 18:07:27 +01:00
error_modal.html	Various bug fixes	2014-12-14 21:55:03 -08:00
footer.html	Added switch to mobile version on window resize	2014-11-13 19:44:32 +03:00
full_document.html	UI improvements	2014-10-29 21:54:17 +03:00
full_gif.html	Improved attachments rendering	2014-11-05 21:37:01 +03:00
full_photo.html	Init separate mobile version	2014-09-11 17:06:06 +04:00
full_video.html	Improved attachments rendering	2014-11-05 21:37:01 +03:00
head.html	Fixed firefox head issue	2015-01-01 08:33:35 +01:00
im.html	Merge branch 'pr/508'	2015-01-02 15:12:08 +01:00
import_contact_modal.html	Improved login page	2014-12-31 18:07:27 +01:00
lang_footer.html	Added language for mobile settings	2014-10-02 14:43:56 +04:00
login.html	Improved login page	2014-12-31 18:07:27 +01:00
media_modal_layout.html	Updated desktop media modals	2014-11-27 13:20:13 +00:00
message_attach_contact.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
message_attach_document.html	Added sticker view support	2015-01-02 13:31:29 +01:00
message_attach_map.html	Init separate mobile version	2014-09-11 17:06:06 +04:00
message_attach_pending.html	Improved attachments rendering	2014-11-05 21:37:01 +03:00
message_attach_photo.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
message_attach_video.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
message_service.html	Fxied i18n dashed vars	2014-09-23 21:06:05 +04:00
message.html	Added unsupported media message	2014-12-20 09:11:06 -08:00
peer_select.html	Improved login page	2014-12-31 18:07:27 +01:00
photo_modal.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
profile_edit_modal.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
settings_modal.html	New design for desktop	2014-12-28 15:38:48 +01:00
slider.html	Added new slider, implement audio player seek	2014-11-04 22:05:37 +03:00
user_modal.html	Fixed styles	2014-12-11 00:03:10 -08:00
username_edit_modal.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
video_modal.html	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
welcome.html	Improved login page	2014-12-31 18:07:27 +01:00