Browse Source

merged with master

gh-pages
Igor Zhukov 10 years ago
parent
commit
27fea8b18e
  1. 40
      app.manifest
  2. 31
      css/app.css
  3. 8
      css/desktop.css
  4. 36
      css/mobile.css
  5. 58
      js/app.js
  6. 2
      js/background.js
  7. 2
      js/lib/bin_utils.js
  8. 2
      js/lib/crypto_worker.js
  9. 5
      js/locales/de-de.json
  10. 1
      js/locales/en-us.json
  11. 3
      js/locales/es-es.json
  12. 5
      js/locales/it-it.json
  13. 3
      js/locales/nl-nl.json
  14. 3
      js/locales/pt-br.json
  15. 3
      js/locales/ru-ru.json
  16. 2
      manifest.json
  17. 2
      manifest.webapp
  18. 40
      webogram.appcache

40
app.manifest

@ -1,10 +1,13 @@
CACHE MANIFEST
# Time: Tue Oct 13 2015 17:34:15 GMT+0200 (CEST)
# Time: Wed Oct 14 2015 00:33:55 GMT+0200 (CEST)
CACHE:
favicon.ico
favicon_unread.ico
css/app.css
css/desktop.css
css/mobile.css
img/Telegram.png
img/Telegram72.png
img/Telegram72_2x.png
@ -19,12 +22,9 @@ img/iphone_home120.png
img/iphone_startup.png
img/logo_share.png
img/sound_a.mp3
js/app.js
nacl/mtproto_crypto.nmf
nacl/mtproto_crypto.pexe
css/app.css
css/desktop.css
css/mobile.css
js/app.js
img/changelog/card_wecandoit.png
img/icons/AboutLogos.png
img/icons/AboutLogos_2x.png
@ -44,6 +44,21 @@ 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]
@ -61,21 +76,6 @@ 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

31
css/app.css

