merged with master

app.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Wed Oct 14 2015 00:33:55 GMT+0200 (CEST)
+# Time: Wed Oct 14 2015 12:49:17 GMT+0200 (CEST)
 
 
 CACHE:
@@ -44,21 +44,6 @@ img/icons/PhotoIcons.png
 img/icons/PhotoIcons_2x.png
 img/icons/ProfileIcons.png
 img/icons/ProfileIcons_2x.png
-js/lib/bin_utils.js
-js/lib/crypto_worker.js
-js/lib/polyfill.js
-js/locales/de-de.json
-js/locales/en-us.json
-js/locales/es-es.json
-js/locales/it-it.json
-js/locales/nl-nl.json
-js/locales/pt-br.json
-js/locales/ru-ru.json
-vendor/closure/long.js
-vendor/cryptoJS/crypto.js
-vendor/jsbn/jsbn_combined.js
-vendor/leemon_bigint/bigint.js
-vendor/rusha/rusha.js
 img/placeholders/[email protected]
 img/placeholders/[email protected]
 img/placeholders/[email protected]
@@ -76,6 +61,21 @@ img/placeholders/[email protected]
 img/placeholders/[email protected]
 img/placeholders/VideoThumbConversation.gif
 img/placeholders/VideoThumbModal.gif
+js/lib/bin_utils.js
+js/lib/crypto_worker.js
+js/lib/polyfill.js
+js/locales/de-de.json
+js/locales/en-us.json
+js/locales/es-es.json
+js/locales/it-it.json
+js/locales/nl-nl.json
+js/locales/pt-br.json
+js/locales/ru-ru.json
+vendor/closure/long.js
+vendor/cryptoJS/crypto.js
+vendor/jsbn/jsbn_combined.js
+vendor/leemon_bigint/bigint.js
+vendor/rusha/rusha.js
 vendor/angular/i18n/angular-locale_de-de.js
 vendor/angular/i18n/angular-locale_en-us.js
 vendor/angular/i18n/angular-locale_es-es.js

css/app.css

@@ -1540,7 +1540,7 @@ img.img_fullsize{margin:0 auto}
 .composer_emoji_tooltip_tab_emoji_content .composer_emoji_tooltip_categories{width:100%;margin:0 0 3px;padding:0 5px 15px;line-height:0}
 .composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories{vertical-align:top;padding:0 5px 15px;margin:0 0 3px;overflow-x:scroll;white-space:nowrap;position:relative}
 .composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories::-webkit-scrollbar{display:none}
