Misterzym
/
webogram
mirror of https://github.com/misterzym/webogram.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

merged with master

gh-pages
Igor Zhukov 10 years ago
parent
ec9669b70e
commit
bd3e840a2a
12 changed files with 34 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app.manifest
  2. 10
      css/app.css
  3. 7
      css/mobile.css
  4. 26
      js/app.js
  5. 2
      js/background.js
  6. 2
      js/lib/bin_utils.js
  7. 2
      js/lib/crypto_worker.js
  8. 1
      js/locales/en-us.json
  9. 6
      js/locales/ru-ru.json
  10. 2
      manifest.json
  11. 9
      manifest.webapp
  12. 2
      webogram.appcache

2
app.manifest
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Wed Nov 25 2015 19:47:36 GMT+0300 (MSK)
# Time: Sun Nov 29 2015 21:03:01 GMT+0300 (MSK)
CACHE:

10
css/app.css
Unescape View File

@ -1326,6 +1326,7 @@ a.im_dialog:hover .im_dialog_message_text,a.im_dialog_selected .im_dialog_messag
.im_dialog_badge{background:#64c270;font-size:11px;padding:5px;border-radius:11px;min-width:21px;text-align:center;margin-top:4px}
.active .im_dialog_badge{color:#428bca;background-color:#fff}
.im_dialogs_modal_col .im_dialog_badge{display:none}
.im_dialog_badge_muted{background:#ccc}
.im_dialog_unread{background:#c1d6e5;display:inline-block;float:right;width:8px;height:8px;border-radius:5px;overflow:hidden;margin:12px 0 0}
a.im_dialog:hover .im_dialog_unread,a.im_dialog_selected .im_dialog_unread{background:#a3c0d4}
.active .im_dialog_unread{background-color:#a4c4dd}
@ -1699,11 +1700,12 @@ img.chat_modal_participant_photo{width:40px;height:40px}
.sessions_modal_session_device{margin:3px 0}
.sessions_modal_session_location{color:#777}
.sessions_modal_other_splitter{margin:15px 0 20px 24px}
.stickerset_modal_window .modal-dialog{max-width:474px}
.stickerset_modal_window .modal-dialog{max-width:642px;width:auto}
.stickerset_modal_stickers_list{padding:25px}
.stickerset_modal_sticker_wrap{list-style:none;margin:0 10px 10px 0;padding:0;position:relative;display:block;width:96px;height:96px;float:left}
.stickerset_modal_sticker{width:96px;height:96px}
.stickerset_modal_sticker img{max-width:96px;max-height:96px}
.stickerset_modal_sticker_wrap{margin:0 5px 5px 0;padding:0;position:relative;display:block;width:192px;height:192px;float:left;border-radius:3px;overflow:hidden}
.stickerset_modal_sticker_wrap:hover{background:#f2f6fa}
.stickerset_modal_sticker{width:192px;height:192px}
.stickerset_modal_sticker img{max-width:192px;max-height:192px}
.stickerset_modal_sticker_alt{position:absolute;bottom:0;right:0}
.stickerset_actions{padding:10px 20px;height:50px;text-align:center}
.stickerset_modal_loading{text-align:center;color:#999;font-size:16px;line-height:18px;padding:1px 50px;margin:0}

7
css/mobile.css
Unescape View File

@ -1400,9 +1400,10 @@ a.media_modal_date:hover {
padding: 10px;
}
.stickerset_modal_sticker_wrap,
.stickerset_modal_sticker_wrap img {
width: 64px;
height: 64px;
.stickerset_modal_sticker_wrap img,
.stickerset_modal_sticker {
width: 90px;
height: 90px;
}
.message_actions_modal_window {
max-width: 220px;

26
js/app.js
View File

File diff suppressed because one or more lines are too long

2
js/background.js
Unescape View File

@ -1,5 +1,5 @@
/*!
* Webogram v0.5.1 - messaging web application for MTProto
* Webogram v0.5.2 - 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
Unescape View File

@ -1,5 +1,5 @@
/*!
* Webogram v0.5.1 - messaging web application for MTProto
* Webogram v0.5.2 - 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
Unescape View File

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

1
js/locales/en-us.json
Unescape View File

@ -106,6 +106,7 @@
"stickerset_modal_title_loading": "Stickerset",
"stickerset_modal_install": "Add stickers",
"stickerset_modal_uninstall": "Remove stickers",
"stickerset_modal_share": "Share",
"stickerset_modal_loading": "Loading{dots}",
"page_title_pluralize_notifications": "{'0': 'No notifications', 'one': '1 notification', 'other': '{} notifications'}",

6
js/locales/ru-ru.json
Unescape View File

@ -23,18 +23,18 @@
"group_modal_settings": "Настройки",
"group_modal_notifications": "Уведомления",
"group_modal_menu_share_link": "Пригласить в группу по ссылке",
"group_modal_migrate_to_supergroup": "Upgrade to supergroup",
"group_modal_migrate_to_supergroup": "Преобразовать в супергруппу",
"group_modal_members": "Участники",
"group_modal_members_kick": "Исключить",
"group_modal_migrate_header": "Members limit reached",
"group_modal_migrate_desc": "To go over the limit and get additional features, upgrade to a supergroup:",
"group_modal_migrate_desc": "Чтобы обойти предел и получить дополнительные функции, улучшите до супергруппы:",
"group_modal_migrate_item1": "Supergroups can get up to 1000 members",
"group_modal_migrate_item2": "New members see the entire chat history",
"group_modal_migrate_item3": "Admins delete messages for everyone",
"group_modal_migrate_item4": "Notifications are muted by default",
"group_modal_delete_group": "Delete group",
"channel_modal_info": "Channel info",
"channel_modal_description": "Description",
"channel_modal_description": "Описание",
"channel_modal_share_link": "Share link",
"channel_modal_share_loading": "Loading{dots}",
"channel_modal_join": "Join channel",

2
manifest.json
Unescape View File

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

9
manifest.webapp
Unescape View File

@ -1,7 +1,7 @@
{
"name": "Telegram",
"description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
"version": "0.5.1",
"version": "0.5.2",
"type": "privileged",
"launch_path": "/index.html",
"developer": {
@ -71,13 +71,6 @@
}
},
"returnValue": false
},
"webrtc-call": {
"href": "index.html",
"filters": {
"type": "webcontacts/contact"
},
"disposition": "window"
}
},
"orientation": "portrait-primary",

2
webogram.appcache
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Wed Nov 25 2015 19:47:36 GMT+0300 (MSK)
# Time: Sun Nov 29 2015 21:03:01 GMT+0300 (MSK)
CACHE:

Write Preview
Loading…
Cancel
Save