@ -1529,37 +1529,36 @@ img.img_fullsize{margin:0 auto}
.composer_emoji_tooltip_shown{display:block}
.composer_emoji_tooltip_tail{position:absolute;bottom:-14px;left:50%;margin-left:-13px;overflow:hidden;width:26px;height:14px}
.icon-tooltip-tail{background:#fff;width:18px;height:18px;display:inline-block;border:1px solid #dfdfdf;border-width:0 1px 1px 0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;position:relative;top:-8px;left:4px;-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-o-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.1);-moz-box-shadow:1px 1px 1px rgba(0,0,0,.1);box-shadow:1px 1px 1px rgba(0,0,0,.1)}
.composer_emoji_tooltip_tabs{-webkit-box-shadow:0 1px 0 0 rgba(0,0,0,.1);-moz-box-shadow:0 1px 0 0 rgba(0,0,0,.1);box-shadow:0 1px 0 0 rgba(0,0,0,.1)}
.composer_emoji_tooltip_tab{cursor:pointer;display:inline-block;line-height:35px;text-align:center;width:50%;text-transform:uppercase;font-weight:700;transition:color ease-in-out .2s}
.composer_emoji_tooltip_tabs{-webkit-box-shadow:0 1px 0 0 rgba(0,0,0,.1);-moz-box-shadow:0 1px 0 0 rgba(0,0,0,.1);box-shadow:0 1px 0 0 rgba(0,0,0,.1);padding-top:2px}
.composer_emoji_tooltip_tab{cursor:pointer;display:inline-block;line-height:33px;text-align:center;width:50%;text-transform:uppercase;font-weight:700;transition:color ease-in-out .2s}
.composer_emoji_tooltip_tab:active,.composer_emoji_tooltip_tab:focus,.composer_emoji_tooltip_tab:hover{text-decoration:none}
.composer_emoji_tooltip_tab_emoji,.composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tab_stickers{color:#53a9ea}
.composer_emoji_tooltip_tab_stickers,.composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tab_emoji{color:#999}
.composer_emoji_tooltip_tab_shadow{width:50%;height:1px;background:#53a9ea;-webkit-box-shadow:0 1px 0 0 #53a9ea;-moz-box-shadow:0 1px 0 0 #53a9ea;box-shadow:0 1px 0 0 #53a9ea;transform:translateX(0);transition:transform ease-in-out .2s}
.composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tab_shadow{transform:translateX(100%)}
.composer_emoji_tooltip_categories{width:100%;line-height:0}
.composer_emoji_tooltip_tab_emoji_content .composer_emoji_tooltip_categories{width:100%;margin:9px 0 12px;padding:0 5px;line-height:0}
.composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories{vertical-align:top;padding:2px 10px;overflow-x:scroll;white-space:nowrap;position:relative}
.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_emoji_tooltip_category_recent{margin:7px 10px 7px 7px}
.composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories .composer_sticker_btn{width:42px;height:38px;padding:3px 5px;vertical-align:top;margin-right:2px}
.composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories .composer_sticker_btn.active{background:#f2f6fa}
.composer_emoji_tooltip_tab_stickers_content .composer_emoji_tooltip_categories .composer_sticker_image{max-width:32px;max-height:32px}
.composer_emoji_tooltip_category{line-height:0;color:#fff;display:inline-block;width:21px;height:21px;cursor:pointer;opacity:.3;margin:0 12px;background-image:url(../img/icons/IconsetSmiles.png);background-repeat:no-repeat}
.is_2x .composer_emoji_tooltip_category{background-image:url(../img/icons/IconsetSmiles_2x.png);background-size:27px 362px}
.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_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}
.composer_emoji_tooltip_category.active,.composer_emoji_tooltip_category.active:hover{opacity:1}
.composer_emoji_tooltip_category i{display:inline-block;width:21px;height:21px;background-image:url(../img/icons/IconsetSmiles.png);background-repeat:no-repeat}
.is_2x .composer_emoji_tooltip_category i{background-image:url(../img/icons/IconsetSmiles_2x.png);background-size:27px 362px}
.composer_emoji_tooltip_category_recent{background-position:-3px 0}
.composer_emoji_tooltip_category_recent.active{background-position:-3px -31px}
.active .composer_emoji_tooltip_category_recent{background-position:-3px -31px}
.composer_emoji_tooltip_category_smile{background-position:-3px -62px}
.composer_emoji_tooltip_category_smile.active{background-position:-3px -93px}
.active .composer_emoji_tooltip_category_smile{background-position:-3px -93px}
.composer_emoji_tooltip_category_flower{background-position:-3px -124px}
.composer_emoji_tooltip_category_flower.active{background-position:-3px -155px}
.active .composer_emoji_tooltip_category_flower{background-position:-3px -155px}
.composer_emoji_tooltip_category_bell{background-position:-3px -184px}
.composer_emoji_tooltip_category_bell.active{background-position:-3px -215px}
.active .composer_emoji_tooltip_category_bell{background-position:-3px -215px}
.composer_emoji_tooltip_category_car{background-position:-3px -245px}
.composer_emoji_tooltip_category_car.active{background-position:-3px -276px}
.active .composer_emoji_tooltip_category_car{background-position:-3px -276px}
.composer_emoji_tooltip_category_grid{background-position:-3px -304px}
.composer_emoji_tooltip_category_grid.active{background-position:-3px -335px}
.active .composer_emoji_tooltip_category_grid{background-position:-3px -335px}
.composer_emoji_tooltip_tabs_wrap{height:275px;position:relative;overflow:hidden}
.composer_emoji_tooltip_tabs_contents{position:absolute;width:200%;transform:translateX(0);transition:transform ease-in-out .2s}
.composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tabs_contents{transform:translateX(-284px)}

8
css/desktop.css

@ -441,6 +441,14 @@
background: rgba(0, 0, 0, 0.17);
margin: 0 3px 0 4px;
}
@media (max-width: 940px) {
.composer_emoji_tooltip {
margin-left: -245px;
}
.composer_emoji_tooltip_tail {
left: 90%;
}
}
.composer_dropdown_wrap .nano > .nano-pane {
top: 3px;
bottom: 3px;

36
css/mobile.css

@ -1141,38 +1141,20 @@ a.mobile_modal_action .tg_checkbox_label {
}
.composer_emoji_tooltip {
margin-left: 6px;
margin-top: -170px;
width: 262px;
margin-top: -230px;
z-index: 10000;
padding: 5px 2px 5px 5px;
}
.composer_emoji_tooltip .composer_emoji_tooltip_content_wrap {
height: 106px;
}
.composer_emoji_tooltip_tabs {
margin-bottom: 3px;
}
.composer_emoji_tooltip .composer_emoji_tooltip_content .composer_emoji_btn {
padding: 5px;
margin: -1px 0 0 -1px;
}
.composer_emoji_tooltip_tab {
margin: 0 5px;
}
.composer_emoji_tooltip .scroller_native_scrollable {
height: 106px;
height: 140px;
}
.icon-tooltip-tail {
display: none;
.composer_emoji_tooltip_tabs_wrap,
.composer_emoji_tooltip_tab_emoji_content,
.composer_emoji_tooltip_tab_stickers_content {
height: 182px;
}
.composer_sticker_btn {
width: 80px;
height: 80px;
padding: 3px;
}
.composer_sticker_image {
max-width: 64px;
max-height: 64px;
.composer_emoji_tooltip_tail {
display: none;
left: 18px;
}
.composer_dropdown_wrap {
box-shadow: none;

58
js/app.js

File diff suppressed because one or more lines are too long

2
js/background.js

@ -1,5 +1,5 @@
/*!
* Webogram v0.4.8 - messaging web application for MTProto
* Webogram v0.4.9 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

2
js/lib/bin_utils.js

@ -1,5 +1,5 @@
/*!
* Webogram v0.4.8 - messaging web application for MTProto
* Webogram v0.4.9 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

2
js/lib/crypto_worker.js

@ -1,5 +1,5 @@
/*!
* Webogram v0.4.8 - messaging web application for MTProto
* Webogram v0.4.9 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

5
js/locales/de-de.json

@ -26,7 +26,7 @@
"group_modal_members": "Mitglieder",
"group_modal_members_kick": "Entfernen",
"channel_modal_info": "Beschreibung",
"channel_modal_description": "Description",
"channel_modal_description": "Beschreibung",
"channel_modal_share_link": "Link teilen",
"channel_modal_share_loading": "Lade{dots}",
"channel_modal_join": "Kanal beitreten",
@ -400,6 +400,9 @@
"im_photos_drop_text": "Bilder hier reinschieben um sie zu verschicken",
"im_message_field_placeholder": "Schreibe eine Nachricht...",
"im_broadcast_field_placeholder": "Broadcast...",
"im_emoji_tab": "Emoji",
"im_stickers_tab": "Sticker",
"im_stickers_tab_recent": "Häufig genutzt",
"im_media_attach_title": "Medien senden",
"im_attach_file_title": "Datei senden",
"im_emoji_btn_title": "Emoticon einfügen",

1
js/locales/en-us.json

@ -222,6 +222,7 @@
"confirm_modal_revoke_group_link": "Are you sure you want to revoke this link? Once you do, no one will be able to join the group using it.",
"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": "Are you sure?",

3
js/locales/es-es.json

@ -400,6 +400,9 @@
"im_photos_drop_text": "Suelta las fotos aquí para enviarlas",
"im_message_field_placeholder": "Escribe un mensaje...",
"im_broadcast_field_placeholder": "Difundir un mensaje...",
"im_emoji_tab": "Emoji",
"im_stickers_tab": "Stickers",
"im_stickers_tab_recent": "Uso frecuente",
"im_media_attach_title": "Enviar multimedia",
"im_attach_file_title": "Enviar archivo",
"im_emoji_btn_title": "Insertar emoticono",

5
js/locales/it-it.json

@ -75,7 +75,7 @@
"password_confirm_placeholder": "Reinserisci la nuova password",
"password_hint_placeholder": "Inserisci il suggerimento per la password",
"password_email_placeholder": "Imposta e-mail di recupero",
"password_create_description": "Questa password ti verrà richiesta quando ti connetti da un nuovo dispositivo in aggiunta al codice.",
"password_create_description": "La password sarà richiesta quando ti connetti da un nuovo dispositivo insieme al codice.",
"password_create_active": "Salvataggio...",
"password_create_submit": "Salva",
"password_delete_active": "Eliminazione...",
@ -400,6 +400,9 @@
"im_photos_drop_text": "Rilascia le foto qui per inviarle",
"im_message_field_placeholder": "Scrivi un messaggio..",
"im_broadcast_field_placeholder": "Diffondi un messaggio...",
"im_emoji_tab": "Emoji",
"im_stickers_tab": "Sticker",
"im_stickers_tab_recent": "Utilizzate di frequente",
"im_media_attach_title": "Invia media",
"im_attach_file_title": "Invia file",
"im_emoji_btn_title": "Inserisci emoticon",

3
js/locales/nl-nl.json

@ -400,6 +400,9 @@
"im_photos_drop_text": "Sleep foto's hierheen om te versturen.",
"im_message_field_placeholder": "Bericht schrijven",
"im_broadcast_field_placeholder": "Massabericht... ",
"im_emoji_tab": "Emoji",
"im_stickers_tab": "Stickers",
"im_stickers_tab_recent": "Veelgebruikt",
"im_media_attach_title": "Media versturen",
"im_attach_file_title": "Bestand versturen",
"im_emoji_btn_title": "Emoji invoegen",

3
js/locales/pt-br.json

@ -400,6 +400,9 @@
"im_photos_drop_text": "Solte as fotos aqui para enviar",
"im_message_field_placeholder": "Escreva uma mensagem...",
"im_broadcast_field_placeholder": "Transmitir uma mensagem...",
"im_emoji_tab": "Emoji",
"im_stickers_tab": "Stickers",
"im_stickers_tab_recent": "Frequentemente usado",
"im_media_attach_title": "Enviar mídia",
"im_attach_file_title": "Enviar arquivo",
"im_emoji_btn_title": "Inserir emoticon",

3
js/locales/ru-ru.json

@ -400,6 +400,9 @@
"im_photos_drop_text": "Перетащите сюда фотографии, чтобы отправить их",
"im_message_field_placeholder": "Напишите сообщение...",
"im_broadcast_field_placeholder": "Broadcast a message...",
"im_emoji_tab": "Emoji",
"im_stickers_tab": "Stickers",
"im_stickers_tab_recent": "Frequently used",
"im_media_attach_title": "Отправить медиа",
"im_attach_file_title": "Отправить файл",
"im_emoji_btn_title": "Вставить смайл",

2
manifest.json

@ -1,7 +1,7 @@
{
"name": "Telegram",
"description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
"version": "0.4.8",
"version": "0.4.9",
"short_name": "Telegram",
"manifest_version": 2,
"app": {

2
manifest.webapp

@ -1,7 +1,7 @@
{
"name": "Telegram",
"description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
"version": "0.4.8",
"version": "0.4.9",
"type": "privileged",
"launch_path": "/index.html",
"developer": {

40
webogram.appcache

@ -1,10 +1,13 @@
CACHE MANIFEST
# Time: Tue Oct 13 2015 17:34:15 GMT+0200 (CEST)
# Time: Wed Oct 14 2015 00:33:55 GMT+0200 (CEST)
CACHE:
favicon.ico
favicon_unread.ico
css/app.css
css/desktop.css
css/mobile.css
img/Telegram.png
img/Telegram72.png
img/Telegram72_2x.png
@ -19,12 +22,9 @@ img/iphone_home120.png
img/iphone_startup.png
img/logo_share.png
img/sound_a.mp3
js/app.js
nacl/mtproto_crypto.nmf
nacl/mtproto_crypto.pexe
css/app.css
css/desktop.css
css/mobile.css
js/app.js
img/changelog/card_wecandoit.png
img/icons/AboutLogos.png
img/icons/AboutLogos_2x.png
@ -44,6 +44,21 @@ 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]
@ -61,21 +76,6 @@ 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

Loading…
Cancel
Save