John Preston
802349d042
Version 0.10.19: Critical bug fix of Session::needToResumeAndSend().
2016-10-24 23:37:43 +03:00
John Preston
53e48beb03
Merge branch 'dev'
2016-10-24 16:44:48 +03:00
John Preston
d2e27726ca
Version 0.10.18: new cute design for adding members to your groups.
2016-10-24 16:31:36 +03:00
John Preston
a774e9b712
Closed beta 0.10.17.2: macOS animation improvements, multiselect design.
2016-10-24 00:25:29 +03:00
John Preston
6d9173bca8
Version 0.10.17 alpha: new cute control for adding members to groups.
2016-10-22 23:29:25 +03:00
John Preston
c1d862d8de
Some icons moved from sprite to separate files.
2016-10-22 21:58:36 +03:00
John Preston
48332c0c6b
Ui::MultiSelect control ready.
2016-10-22 18:59:36 +03:00
John Preston
e5a5273b3a
Scrollable boxes reorganized: _scroll always owns _inner.
...
Also some boxes moved to separate modules: MembersBox, StickersBox.
2016-10-22 18:59:33 +03:00
John Preston
2bd561821a
Using cute userpic checkbox Ui::RoundImageCheckbox in ContactsBox.
2016-10-22 18:59:32 +03:00
John Preston
5ad2fc12d9
Version 0.10.16 stable: langs updated.
2016-10-19 21:54:11 +03:00
John Preston
9752224449
Version 0.10.16 stable: new media player + notifications update.
2016-10-19 21:47:45 +03:00
John Preston
f1307f70ce
Fixed history scroll state clearing in case bot info was shown.
2016-10-19 17:33:28 +03:00
John Preston
48a20f0e71
Version 0.10.15 alpha: crash fix in new player, close button added.
...
Also some grammar improvements and pinned message bar hiding fixed.
2016-10-18 18:19:13 +03:00
John Preston
b33b59b8b9
Version 0.10.14 alpha: fixed retina icon userpics, langs updated.
2016-10-18 15:00:25 +03:00
John Preston
2f4b2d0a33
Version 0.10.14 alpha: userpic images are now generated as icons.
...
Also fixed Windows build by adding breakpad include path back to gyp.
2016-10-18 14:48:03 +03:00
John Preston
ba4dcc42dc
Version 0.10.14 alpha: using $XDG_DATA_HOME in Linux.
...
If there is no app data in ~/.TelegramDesktop (like in
fresh installs) we use $XDG_DATA_HOME/TelegramDesktop.
2016-10-18 13:32:33 +03:00
John Preston
31a847fb9d
Playlist appearance added to the new media player.
...
Also itemRemoved() now is fired as a global observable.
2016-10-14 20:10:15 +03:00
John Preston
9eb8a93719
Media::Player::Widget added instead of PlayerWidget.
...
New media player bar widget added. Switching between floating
media player panel and media player widget. New volume controller.
2016-10-12 22:36:48 +03:00
John Preston
3c8fb5f1f6
Media player vector button added to new audio player cover.
2016-10-08 21:28:43 +03:00
John Preston
e616c39608
Merge branch 'dev' into player
...
Conflicts:
Telegram/SourceFiles/application.cpp
Telegram/SourceFiles/core/utils.h
Telegram/SourceFiles/localstorage.cpp
Telegram/SourceFiles/pspecific_mac_p.mm
2016-10-08 12:10:33 +03:00
John Preston
f1d52c12ae
Version 0.10.13.alpha: crash fix in custom notifications.
...
Not sending inline bot request drafts to server by timeout.
2016-10-07 19:45:45 +03:00
John Preston
4369c23314
Version 0.10.12.alpha: major notifications update.
2016-10-07 16:24:19 +03:00
John Preston
eb47b9468c
Various fixes.
...
Copy inline keyboard when forwarding messages with a game.
Don't show "Deleted Message" in service message with scores.
Improved tiny web page previews. Ignore right button in emoji panel.
2016-10-07 10:58:34 +03:00
John Preston
e7b6d7b498
Advanced notifications settings box layout done.
2016-10-05 21:37:48 +03:00
John Preston
41dc0f4e98
Hide all button added to default notifications.
2016-10-05 19:56:27 +03:00
John Preston
043cba0a64
Custom notifications inline reply added, positioning broken.
2016-10-04 21:18:08 +03:00
John Preston
a9929a5d51
Merge branch 'master' into notifications
2016-10-04 12:19:00 +03:00
John Preston
9fdd75113f
Bump version to 0.10.11.
2016-10-03 18:45:52 +03:00
John Preston
c9288f2d0a
Native notifications switched off by default. Libnotify supported.
2016-10-03 18:07:50 +03:00
John Preston
aa17702c01
0.10.10: Crashfix: Removed infinite recursion in Ui::FadeAnimation().
2016-10-03 13:09:49 +03:00
John Preston
1d6aba86ba
Removed channel name from first message. Fixed channel members count.
2016-10-02 10:16:33 +03:00
John Preston
ef2faf676e
Version 0.10.9: langs updated, moved shadow icons to separate files.
2016-10-01 15:35:52 +03:00
John Preston
3d2f025e10
Version 0.10.9: games.
2016-09-30 21:18:00 +03:00
John Preston
1b54ccb59c
Merge branch 'game_media' into player
...
Conflicts:
Telegram/Resources/basic.style
Telegram/SourceFiles/media/player/media_player_list.cpp
Telegram/SourceFiles/title.cpp
2016-09-30 20:07:56 +03:00
John Preston
886327a1d0
Playing game state is set for 10 seconds instead of 30.
...
Also moved some icons from sprite to separate b&w files.
2016-09-30 19:40:00 +03:00
John Preston
2ebab6a13c
Beta 10008005: langs updated, new playing game status added.
2016-09-30 16:43:38 +03:00
John Preston
a18e3e5616
Game play send message action is supported.
2016-09-30 16:40:22 +03:00
John Preston
376941dd5e
Mixed channel access hash to the game score encrypted data.
...
Added new lang strings for playing game send actions (not done yet).
Also moved alot of icons from sprite to separate b&w files.
2016-09-30 15:52:03 +03:00
John Preston
a5eee9bd3e
Beta 10008004: games / webpages work fine if media autoload disabled.
...
Also moved alot of file icons from sprite to separate b&w files.
2016-09-29 22:42:14 +03:00
John Preston
5b3ac58578
Merge branch 'game_media' into player
...
Conflicts:
Telegram/SourceFiles/core/basic_types.h
Telegram/SourceFiles/sysbuttons.h
Telegram/SourceFiles/title.cpp
2016-09-29 16:48:43 +03:00
John Preston
01a5aa30df
Beta 10008003: langs updated.
2016-09-29 15:59:30 +03:00
John Preston
6b8d3aa48c
Some layout fixes, std_::align() fixed to work in OS X 10.6-7 build.
2016-09-29 15:57:20 +03:00
John Preston
f1f7333c7a
Removed some old styles. Divided basic_types module to several.
2016-09-29 14:37:16 +03:00
John Preston
73a8d27bfd
You scored phrase for game service messages. Game layout bug fix.
2016-09-29 12:10:32 +03:00
John Preston
139882113d
Closed beta 10008002: games support and some testing.
2016-09-29 00:33:51 +03:00
John Preston
5b7d936140
Some langs updated. Build fixed for Xcode.
2016-09-29 00:33:05 +03:00
John Preston
903795d0e5
Merge branch 'game_media' into player
...
Conflicts:
Telegram/SourceFiles/application.cpp
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
Telegram/SourceFiles/mainwidget.cpp
Telegram/SourceFiles/mainwidget.h
Telegram/SourceFiles/structs.h
2016-09-29 00:31:43 +03:00
John Preston
0562024444
Merge branch 'master' into player
...
Conflicts:
Telegram/SourceFiles/core/observer.h
Telegram/SourceFiles/mainwindow.h
Telegram/SourceFiles/media/view/media_clip_playback.cpp
Telegram/SourceFiles/media/view/media_clip_playback.h
2016-09-29 00:16:02 +03:00
John Preston
344890c533
Game sharing and inline results supported. Qt patch updated.
...
Qt patch now disables QT_SCALE_FACTOR and other HighDpi
environment variables reading because tdesktop doesn't support them.
2016-09-28 19:23:25 +03:00
John Preston
5529e24000
Displaying of games finished.
2016-09-28 14:38:35 +03:00
John Preston
538ffb9727
Moved History[Media] classes to history_media_types module.
2016-09-28 13:15:03 +03:00
John Preston
da49d8440a
Beta 10008001: moved all Notify::Observer-s to base::Subscriber-s.
2016-09-26 21:33:34 +03:00
John Preston
38114d3297
Merge branch 'master' into player
2016-09-23 22:22:40 +03:00
John Preston
3d9e0030c5
Version 0.10.8.
2016-09-23 19:20:04 +03:00
John Preston
780fe61ff2
Merge branch 'games' of https://bitbucket.org/johnprestonmail/telegram-desktop into games
2016-09-23 19:07:02 +03:00
John Preston
f970ac3163
New audio player done (without playlist).
2016-09-23 19:04:26 +03:00
John Preston
5c20ae0411
Merge branch 'games' into player
2016-09-20 18:12:55 +03:00
John Preston
c563280b76
Merge branch 'master' into games
2016-09-20 18:12:49 +03:00
John Preston
75c12dda31
Version 0.10.7: fix of settings saving, fix of OpenSSL in Linux build.
2016-09-20 16:29:34 +03:00
John Preston
f7999bc993
Languages updated. Build in Xcode fixed.
2016-09-20 16:03:42 +03:00
John Preston
227aa36627
Trending sticker sets install improved, masks sets install disallowed.
...
Also rpcDone() and rpcFail() now accept lambdas.
2016-09-19 13:18:21 +03:00
John Preston
50fa8b63c9
Software animated play/pause title button ready, icons for it removed.
2016-09-16 15:49:36 +03:00
John Preston
37b5329af3
Merge branch 'games' into player
2016-09-16 13:44:00 +03:00
John Preston
6d2fc5c642
Game bot confirmations added.
2016-09-15 22:15:49 +03:00
John Preston
578cf4ed61
Merge branch 'master' into games
2016-09-15 21:56:57 +03:00
John Preston
298bd2a476
New player icons and sources created.
2016-09-15 19:32:49 +03:00
John Preston
ffe75444d1
Stable 0.10.6 (only for OS X): fixing Updater erasing.
2016-09-12 18:48:01 +03:00
John Preston
86982da5f7
Merge branch 'master' into games
...
Conflicts:
Telegram/Telegram.pro
2016-09-12 16:35:17 +03:00
John Preston
a62a47098e
Version 0.10.5: new settings. First stable version on GYP.
2016-09-12 15:02:52 +03:00
John Preston
273637f9ac
Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev
2016-09-12 14:51:24 +03:00
John Preston
e90468f67b
Languages updated.
2016-09-12 14:51:00 +03:00
John Preston
f517494c91
Closed beta 0.10.4.1: testing linux GYP build.
2016-09-11 12:35:23 +03:00
John Preston
ff657347b8
Featured stickers section done in StickersPanel.
...
EmojiPan moved to a separate module stickers/emoji_pan.
FFmpeg linked by msvs linker flags in GYP to use ".a" extension.
2016-09-09 18:52:46 +03:00
John Preston
82d92d21f6
ShareBox used to share game score using tg:// link. Scheme updated.
2016-09-07 12:04:57 +03:00
John Preston
52a7ed77ba
First version of ShareBox done, cute animations.
...
Temporarily ShareBox is opened instead of ContactsBox, for testing.
2016-09-06 15:28:37 +03:00
John Preston
326d22565d
Merge branch 'dev' into games
2016-09-03 16:35:29 -04:00
John Preston
ab18fc6478
0.10.4: Same chat msg links fixed. Crash fix attempt in ScrollArea.
...
If the message link is opened in the same chat the ShowWay::Forward
should be ignored.
There was a possible crash in ~ScrollArea() when one of the bars
was already destroyed and the second called ScrollArea::leaveEvent.
Now both bars are ChildWidget<>s and will be destroyed in ~QWidget().
2016-09-03 12:35:12 -04:00
John Preston
610d42fd8d
Merge branch 'dev' into games
2016-09-03 11:51:29 -04:00
John Preston
73b81ac1f4
Alpha version 0.10.3: new settings design, first OS X version by GYP.
2016-09-02 12:28:18 -04:00
John Preston
160895f6e3
Support for game keyboard buttons and score service messages added.
2016-09-02 12:11:23 -04:00
John Preston
07dffb948d
Closed beta 10002002: testin OS X build by GYP.
2016-09-02 01:27:54 -04:00
John Preston
c5f4655b9e
Merge branch 'gyp_xcode' into dev
2016-08-31 16:06:12 -04:00
John Preston
d703746875
Telegram for macOS build from GYP ready, Xcode projects removed.
2016-08-29 20:27:02 -06:00
John Preston
605a45c8ba
New settings build ready in Xcode.
2016-08-28 14:23:32 -06:00
John Preston
b520cf0f78
First version of the new Settings page is finished.
...
Added LocalStorageBox for watching info and clearing local storage.
Local passcode and cloud password state display and editing done.
Temporary download location clearing link added.
Crash fixed in local storage clear + app close, now waiting for the
clearing thread to quit. Some design improvements and testing.
2016-08-28 13:16:23 -06:00
John Preston
993b91ac15
Most of the new Settings sections filled with widgets.
...
Some animations added: new scale slider, widget_slide_wrap<TWidget>.
Any TWidget now can resizeToWidth() with overriden resizeGetHeight().
2016-08-22 19:31:42 +02:00
John Preston
b9e22f59a1
New settings section widgets added. Settings cover section is ready.
2016-08-19 19:26:31 +02:00
John Preston
90678d411f
Started a special LayerWidget: Settings::Widget.
...
Also added some missing calls to parent event handlers in boxes.
2016-08-18 12:52:36 +03:00
John Preston
362b942a22
Merge branch 'same_peer_flag' into dev + fix style codegen rule desc.
...
Conflicts:
Telegram/Telegram.vcxproj
Telegram/Telegram.vcxproj.filters
2016-08-16 20:12:55 +03:00
John Preston
dc6a3ba907
Alpha version 0.10.2: first GYP/Ninja build, some bug and crash fixes.
...
Counting round radius dynamically to work fine with all font sizes.
Added GYP and Ninja to Third-party section. Fix of build script.
2016-08-14 23:38:11 +03:00
John Preston
b0fdddfcf4
New RevokePublicLinkBox done. Added base::lambda_wrap<>. Layer 55.
...
When there are too many public channels / megagroups and you try to
create one more Telegram offers you to revoke one of the existing
public links so you will be able to create a new public community.
2016-08-12 18:22:11 +03:00
John Preston
140522c196
Stable version 0.10.1: various bugfixes.
...
Minimal height of the message text fixed to prevent bubble collapsing.
FileDialog filter is (*) instead of (*.*) for Linux and macOS.
Explicitly setting text color in Settings user name painting.
2016-08-05 18:01:00 +01:00
John Preston
4dded3d09c
Stable version 0.10: video player graphics updated.
2016-08-03 13:32:44 +01:00
John Preston
12bcc88839
Stable version 0.10: langs updated, video player design improvements.
2016-08-03 12:02:53 +01:00
John Preston
a4dbe6f096
ConfirmPhoneBox added to Xcode and QtCreator projects.
...
"Frequently used" done with two lang keys (for emoji/stickers).
"Featured Stickers" -> "Trending Stickers", langs updated.
2016-07-29 11:29:15 +01:00
John Preston
4b98cac6da
Merge branch 'dev_private' of https://bitbucket.org/johnprestonmail/telegram-desktop into dev_private
2016-07-29 11:06:35 +01:00
John Preston
5df54371b5
ConfirmPhoneBox support added.
...
Limiting StartUrl to 8k symbols to prevent share url text overflow.
Better working with many cases of regular expression switch.
2016-07-28 20:01:08 +03:00
John Preston
d9cc70e72b
Prepared 9061001 closed beta to build in Xcode and QtCreator.
2016-07-27 21:36:45 +03:00
John Preston
c0ea6ce346
Langs updated for 9061001 private beta version.
2016-07-27 21:24:32 +03:00
John Preston
c8b89620f5
Private beta version 9061001
2016-07-27 21:22:15 +03:00
John Preston
82a0ac28ad
Handling new 2fa reset account error codes.
...
Archived stickers description text layout fixed in 100% scale.
2016-07-26 12:17:44 +03:00
John Preston
dbdf28d0a0
Version bumped to 0.9.61 stable.
...
Merge branch 'archived_stickers' into cancel_reset.
Conflicts:
Telegram/Resources/winrc/Telegram.rc
Telegram/Resources/winrc/Updater.rc
Telegram/SourceFiles/app.cpp
Telegram/SourceFiles/core/version.h
Telegram/SourceFiles/localstorage.cpp
Telegram/Telegram.vcxproj.filters
Telegram/Telegram.xcodeproj/project.pbxproj
Telegram/build/version
2016-07-25 22:54:40 +03:00
John Preston
75ff3c3d28
Alpha version 0.9.60: some bugfixes in video clip reader.
...
No more error box when click on record button (empty file send attempt).
2016-07-24 11:53:09 +03:00
John Preston
5b7a17e044
0.9.59 alpha version: crash on logout fixed.
2016-07-23 09:39:46 +03:00
John Preston
26723fb820
Alpha version 0.9.58: embedded video player.
2016-07-22 19:22:25 +03:00
John Preston
faad13d07e
Showing archived stickers button, archived stickers box with loading.
2016-07-21 16:57:31 +03:00
John Preston
fa708ada3b
Closed beta 9057001 for testing MediaView video player.
2016-07-19 20:01:40 +03:00
John Preston
49f6431fca
Video play in MediaView support done in Xcode/QtCreator projects.
2016-07-19 15:31:48 +03:00
John Preston
b35c99cb0c
When installing sticker set some sets can be archived.
...
We show a box with them and describing what happend.
Limit of the recent stickers count is taken from config now.
2016-07-18 18:39:10 +03:00
John Preston
95c050081c
Cloud recent sticker sets supported.
2016-07-15 18:58:52 +03:00
John Preston
d806d079a2
Merge branch 'master' into video
...
Conflicts:
Telegram/SourceFiles/mainwidget.cpp
Telegram/SourceFiles/ui/animation.cpp
Telegram/Telegram.pro
2016-07-11 21:12:10 +03:00
John Preston
356b48bcca
Started video player UI in MediaView.
2016-07-11 21:05:46 +03:00
John Preston
66e2fce8d5
New design of a chat invite link import box with title, photo, users.
2016-07-08 19:59:46 +03:00
John Preston
cd36d367ed
Version raised to 0.9.58. Version field of documents supported.
2016-07-08 16:56:53 +03:00
John Preston
2aa35af909
Merge branch 'master' into dev
...
Conflicts:
Telegram/SourceFiles/history/history.style
2016-07-08 13:26:28 +03:00
John Preston
5c474aee27
Improved service messages layout.
2016-07-08 13:06:41 +03:00
John Preston
d98a6d3f82
Alpha version 0.9.57: some design improvements, GTK file chooser.
2016-07-07 19:32:34 +03:00
John Preston
609cacf8b5
Merge branch 'master' of https://github.com/telegramdesktop/tdesktop
2016-07-07 19:19:08 +03:00
John Preston
352b0f2079
Ignoring accents when autocompleting mentions in field_autocomplete.
...
Do nothing instead of showing in folder a media file with bad extension.
Showing descriptive error message when we hit the limit of stickerpacks.
2016-07-07 19:16:47 +03:00
John Preston
db8922f53e
Some buttons and scroll bars style improvements.
...
Not showing notification texts when OS X is in screen locked state.
2016-07-07 19:15:34 +03:00
John Preston
1904a4f48a
Round radius increased for message bubbles.
2016-07-07 15:35:14 +03:00
John Preston
cd696ade4e
Featured stickers fully supported (unread badges, box, adding, etc).
2016-06-28 21:05:38 +03:00
John Preston
991c6ddd99
Saving featured stickers for new 0.9.57 version in local storage.
2016-06-27 19:25:21 +03:00
John Preston
a89185565a
0.9.56 stable. Crash fixed in MediaView after logout and login again.
...
Buttons layout improved in bot inline keyboard.
2016-06-26 18:37:47 +03:00
John Preston
f123755fc6
Languages updated for the new 0.9.56 stable version.
2016-06-26 17:27:02 +03:00
John Preston
5c199e63ea
Main window position and size saving fixed in Windows.
...
Dock and top bar hiding after photo view fixed in OS X.
Some design improvements. Alpha version 0.9.55.
2016-06-24 19:58:41 +03:00
John Preston
cbde6e1ee9
Using square rounded photos in native notifications (Win, OS X).
...
When updating local online status from user action events we use
action timestamp, and ignoring events from getDifference, if no
timestamp is available for the specific action.
Couple of hidden actions added in Settings. Alpha version 0.9.54.
2016-06-22 21:47:43 +03:00
John Preston
701b8c87e6
Selected messages actions (forward, delete, cancel) redesigned.
2016-06-22 20:11:35 +03:00
John Preston
5957382a67
Radial progress in settings when loading a new background from gallery.
...
MediaView handling of screen resolution change fixed.
Media messages now display both name/type and caption in dialogs list.
When viewing group profile photo delete affects either photo or message.
2016-06-22 16:39:54 +03:00
John Preston
6af6ffa1b2
Field autocomplete now replaces text part only up to cursor position.
...
New radial photo load progress in MediaView instead the old 3-dots.
2016-06-21 21:09:48 +03:00
John Preston
c73b5a6da4
Styles improved. Members dropdown is shown with a delay.
...
Overview of chat photos fixed. Tray icon tries read a file on Linux.
2016-06-21 17:19:24 +03:00
John Preston
e47d8c0e03
Added "Add to Group" button in bot profile.
...
Changed new chat icon to more simplified.
Fixed kick user from a new members dropdown in chat history view.
Version 0.9.53.alpha is ready.
2016-06-20 18:46:36 +03:00
John Preston
7db7b177c0
Members block in group conversation view finished (except Xcode project).
2016-06-20 14:31:12 +03:00
John Preston
d089d4e692
Version 0.9.52 alpha.
2016-06-16 20:22:45 +03:00
John Preston
3502c7f1c9
Korean changelog updated. Version 0.9.51 stable.
2016-06-15 08:39:03 +03:00
John Preston
893cd9e877
Langs updated with changelog. Version 0.9.50 stable.
2016-06-14 23:42:37 +03:00
John Preston
53def26475
Langs updated. Version 0.9.50 stable.
2016-06-14 20:24:24 +03:00
John Preston
38c2915533
Fixes in floating dates with migrated histories.
...
All service messages are now not multiline (including pinned).
Confirmation for profile photo deleting will be added (not enabled).
Copy-by-selection should be supported in Linux version now.
Drafts that contain only reply-to-id (without text) support added.
2016-06-14 19:26:41 +03:00
John Preston
7c34872a48
Langs updated. Private beta version 9049006.
2016-06-13 14:04:37 +03:00
John Preston
be2a0abbc8
Fixed checkboxes in boxes. Clearing cloud draft on inline result send.
...
No history to down if unread appear in an inactive opened conversation.
2016-06-13 13:08:46 +03:00
John Preston
8e0bab5adc
Langs updated for 9049005.
2016-06-10 18:55:24 +03:00
John Preston
16bea47979
Not applying draft if can't write a message. Closed beta 9049005.
2016-06-10 18:34:35 +03:00
John Preston
5ffc5dd218
Blue online in top bar in conversation with user. Profile styles fix.
2016-06-10 14:18:55 +03:00
John Preston
bf247455ee
Fixed files overview thumbnails in retina. Fixed profile member list styles.
...
All round buttons over animations removed. Checkbox round radius smaller.
2016-06-10 09:54:56 +03:00
John Preston
3bb53b6ed1
Projects ready for Xcode and QtCreator. Retina circle masks fixed. 9049004 beta.
2016-06-09 20:55:32 +03:00
John Preston
7f54bd0bfc
Fixing critical infinite recursion in HistoryInner, closed beta 9049003.
...
Langs updated. Title fixed for supergroups in report box.
2016-06-08 15:22:57 +03:00
John Preston
fadd531fbb
Build prepared for Xcode and hopefully for QtCreator. Closed beta 9049002.
2016-06-08 13:24:20 +03:00
John Preston
1859b83e8d
Dialog styles moved from basic.style to dialogs.style.
...
Many minor design improvements in the new profiles.
New drafts design in the dialogs list: no icon, red badge.
Verified checkbox added to the new profile implementation.
Drafts saving to cloud is delayed for 1 second when switching chats.
Before quitting the app makes an attempt to save drafts (timeout 1.5s).
2016-06-07 22:59:39 +03:00
John Preston
520260f207
Merge branch 'profile' into drafts
...
Conflicts:
Telegram/SourceFiles/app.cpp
Telegram/SourceFiles/codegen/style/processor.cpp
Telegram/SourceFiles/history.cpp
Telegram/SourceFiles/historywidget.cpp
Telegram/SourceFiles/mainwidget.cpp
Telegram/SourceFiles/mainwidget.h
Telegram/SourceFiles/profilewidget.cpp
Telegram/SourceFiles/profilewidget.h
Telegram/Telegram.vcxproj
Telegram/Telegram.vcxproj.filters
2016-06-06 18:16:52 +03:00
John Preston
4ddb371484
Fixed build in QtCreator. Closed beta 9049001 for profiles testing.
2016-06-06 14:57:02 +03:00