Browse Source

merged with master

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

4
app.manifest

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Mon Oct 05 2015 22:53:58 GMT+0300 (MSK)
# Time: Tue Oct 06 2015 15:13:04 GMT+0300 (MSK)
CACHE:
@ -73,8 +73,8 @@ js/locales/pt-br.json
js/locales/ru-ru.json
vendor/closure/long.js
vendor/cryptoJS/crypto.js
vendor/leemon_bigint/bigint.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

11
css/app.css

@ -31,7 +31,6 @@ sub{bottom:-.25em}
img{border:0}
svg:not(:root){overflow:hidden}
hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
pre{overflow:auto}
code,kbd,pre,samp{font-size:1em}
button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}
button{overflow:visible}
@ -154,7 +153,7 @@ code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}
code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}
kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}
kbd kbd{padding:0;font-size:100%;box-shadow:none}
pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}
pre{display:block;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border-radius:4px}
pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}
.pre-scrollable{max-height:340px;overflow-y:scroll}
.container,.container-fluid{margin-right:auto;margin-left:auto;padding-left:0;padding-right:0}
@ -1132,6 +1131,7 @@ h1,h2,h3,h4,h5{color:#222}
.non_osx h4{font-size:17px}
.noselect{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
.hasselect{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}
pre{margin-bottom:0;max-height:300px;overflow:auto;padding:3px;border:1px solid #dedede}
a{cursor:pointer}
a.disabled{cursor:default;pointer-events:none}
.form-control{border:1px solid #d9dbde;border-radius:2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}
@ -1460,7 +1460,6 @@ div.im_message_author,div.im_message_body{display:block;overflow:hidden}
a.im_message_fwd_photo{position:absolute;margin-top:1px}
.im_message_fwd_date{padding:0}
.im_message_text{word-wrap:break-word;line-height:150%}
.im_message_text pre{margin-bottom:0;max-height:300px;overflow:auto;padding:4px}
.im_message_photo_caption,.im_message_video_caption{clear:both;word-wrap:break-word;line-height:150%;margin-top:3px}
.im_message_mymention{background:#fff8cc}
.reply_markup_wrap{margin:15px -2px 0}
@ -1822,7 +1821,9 @@ a.md_modal_list_peer_name{color:inherit}
.md_photo_loading i:first-child{margin-left:0}
@media print{body,html{background:#fff}
body .im_page_wrap{border:0;box-shadow:none;overflow:visible}
.im_bottom_panel_wrap,.im_dialogs_col_wrap,.tg_head_logo_wrap,.tg_head_msgs_edit_btn,.tg_head_peer_dropdown,.tg_head_peer_return_btn{display:none}
body .im_bottom_panel_wrap,body .im_dialogs_col_wrap,body .tg_head_logo_wrap,body .tg_head_msgs_edit_btn,body .tg_head_peer_dropdown,body .tg_head_peer_return_btn{display:none}
body .im_history_wrap{height:auto!important}
body .nano-pane{display:none}
body .nano>.nano-content{position:static}}
body .nano>.nano-content{position:static}
body .tg_head_peer_info{text-align:center}
body .im_history_col_wrap,body .tg_head_main_wrap{width:auto;max-width:700px;float:none;margin:0 auto}}

6
css/desktop.css

@ -1213,6 +1213,12 @@ a.im_panel_peer_photo .peer_initials {
padding-bottom: 5px;
}
}
.im_edit_panel_wrap.im_edit_small_panel_wrap {
padding-bottom: 8px;
}
.im_edit_small_panel_wrap .im_edit_panel_border {
margin-bottom: 7px;
}
/* Peer modals */
.user_modal_window .modal-dialog {
max-width: 480px;

50
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.7 - messaging web application for MTProto
* Webogram v0.4.8 - 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.7 - messaging web application for MTProto
* Webogram v0.4.8 - 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.7 - messaging web application for MTProto
* Webogram v0.4.8 - 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

4
js/locales/de-de.json

@ -26,6 +26,7 @@
"group_modal_members": "Mitglieder",
"group_modal_members_kick": "Entfernen",
"channel_modal_info": "Beschreibung",
"channel_modal_description": "Description",
"channel_modal_share_link": "Link teilen",
"channel_modal_share_loading": "Lade{dots}",
"channel_modal_join": "Kanal beitreten",
@ -388,7 +389,7 @@
"im_conversation_group_typing": "{name} tippt{dots}",
"im_delete_chat": "Chat löschen",
"im_clear_history": "Verlauf löschen",
"im_delete": "Lösche {count}",
"im_delete": "{count} Löschen",
"im_forward": "{count} weiterleiten",
"im_reply": "Antworten",
"im_start": "Starten",
@ -398,6 +399,7 @@
"im_reply_loading": "Lade{dots}",
"im_photos_drop_text": "Bilder hier reinschieben um sie zu verschicken",
"im_message_field_placeholder": "Schreibe eine Nachricht...",
"im_broadcast_field_placeholder": "Broadcast...",
"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

@ -28,6 +28,7 @@
"group_modal_members_kick": "Remove",
"channel_modal_info": "Channel info",
"channel_modal_description": "Description",
"channel_modal_share_link": "Share link",
"channel_modal_share_loading": "Loading{dots}",
"channel_modal_join": "Join channel",

2
js/locales/es-es.json

@ -26,6 +26,7 @@
"group_modal_members": "Miembros",
"group_modal_members_kick": "Expulsar",
"channel_modal_info": "Información",
"channel_modal_description": "Descripción",
"channel_modal_share_link": "Compartir enlace",
"channel_modal_share_loading": "Cargando{dots}",
"channel_modal_join": "Unirse al canal",
@ -398,6 +399,7 @@
"im_reply_loading": "Cargando{dots}",
"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_media_attach_title": "Enviar multimedia",
"im_attach_file_title": "Enviar archivo",
"im_emoji_btn_title": "Insertar emoticono",

2
js/locales/it-it.json

@ -26,6 +26,7 @@
"group_modal_members": "Membri",
"group_modal_members_kick": "Rimuovi",
"channel_modal_info": "Info canale",
"channel_modal_description": "Descrizione",
"channel_modal_share_link": "Condividi link",
"channel_modal_share_loading": "Caricamento{dots}",
"channel_modal_join": "Unisciti al canale",
@ -398,6 +399,7 @@
"im_reply_loading": "Caricamento{dots}",
"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_media_attach_title": "Invia media",
"im_attach_file_title": "Invia file",
"im_emoji_btn_title": "Inserisci emoticon",

2
js/locales/nl-nl.json

@ -26,6 +26,7 @@
"group_modal_members": "Deelnemers",
"group_modal_members_kick": "Verwijder",
"channel_modal_info": "Kanaalinformatie",
"channel_modal_description": "Beschrijving",
"channel_modal_share_link": "Link delen",
"channel_modal_share_loading": "Laden{dots}",
"channel_modal_join": "Deelnemen aan kanaal",
@ -398,6 +399,7 @@
"im_reply_loading": "Laden{dots}",
"im_photos_drop_text": "Sleep foto's hierheen om te versturen.",
"im_message_field_placeholder": "Bericht schrijven",
"im_broadcast_field_placeholder": "Massabericht... ",
"im_media_attach_title": "Media versturen",
"im_attach_file_title": "Bestand versturen",
"im_emoji_btn_title": "Emoji invoegen",

2
js/locales/pt-br.json

@ -26,6 +26,7 @@
"group_modal_members": "Membros",
"group_modal_members_kick": "Remover",
"channel_modal_info": "Info do canal",
"channel_modal_description": "Description",
"channel_modal_share_link": "Compartilhar link",
"channel_modal_share_loading": "Carregando{dots}",
"channel_modal_join": "Entrar no canal",
@ -398,6 +399,7 @@
"im_reply_loading": "Carregando{dots}",
"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_media_attach_title": "Enviar mídia",
"im_attach_file_title": "Enviar arquivo",
"im_emoji_btn_title": "Inserir emoticon",

2
js/locales/ru-ru.json

@ -26,6 +26,7 @@
"group_modal_members": "Участники",
"group_modal_members_kick": "Исключить",
"channel_modal_info": "Channel info",
"channel_modal_description": "Description",
"channel_modal_share_link": "Share link",
"channel_modal_share_loading": "Loading{dots}",
"channel_modal_join": "Join channel",
@ -398,6 +399,7 @@
"im_reply_loading": "Загрузка{dots}",
"im_photos_drop_text": "Перетащите сюда фотографии, чтобы отправить их",
"im_message_field_placeholder": "Напишите сообщение...",
"im_broadcast_field_placeholder": "Broadcast a message...",
"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.7",
"version": "0.4.8",
"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.7",
"version": "0.4.8",
"type": "privileged",
"launch_path": "/index.html",
"developer": {

4
webogram.appcache

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Mon Oct 05 2015 22:53:58 GMT+0300 (MSK)
# Time: Tue Oct 06 2015 15:13:04 GMT+0300 (MSK)
CACHE:
@ -73,8 +73,8 @@ js/locales/pt-br.json
js/locales/ru-ru.json
vendor/closure/long.js
vendor/cryptoJS/crypto.js
vendor/leemon_bigint/bigint.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

Loading…
Cancel
Save