Browse Source

merged with master

gh-pages
Igor Zhukov 10 years ago
parent
commit
bbd023db87
  1. 16
      app.manifest
  2. 2
      badbrowser.html
  3. 2
      css/app.css
  4. 15
      css/desktop.css
  5. 53
      css/mobile.css
  6. BIN
      img/T_LogoM.png
  7. BIN
      img/T_LogoM_1x.png
  8. BIN
      img/Telegram.png
  9. BIN
      img/Telegram_2x.png
  10. BIN
      img/WebIntro1.png
  11. BIN
      img/WebIntro1_1x.png
  12. BIN
      img/WebIntro2.png
  13. BIN
      img/WebIntro2_1x.png
  14. BIN
      img/WebIntro3.png
  15. BIN
      img/WebIntro3_1x.png
  16. BIN
      img/bg_tile.png
  17. BIN
      img/changelog/search.png
  18. BIN
      img/decentralization.png
  19. BIN
      img/logo_dogogram.png
  20. 2
      index.html
  21. 8
      js/app.js
  22. 2
      js/background.js
  23. 2
      js/lib/bin_utils.js
  24. 2
      js/lib/crypto_worker.js
  25. 20
      js/locales/en-us.json
  26. 2
      manifest.json
  27. 2
      manifest.webapp
  28. 16
      webogram.appcache

16
app.manifest

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Tue Dec 30 2014 19:25:17 GMT+0100 (CET)
# Time: Wed Dec 31 2014 18:14:48 GMT+0100 (CET)
CACHE:
@ -9,19 +9,11 @@ favicon_unread.ico
css/app.css
css/desktop.css
css/mobile.css
img/T_LogoM.png
img/T_LogoM_1x.png
img/Telegram.png
img/Telegram72.png
img/Telegram72_2x.png
img/WebIntro1.png
img/WebIntro1_1x.png
img/WebIntro2.png
img/WebIntro2_1x.png
img/WebIntro3.png
img/WebIntro3_1x.png
img/bg_tile.png
img/Telegram_2x.png
img/blank.gif
img/decentralization.png
img/emojisprite_0.png
img/emojisprite_1.png
img/emojisprite_2.png
@ -29,14 +21,12 @@ img/emojisprite_3.png
img/emojisprite_4.png
img/iphone_home120.png
img/iphone_startup.png
img/logo_dogogram.png
img/logo_share.png
img/sound_a.wav
js/app.js
nacl/mtproto_crypto.nmf
nacl/mtproto_crypto.pexe
img/changelog/card_wecandoit.png
img/changelog/search.png
img/icons/AboutLogos_1x.png
img/icons/AboutLogos_2x.png
img/icons/Checks1_1x.png

2
badbrowser.html

