Browse Source

merged with master

gh-pages
Igor Zhukov 11 years ago
parent
commit
e713ccb72f
  1. 2
      app.manifest
  2. 2
      css/app.css
  3. 34
      css/desktop.css
  4. 11
      css/mobile.css
  5. 38
      js/app.js
  6. 2
      js/background.js
  7. 2
      js/lib/bin_utils.js
  8. 2
      js/lib/crypto_worker.js
  9. 9
      js/locales/de-de.json
  10. 9
      js/locales/en-us.json
  11. 9
      js/locales/it-it.json
  12. 2
      manifest.json
  13. 2
      manifest.webapp
  14. 2
      webogram.appcache

2
app.manifest

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Wed Nov 12 2014 22:59:29 GMT+0300 (MSK)
# Time: Fri Nov 14 2014 18:11:44 GMT+0300 (MSK)
CACHE:

2
css/app.css

File diff suppressed because one or more lines are too long

34
css/desktop.css

@ -1,3 +1,17 @@
.navbar-nav > li {
float: left;
}
.tg_page_head .navbar > .container .navbar-brand {
margin-right: 0;
}
.navbar-header {
float: left;
}
.navbar-right {
float: right;
margin: 0;
}
/** initial setup **/
.nano {
position : relative;
@ -117,10 +131,16 @@ a.footer_lang_link {
a.footer_lang_link.active {
font-weight: bold;
}
a.footer_link {
color: #9cacb9;
padding: 0 3px;
}
.footer_brand:hover,
.footer_brand:active,
a.footer_lang_link.active:hover,
a.footer_lang_link.active:active {
a.footer_lang_link.active:active,
a.footer_link.active:hover,
a.footer_link.active:active {
color: #8499aa;
text-decoration: none;
}
@ -751,6 +771,18 @@ div.im_panel_own_photo {
.settings_version {
color: #999;
}
.modal_section_body dl.settings_modal_language {
margin: 3px 0;
}
.modal_section_body dl.settings_modal_language dt {
padding-top: 2px;
}
.settings_modal_language_select {
font-size: 12px;
height: 21px;
line-height: 21px;
padding: 0;
}
.icon-volume-outer {
display: inline-block;
background: #c7c7c7;

11
css/mobile.css

@ -114,6 +114,7 @@ html {
.tg_page_head .navbar-quick-nav {
display: block;
float: none;
margin: 0;
}
.tg_page_head .navbar-quick-nav li {
@ -382,6 +383,10 @@ html {
width: auto;
max-width: 250px;
}
.im_message_video {
width: auto;
max-width: 250px;
}
.im_message_document {
position: relative;
}
@ -798,7 +803,7 @@ a.im_message_fwd_author {
box-shadow: none;
}
.mobile_modal .modal-dialog {
margin: 0;
margin: 0 auto;
}
.mobile_modal .modal-content .modal-body {
padding-left: 0;
@ -1040,8 +1045,8 @@ a.mobile_modal_action .tg_checkbox_label {
border-radius: 4px;
}
.emoji-wysiwyg-editor {
min-height: 32px;
max-height: 150px;
min-height: 18px;
max-height: 136px;
margin-bottom: 0;
font-size: 15px;
}

38
js/app.js

File diff suppressed because one or more lines are too long

2
js/background.js

@ -1,5 +1,5 @@
/*!
* Webogram v0.3.4 - messaging web application for MTProto
* Webogram v0.3.5 - 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.3.4 - messaging web application for MTProto
* Webogram v0.3.5 - 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.3.4 - messaging web application for MTProto
* Webogram v0.3.5 - 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

9
js/locales/de-de.json

@ -103,7 +103,6 @@
"confirm_modal_update_reload": "Eine neue Telegram Web Version wurde geladen. Jetzt starten?",
"confirm_modal_history_flush": "Sicher? Es kann nicht rückgängig gemacht werden!",
"confirm_modal_terminate_sessions": "Bist du sicher, dass du alle Geräte bis auf dieses hier abmelden willst?",
"confirm_modal_mixed_content_fail_http_redirect_md": "Dein Browser {moz-link: unterstützt nicht} http und https gleichzeitig, was jedoch für die MTProto-Unterstützung über https nötig ist. {issue-link: Erfahre mehr}\n\nWillst du stattdessen die http-Version verwenden?",
"confirm_modal_clipboard_file_send": "Willst du wirklich die Datei(en) aus der Zwischenablage senden?",
"confirm_modal_clipboard_X_files_send": "{'one': 'Wirklich die Datei aus der Zwischenablage senden?', 'other': 'Wirklich die {} Dateien aus der Zwischenablage senden?'}",
"confirm_modal_message_delete": "Willst du diese Nachricht wirklich löschen?",
@ -112,7 +111,10 @@
"confirm_modal_forward_to_peer": "An {peer} weiterleiten?",
"confirm_modal_send_to_peer": "An {peer} senden?",
"confirm_modal_share_file_peer": "Mit {peer} teilen?",
"confirm_modal_apply_lang_with_reload_md": "Spracheinstellungen gespeichert.\nTelegram Web jetzt neustarten?",
"confirm_modal_apply_lang_with_reload_md": "App neu laden, um die neue Sprache zu verwenden?",
"confirm_modal_migrate_to_https_md": "Telegram Web unterstützt nun zusätzlich SSL-Verschlüsselung. Möchtest du zur HTTPS-Version wechseln?\nDie HTTP-Version wird bald deaktiviert werden.",
"confirm_modal_resize_desktop_md": "Möchtest du zur Desktopansicht wechseln?",
"confirm_modal_resize_mobile_md": "Möchtest du zur mobilen Ansicht wechseln?",
"confirm_modal_are_u_sure": "Bist du sicher?",
"confirm_modal_logout_submit": "Abmelden",
"confirm_modal_history_flush_submit": "Chat löschen",
@ -180,6 +182,7 @@
"error_modal_flood_title": "Zu schnell",
"error_modal_internal_title": "Serverfehler",
"error_modal_alert": "Warnung",
"error_modal_media_not_supported_title": "Nicht unterstütze Medien",
"error_modal_network_description": "Bitte überprüfe deine Internetverbindung.",
"error_modal_firstname_invali_description": "Der eingegebene Vorname ist ungültig.",
"error_modal_lastname_invalid_description": "Der eingegebene Nachname ist ungültig.",
@ -193,6 +196,7 @@
"error_modal_username_invalid_description": "Verzeihung, dieser Benutzername ist nicht erlaubt.",
"error_modal_phonebook_required_description": "Telegram benötigt Zugriff aufs Telefonbuch um Kontakte zu importieren.",
"error_modal_username_occupied_description": "Benutzername ist leider schon belegt.",
"error_modal_media_not_supported_description": "Dein Browser kann diese Mediendatei nicht wiedergeben. Lade die Datei herunter und versuche sie mit einem externen Player zu öffnen.",
"error_modal_bad_request_description": "Eine Parameter fehlt oder ist ungültig.",
"error_modal_unauthorized_description": "Diese Aktion benötigt autorisierten Zugriff. Bitte {login-link: melde dich an}.",
"error_modal_forbidden_description": "Diese Aktion ist für dich nicht erlaubt.",
@ -224,6 +228,7 @@
"head_waiting_for_network": "Warte auf Verbindung",
"head_retry": "Erneut versuchen",
"head_connecting": "Verbinde",
"footer_twitter": "Twitter",
"im_new_group": "Neue Gruppe",
"im_new_contact": "Neuer Kontakt",
"im_contacts": "Kontakte",

9
js/locales/en-us.json

@ -119,7 +119,6 @@
"confirm_modal_update_reload": "A new version of Telegram Web has been downloaded. Launch it?",
"confirm_modal_history_flush": "Are you sure? This can not be undone!",
"confirm_modal_terminate_sessions": "Are you sure you want to log out all devices except for the current one?",
"confirm_modal_mixed_content_fail_http_redirect_md": "Your browser {moz-link: does not support} mixed content which is neccessary for MTProto support on https. {issue-link: Learn more}\n\n Would you like to use http-version instead?",
"confirm_modal_clipboard_file_send": "Are you sure to send file(s) from clipboard?",
"confirm_modal_clipboard_X_files_send": "{'one': 'Are you sure to send file from clipboard?', 'other': 'Are you sure to send {} files from clipboard?'}",
"confirm_modal_message_delete": "Are you sure you want to delete the message?",
@ -128,7 +127,10 @@
"confirm_modal_forward_to_peer": "Forward to {peer}?",
"confirm_modal_send_to_peer": "Send to {peer}?",
"confirm_modal_share_file_peer": "Share with {peer}?",
"confirm_modal_apply_lang_with_reload_md": "Language preference was saved.\nReload the App now?",
"confirm_modal_apply_lang_with_reload_md": "Reload the App to apply language?",
"confirm_modal_migrate_to_https_md": "Telegram Web now supports additional SSL encryption. Would you like to switch to HTTPS?\nThe HTTP version will be disabled soon.",
"confirm_modal_resize_desktop_md": "Would you like to switch to desktop version?",
"confirm_modal_resize_mobile_md": "Would you like to switch to mobile version?",
"confirm_modal_are_u_sure": "Are you sure?",
"confirm_modal_logout_submit": "Log Out",
@ -255,6 +257,9 @@
"head_retry": "Retry",
"head_connecting": "Connecting",
"footer_twitter": "Twitter",
"im_new_group": "New Group",
"im_new_contact": "New Contact",
"im_contacts": "Contacts",

9
js/locales/it-it.json

@ -103,7 +103,6 @@
"confirm_modal_update_reload": "Una nuova versione di Telegram Web è stata scaricata. Vuoi avviarla?",
"confirm_modal_history_flush": "Sei sicuro? L'operazione non può essere annullata!",
"confirm_modal_terminate_sessions": "Sei sicuro di voler disconnettere tutti i dispositivi tranne questo?",
"confirm_modal_mixed_content_fail_http_redirect_md": "Il tuo browser {moz-link: does not support} un contenuto misto che è necessario per il supporto MTProto su https. {issue-link: Learn more}\n\nPreferisci usare la versione http?",
"confirm_modal_clipboard_file_send": "Sei sicuro di inviare il(i) file presenti negli appunti?",
"confirm_modal_clipboard_X_files_send": "{'one': 'Sei sicuro di inviare il file dagli appunti?', 'other': 'Sei sicuro di inviare {} file dagli appunti?'}",
"confirm_modal_message_delete": "Sei sicuro di voler eliminare il messaggio?",
@ -112,7 +111,10 @@
"confirm_modal_forward_to_peer": "Inoltra a {peer}?",
"confirm_modal_send_to_peer": "Invia a {peer}?",
"confirm_modal_share_file_peer": "Condividi con {peer}?",
"confirm_modal_apply_lang_with_reload_md": "La scelta della lingua è stata salvata.\nRiavviare adesso l'App?",
"confirm_modal_apply_lang_with_reload_md": "Riavviare l'App per impostare la lingua?",
"confirm_modal_migrate_to_https_md": "Telegram Web supporta un ulteriore tipo di crittografia SSL. Vuoi passare alla versione HTTPS?\nLa versione HTTP sarà disabilitata presto.",
"confirm_modal_resize_desktop_md": "Vuoi passare alla versione desktop?",
"confirm_modal_resize_mobile_md": "Vuoi passare alla versione mobile?",
"confirm_modal_are_u_sure": "Sei sicuro?",
"confirm_modal_logout_submit": "Disconnetti",
"confirm_modal_history_flush_submit": "Elimina Chat",
@ -180,6 +182,7 @@
"error_modal_flood_title": "Troppo veloce",
"error_modal_internal_title": "Errore server",
"error_modal_alert": "Attenzione",
"error_modal_media_not_supported_title": "Media non supportato",
"error_modal_network_description": "Per favore controlla la tua connessione a internet",
"error_modal_firstname_invali_description": "Il nome che hai inserito non è valido",
"error_modal_lastname_invalid_description": "Il cognome che hai inserito non è valido",
@ -193,6 +196,7 @@
"error_modal_username_invalid_description": "Ci spiace, questo nome utente non è consentito.",
"error_modal_phonebook_required_description": "Telegram ha bisogno di accedere alla tua rubrica per importare i contatti.",
"error_modal_username_occupied_description": "Ci spiace, questo nome utente è già stato preso",
"error_modal_media_not_supported_description": "Il tuo browser non può riprodurre questo media. Prova a scaricarlo e ad aprirlo in un lettore esterno.",
"error_modal_bad_request_description": "Un parametro è mancante o errato.",
"error_modal_unauthorized_description": "L'azione necessita dell'autorizzazione d'accesso. Per favore {login-link: log in}.",
"error_modal_forbidden_description": "Non sei autorizzato a questa operazione.",
@ -224,6 +228,7 @@
"head_waiting_for_network": "In attesa di connettività",
"head_retry": "Riprova",
"head_connecting": "Connessione in corso",
"footer_twitter": "Twitter",
"im_new_group": "Nuovo Gruppo",
"im_new_contact": "Nuovo Contatto",
"im_contacts": "Contatti",

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.3.4",
"version": "0.3.5",
"short_name": "Webogram",
"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.3.4",
"version": "0.3.5",
"type": "privileged",
"launch_path": "/index.html",
"developer": {

2
webogram.appcache

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Wed Nov 12 2014 22:59:29 GMT+0300 (MSK)
# Time: Fri Nov 14 2014 18:11:44 GMT+0300 (MSK)
CACHE:

Loading…
Cancel
Save