-.composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories .composer_sticker_btn{width:36px;height:34px;padding:3px 4px;vertical-align:top;margin:4px 2px 0 0}
+.composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories .composer_sticker_btn{width:36px;height:34px;padding:3px 4px;vertical-align:top;margin:4px 0 0}
 .composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories .composer_sticker_image{max-width:28px;max-height:28px}
 .composer_emoji_tooltip_category{line-height:0;color:#fff;display:inline-block;cursor:pointer;opacity:.3;padding:9px 12px}
 .composer_emoji_tooltip_category:hover{opacity:.4}
@@ -1615,6 +1615,8 @@ a.composer_command_option.composer_autocomplete_option_active .composer_command_
 .composer_rich_textarea:empty:active:before,.composer_rich_textarea:empty:focus:before{opacity:.75}
 .composer_rich_textarea img{width:20px;height:20px;vertical-align:middle;margin:-3px 0 0}
 @-moz-document url-prefix(){.composer_rich_textarea:empty:active:before,.composer_rich_textarea:empty:focus:before{display:none}}
+.composer_rich_textarea:empty:active:before,_:-ms-lang(x){display:none}
+.composer_rich_textarea:empty:focus:before,_:-ms-lang(x){display:none}
 .composer_command_btn{display:block;position:absolute;right:37px;top:4px;cursor:pointer;padding:0;width:20px;height:20px}
 .icon-slash{display:inline-block;width:20px;height:20px;vertical-align:top;opacity:.8;background-image:url(../img/icons/General.png);background-repeat:no-repeat;background-position:-10px -790px}
 .is_2x .icon-slash{background-image:url(../img/icons/General_2x.png);background-size:40px 848px}

css/mobile.css

@@ -1130,6 +1130,7 @@ a.mobile_modal_action .tg_checkbox_label {
 }
 .composer_rich_textarea:empty:before {
   color: #999;
+  margin-top: 1px;
 }
 .composer_rich_textarea:active,
 .composer_rich_textarea:focus {
@@ -1141,16 +1142,29 @@ a.mobile_modal_action .tg_checkbox_label {
 }
 .composer_emoji_tooltip {
   margin-left: 6px;
-  margin-top: -230px;
+  margin-top: -176px;
   z-index: 10000;
 }
+.composer_emoji_tooltip_tab {
+  line-height: 15px;
+  font-size: 11px;
+}
 .composer_emoji_tooltip .scroller_native_scrollable {
-  height: 140px;
+  height: 117px;
 }
 .composer_emoji_tooltip_tabs_wrap,
 .composer_emoji_tooltip_tab_emoji_content,
 .composer_emoji_tooltip_tab_stickers_content {
-  height: 182px;
+  height: 147px;
+}
+.composer_emoji_tooltip_category {
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+.composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories .composer_sticker_btn {
+  padding-top: 0;
+  padding-bottom: 0;
+  margin: 0;
 }
 .composer_emoji_tooltip_tail {
   display: none;

js/locales/de-de.json

@@ -199,6 +199,7 @@
     "confirm_modal_revoke_group_link": "Bist du sicher, dass du diesen Link widerrufen willst? Dadurch kann ihn niemand mehr nutzen.",
     "confirm_modal_revoke_channel_link": "Bist du sicher, dass du diesen Link widerrufen willst? Dadurch kann ihn niemand mehr nutzen.",
     "confirm_modal_delete_channel_md": "Sicher, dass du diesen Kanal löschen willst?\n\nAlle Mitglieder und Nachrichten werden entfernt.",
+    "confirm_modal_jump_ext_url_md": "Link öffnen?\n\n{url}",
     "confirm_modal_are_u_sure": "Bist du sicher?",
     "confirm_modal_logout_submit": "Abmelden",
     "confirm_modal_history_flush_submit": "Chat löschen",

js/locales/es-es.json

@@ -199,6 +199,7 @@
     "confirm_modal_revoke_group_link": "¿Quieres anular este enlace? Una vez hecho, nadie podrá usarlo para unirse al grupo.",
     "confirm_modal_revoke_channel_link": "¿Quieres anular este enlace? Una vez hecho, nadie podrá usarlo para unirse al grupo.",
     "confirm_modal_delete_channel_md": "¿Quieres eliminar este canal?\n\nTodos los miembros y mensajes serán eliminados.",
+    "confirm_modal_jump_ext_url_md": "¿Abrir este enlace?\n\n{url}",
     "confirm_modal_are_u_sure": "¿Confirmar?",
     "confirm_modal_logout_submit": "Cerrar sesión",
     "confirm_modal_history_flush_submit": "Eliminar chat",

js/locales/it-it.json

@@ -199,6 +199,7 @@
     "confirm_modal_revoke_group_link": "Sei sicuro di voler revocare questo link? Una volta fatto, nessuno potrà unirsi al gruppo utilizzandolo.",
     "confirm_modal_revoke_channel_link": "Sei sicuro di voler revocare questo link? Una volta fatto, nessuno potrà unirsi al canale utilizzandolo.",
     "confirm_modal_delete_channel_md": "Sei sicuro di voler eliminare questo canale?\n\nTutti i membri saranno rimossi e tutti i messaggi verranno persi.",
+    "confirm_modal_jump_ext_url_md": "Aprire questo link?\n\n{url}",
     "confirm_modal_are_u_sure": "Sei sicuro?",
     "confirm_modal_logout_submit": "Disconnetti",
     "confirm_modal_history_flush_submit": "Elimina chat",

js/locales/nl-nl.json

@@ -199,6 +199,7 @@
     "confirm_modal_revoke_group_link": "Deze link echt intrekken? Na intrekken kan niemand meer lid worden met de oude link.",
     "confirm_modal_revoke_channel_link": "Deze link echt intrekken? Na intrekken kan niemand meer lid worden met de oude link.",
     "confirm_modal_delete_channel_md": "Kanaal echt verwijderen?\n\nBerichten worden gewist en alle deelnemers verwijderd.",
+    "confirm_modal_jump_ext_url_md": "Link openen?\n\n{url}",
     "confirm_modal_are_u_sure": "Weet je het zeker?",
     "confirm_modal_logout_submit": "Uitloggen",
     "confirm_modal_history_flush_submit": "Chat verwijderen",

js/locales/pt-br.json

@@ -199,6 +199,7 @@
     "confirm_modal_revoke_group_link": "Você tem certeza que deseja desativar o link? Uma vez feito, ninguém conseguirá entrar no grupo usando-o.",
     "confirm_modal_revoke_channel_link": "Você tem certeza que deseja desativar o link? Uma vez feito, ninguém conseguirá entrar no canal usando-o.",
     "confirm_modal_delete_channel_md": "Vocẽ tem certeza que deseja apagar o canal?\n\nTodos os membros serão removidos e todas as mensagens serão perdidas.",
+    "confirm_modal_jump_ext_url_md": "Abrir esse link?\n\n{url}",
     "confirm_modal_are_u_sure": "Você tem certeza?",
     "confirm_modal_logout_submit": "Sair",
     "confirm_modal_history_flush_submit": "Apagar chat",

js/locales/ru-ru.json

@@ -199,6 +199,7 @@
     "confirm_modal_revoke_group_link": "Хотите ли вы аннулировать данную ссылку? После этого никто не сможет вступить в группу с её помощью",
     "confirm_modal_revoke_channel_link": "Are you sure you want to revoke this link? Once you do, no one will be able to join the channel using it.",
     "confirm_modal_delete_channel_md": "Are you sure you want to delete this channel?\n\nAll members will be removed and all messages will be lost.",
+    "confirm_modal_jump_ext_url_md": "Open this link?\n\n{url}",
     "confirm_modal_are_u_sure": "Вы уверены?",
     "confirm_modal_logout_submit": "Выход",
     "confirm_modal_history_flush_submit": "Удалить беседу",

webogram.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Wed Oct 14 2015 00:33:55 GMT+0200 (CEST)
+# Time: Wed Oct 14 2015 12:49:17 GMT+0200 (CEST)
 
 
 CACHE:
@@ -44,21 +44,6 @@ img/icons/PhotoIcons.png
 img/icons/PhotoIcons_2x.png
 img/icons/ProfileIcons.png
 img/icons/ProfileIcons_2x.png
-js/lib/bin_utils.js
-js/lib/crypto_worker.js
-js/lib/polyfill.js
-js/locales/de-de.json
-js/locales/en-us.json
-js/locales/es-es.json
-js/locales/it-it.json
-js/locales/nl-nl.json
-js/locales/pt-br.json
-js/locales/ru-ru.json
-vendor/closure/long.js
-vendor/cryptoJS/crypto.js
-vendor/jsbn/jsbn_combined.js
-vendor/leemon_bigint/bigint.js
-vendor/rusha/rusha.js
 img/placeholders/[email protected]
 img/placeholders/[email protected]
 img/placeholders/[email protected]
@@ -76,6 +61,21 @@ img/placeholders/[email protected]
 img/placeholders/[email protected]
 img/placeholders/VideoThumbConversation.gif
 img/placeholders/VideoThumbModal.gif
+js/lib/bin_utils.js
+js/lib/crypto_worker.js
+js/lib/polyfill.js
+js/locales/de-de.json
+js/locales/en-us.json
+js/locales/es-es.json
+js/locales/it-it.json
+js/locales/nl-nl.json
+js/locales/pt-br.json
+js/locales/ru-ru.json
+vendor/closure/long.js
+vendor/cryptoJS/crypto.js
+vendor/jsbn/jsbn_combined.js
+vendor/leemon_bigint/bigint.js
+vendor/rusha/rusha.js
 vendor/angular/i18n/angular-locale_de-de.js
 vendor/angular/i18n/angular-locale_en-us.js
 vendor/angular/i18n/angular-locale_es-es.js