@ -1 +1 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns=http://www.w3.org/1999/xhtml xml:lang=en lang=en style="display:block; overflow: auto; background: #f8f8f8;"><head><meta charset=utf-8><meta name=viewport content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"><title>Telegram Web</title><link rel=stylesheet href=css/app.css><link rel=icon href=favicon.ico type=image/x-icon></head><body class="non_osx is_1x"><div class=tg_page_head style="clear: both;"><div class="navbar navbar-static-top navbar-inverse navbar_peer_not_selected" role=navigation><div class=container><div class="navbar-header pull-left"><a class=navbar-brand href=index.html><span class=tg_head_logo></span></a></div><div class="navbar-menu pull-right"><ul class="nav navbar-nav navbar-right" style="margin: 0;"><li ng-if=!isLoggedIn><a href=https://github.com/zhukov/webogram target=_blank>About</a></li></ul></div></div></div></div><div class=welcome_form style="padding-bottom: 50px; clear: both;"><img class=welcome_logo src=img/decentralization.png><h3 class=welcome_header><strong>Telegram</strong> Web</h3><div class=bad_browser_wrap><h2>Your browser is outdated!</h2><div class=bad_browser_text><p>Don't take this personally, but your browser is too old to run <strong>Telegram Web</strong>.<br>We require HTML5 support for the MTProto secure messaging protocol to work.</p><p>Unfortunately, your current browser doesn't support HTML5.<br>Please download a modern browser and come back soon!</p></div><a class="btn btn-primary btn-lg pull-right" href=//firefox.com target=_blank>Download Mozilla Firefox</a> <a class="btn btn-primary btn-lg" href=//google.com/chrome target=_blank>Download Google Chrome</a></div></div><div class=welcome_footer><div class="welcome_cards_wrap clearfix"><div class=container-fluid><div class=row><div class="col-md-4 col-sm-4" style="width: 33.33333333%; float: left;"><div class="welcome_footer_card_wrap row"><div class="welcome_footer_card welcome_footer_card_messaging"></div><h4>Fast messaging</h4><div class=welcome_footer_card_lead>Send messages with rich emoji support right from your desktop or laptop computer</div></div></div><div class="col-md-4 col-sm-4" style="width: 33.33333333%; float: left;"><div class=welcome_footer_card_wrap><div class="welcome_footer_card welcome_footer_card_filesharing"></div><h4>Easy file sharing</h4><div class=welcome_footer_card_lead>Share files of any type using drag-and-drop or the attachment icon</div></div></div><div class="col-md-4 col-sm-4" style="width: 33.33333333%; float: left;"><div class=welcome_footer_card_wrap><div class="welcome_footer_card welcome_footer_card_powerful"></div><h4>Powerful tools</h4><div class=welcome_footer_card_lead>Browse shared media and files by type \n and set custom notifications</div></div></div></div></div></div></div></body></html>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns=http://www.w3.org/1999/xhtml xml:lang=en lang=en style="display:block; overflow: auto; background: #f8f8f8;"><head><meta charset=utf-8><meta name=viewport content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"><title>Telegram Web</title><link rel=stylesheet href=css/app.css><link rel=icon href=favicon.ico type=image/x-icon></head><body class="non_osx is_1x"><div class=welcome_form style="padding-bottom: 50px; clear: both;"><div class=bad_browser_wrap><h2>Your browser is outdated!</h2><div class=bad_browser_text><p>Don't take this personally, but your browser is too old to run <strong>Telegram Web</strong>.<br>We require HTML5 support for the MTProto secure messaging protocol to work.</p><p>Unfortunately, your current browser doesn't support HTML5.<br>Please download a modern browser and come back soon!</p></div><a class="btn btn-primary btn-lg pull-right" href=//firefox.com target=_blank>Download Mozilla Firefox</a> <a class="btn btn-primary btn-lg" href=//google.com/chrome target=_blank>Download Google Chrome</a></div></div></body></html>

2
css/app.css

File diff suppressed because one or more lines are too long

15
css/desktop.css

@ -162,6 +162,9 @@
.tg_head_peer_dropdown {
float: right;
}
.tg_head_msgs_edit_btn {
float: right;
}
.tg_head_peer_status {
font-weight: normal;
}
@ -182,10 +185,11 @@
}
.tg_head_peer_dropdown .dropdown-menu > li > a {
font-size: 12px;
font-size: 13px;
line-height: 15px;
padding: 11px 18px 11px 18px;
color: #52719a;
font-weight: bold;
}
.tg_head_peer_dropdown .dropdown-menu > li > a:hover {
background: #f3f6fa;
@ -632,6 +636,7 @@ a.footer_link.active:active {
min-width: 0;
width: auto;
padding: 0;
font-weight: bold;
}
.im_submit:hover {
color: #2c78b6;
@ -1406,9 +1411,17 @@ div.im_dialog_photo .peer_initials {
transition: margin-top linear 0.2s;
}
.countries_modal_search {
padding: 12px 12px 12px;
margin: 0;
position: relative;
}
.countries_modal_col {
max-height: 350px;
}
.countries_modal_wrap .md_modal_body {
padding-bottom: 15px;
}
.modal_close_wrap {

53
css/mobile.css

@ -45,29 +45,12 @@ html {
}
.tg_page_head .navbar > .container .navbar-brand {
padding: 8px 15px;
opacity: 0.9;
margin-left: 0;
margin-right: 20px;
-webkit-transition: opacity swing .9s;
display: block;
line-height: 0;
height: auto;
}
.tg_page_head .navbar > .container .navbar-brand:hover {
opacity: 1;
}
.tg_head_logo {
background: url(../img/T_LogoM.png) 0 0 no-repeat;
background-size: 143px 30px;
display: inline-block;
width: 143px;
height: 30px;
vertical-align: text-top;
}
.is_1x .tg_head_logo {
background-image: url(../img/T_LogoM_1x.png);
}
.tg_page_head .navbar-menu .navbar-nav.navbar-right {
margin-right: 0;
}
@ -294,7 +277,7 @@ html {
float: left;
margin: 0;
}
.navbar_offline .tg_head_logo {
.navbar_offline .tg_logo_wrap {
display: none;
}
.navbar-offline > li > a {
@ -371,22 +354,36 @@ html {
-webkit-overflow-scrolling: touch;
}
.welcome_text {
line-height: 150%;
.login_head_bg {
display: none;
}
.login_page {
margin-top: 0;
margin-bottom: 30px;
}
.login_head_wrap {
height: 75px;
background: #537c9a;
}
.login_form_wrap {
border-radius: 0;
max-width: auto;
border-top: 0;
border-left: 0;
border-right: 0;
box-shadow: none;
-webkit-box-shadow: none;
margin: 30px auto 20px;
padding: 44px 40px 44px;
}
.login_form_wrap .btn-primary {
padding: 12px 13px;
.login_footer_about_wrap {
border-radius: 0;
border-top: 0;
border-left: 0;
border-right: 0;
box-shadow: none;
padding: 44px 40px 44px;
}
.login_phone_country,
.login_phone_number {
height: 42px;
.icon-next-submit {
margin-top: -3px;
}
.im_dialogs_empty_header {

BIN
img/T_LogoM.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

BIN
img/T_LogoM_1x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
img/Telegram.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
img/Telegram_2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
img/WebIntro1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

BIN
img/WebIntro1_1x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

BIN
img/WebIntro2.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

BIN
img/WebIntro2_1x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
img/WebIntro3.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

BIN
img/WebIntro3_1x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
img/bg_tile.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 281 KiB

BIN
img/changelog/search.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
img/decentralization.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

BIN
img/logo_dogogram.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

2
index.html

@ -1 +1 @@
<!doctype html><html lang=en manifest=webogram.appcache ng-csp xmlns:ng=http://angularjs.org id=ng-app><head><meta charset=utf-8><meta name=viewport content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"><title>Telegram Web</title><link rel=stylesheet href=css/app.css><link href="//fonts.googleapis.com/css?family=Open+Sans:400,600&amp;subset=cyrillic,cyrillic-ext,latin,latin-ext" rel=stylesheet type=text/css><link rel=icon href=favicon.ico type=image/x-icon><link rel=apple-touch-icon href=img/iphone_home120.png><link rel=apple-touch-icon sizes=120x120 href=img/iphone_home120.png><link rel=apple-touch-startup-image media="(device-width: 320px)" href=img/iphone_startup.png><meta name=apple-mobile-web-app-title content="Telegram Web"><meta name=mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black-translucent><meta name=theme-color content=#497495><meta property=og:title content="Telegram Web"><meta property=og:url content="https://web.telegram.org/webogram/"><meta property=og:image content=https://web.telegram.org/webogram/img/logo_share.png><meta property=og:site_name content="Telegram Web"><meta property=og:description content="Welcome to the Web application of Telegram messenger. See https://github.com/zhukov/webogram for more info."></head><body><div class=page_wrap ng-view></div><div id=notify_sound></div><script src=js/app.js></script></body></html>
<!doctype html><html lang=en manifest=webogram.appcache ng-csp xmlns:ng=http://angularjs.org id=ng-app><head><meta charset=utf-8><meta name=viewport content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"><title>Telegram Web</title><link rel=stylesheet href=css/app.css><link rel=icon href=favicon.ico type=image/x-icon><link rel=apple-touch-icon href=img/iphone_home120.png><link rel=apple-touch-icon sizes=120x120 href=img/iphone_home120.png><link rel=apple-touch-startup-image media="(device-width: 320px)" href=img/iphone_startup.png><meta name=apple-mobile-web-app-title content="Telegram Web"><meta name=mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black-translucent><meta name=theme-color content=#497495><meta property=og:title content="Telegram Web"><meta property=og:url content="https://web.telegram.org/webogram/"><meta property=og:image content=https://web.telegram.org/webogram/img/logo_share.png><meta property=og:site_name content="Telegram Web"><meta property=og:description content="Welcome to the Web application of Telegram messenger. See https://github.com/zhukov/webogram for more info."></head><body><div class=page_wrap ng-view></div><div id=notify_sound></div><script src=js/app.js></script></body></html>

8
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.8 - messaging web application for MTProto
* Webogram v0.3.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.3.8 - messaging web application for MTProto
* Webogram v0.3.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.3.8 - messaging web application for MTProto
* Webogram v0.3.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

20
js/locales/en-us.json

@ -326,7 +326,9 @@
"login_sign_in": "Sign in",
"login_enter_number_description": "Please choose your country and enter your full phone number.",
"login_incorrect_number": "Incorrect phone number",
"login_tel_input_placeholder": "Enter your phone",
"login_code_input_placeholder": "Code",
"login_tel_input_placeholder": "Phone number",
"login_country_select_placeholder": "Country",
"login_generating_key": "Generating keys",
"login_generating_keys_info": "Keys are only generated once. This can take a few minutes on slower devices, please be patient.",
"login_edit_number": "Edit phone number",
@ -347,6 +349,12 @@
"login_last_name": "Last name",
"login_signing_up": "Signing up",
"login_sign_up": "Sign up",
"login_about_title": "About",
"login_about_desc1_md": "Telegram web-client is free, fast and secure way to enjoy most of the **Telegram** features right from your **web-browser**.",
"login_about_desc2_md": "It is always synced to to the **Telegram app** on your mobile device, which makes it a pretty useful tool for messaging and sharing files.",
"login_about_desc3_md": "We designed this product not because we were told to, but because we wanted it for ourselves. Our {source-link: source code} is open, so everyone can make a contribution.",
"login_about_intro": "Welcome to the official Telegram web-client.",
"login_about_learn": "Learn more",
"login_controller_unknown_country": "Unknown",
@ -378,16 +386,6 @@
"phonebook_modal_submit_active": "Importing",
"phonebook_modal_submit": "Import contacts",
"welcome_header_md": "**Telegram** Web",
"welcome_text_1_md": "The official **web client** for Telegram.",
"welcome_start_messaging": "Start Messaging",
"welcome_fast_messaging_header": "Fast messaging",
"welcome_fast_messaging_text": "Send messages with rich emoji support right from your desktop or laptop computer",
"welcome_easy_sharing_header": "Easy file sharing",
"welcome_easy_sharing_text": "Share files of any type using drag-and-drop or the attachment icon",
"welcome_powerful_tools_header": "Powerful tools",
"welcome_powerful_tools_text_md": "Browse shared media and files by type \n and set custom notifications",
"country_select_modal_country_ab": "Abkhazia",
"country_select_modal_country_af": "Afghanistan",
"country_select_modal_country_ax": "Åland Islands",

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.8",
"version": "0.3.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.3.8",
"version": "0.3.9",
"type": "privileged",
"launch_path": "/index.html",
"developer": {

16
webogram.appcache

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Tue Dec 30 2014 19:25:17 GMT+0100 (CET)
# Time: Wed Dec 31 2014 18:14:48 GMT+0100 (CET)
CACHE:
@ -9,19 +9,11 @@ favicon_unread.ico
css/app.css
css/desktop.css
css/mobile.css
img/T_LogoM.png
img/T_LogoM_1x.png
img/Telegram.png
img/Telegram72.png
img/Telegram72_2x.png
img/WebIntro1.png
img/WebIntro1_1x.png
img/WebIntro2.png
img/WebIntro2_1x.png
img/WebIntro3.png
img/WebIntro3_1x.png
img/bg_tile.png
img/Telegram_2x.png
img/blank.gif
img/decentralization.png
img/emojisprite_0.png
img/emojisprite_1.png
img/emojisprite_2.png
@ -29,14 +21,12 @@ img/emojisprite_3.png
img/emojisprite_4.png
img/iphone_home120.png
img/iphone_startup.png
img/logo_dogogram.png
img/logo_share.png
img/sound_a.wav
js/app.js
nacl/mtproto_crypto.nmf
nacl/mtproto_crypto.pexe
img/changelog/card_wecandoit.png
img/changelog/search.png
img/icons/AboutLogos_1x.png
img/icons/AboutLogos_2x.png
img/icons/Checks1_1x.png

Loading…
Cancel
Save