RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,867 Commits 10 Branches 718 Tags 329 MiB
Commit Graph

1867 Commits

Author SHA1 Message Date
John Preston 1167860f3e Merge branch 'mentions' of https://bitbucket.org/johnprestonmail/telegram-desktop into mentions 2016-05-10 14:19:53 +03:00
John Preston 107a1e7e5d Merge branch 'master' into mentions 
Conflicts:
	Telegram/SourceFiles/core/version.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/build/version
 2016-05-10 14:19:01 +03:00
John Preston fd7f618fd2 Merge branch 'dev' 2016-05-10 11:58:21 +03:00
John Preston 9e6243bedf Version 0.9.48 with bugfixes. 2016-05-10 11:57:55 +03:00
John Preston f02fc4dd96 Setting f_views flag for a client-side forwarded message with views. 2016-05-10 10:57:40 +03:00
John Preston 4b83c34f0d Setting f_views flag for a client-side forwarded message with views. 2016-05-09 17:42:10 +03:00
John Preston 0b2401132e Message edit warning timer (up to 15 minutes). 
Displaying "edited" info in messages.
 2016-05-09 15:03:06 +03:00
John Preston b28e9a6167 Requesting difference or messages when users from mentions not loaded. 2016-05-09 13:07:25 +03:00
John Preston 90a3a80bf6 Suggest mentions not only by username, but by user names as well. 2016-05-08 19:11:47 +03:00
Christoph 316c30d375 Update arch.sh to latest version from upstream 
Signed-off-by: Christoph <auer.chrisi@gmx.net>
 2016-05-08 17:55:01 +02:00
eegorov fe52b6075d Fix travis-scripts to support prev commit 
Signed-off-by: Egor Y. Egorov <egor.y.egorov@gmail.com> (github:
eegorov)
 2016-05-08 14:17:28 +06:00
eegorov 9d703f9519 Make possible to set a path to the patched Qt and his version during 
start qmake v2

Signed-off-by: Egor Y. Egorov <egor.y.egorov@gmail.com> (github: eegorov)
 2016-05-08 14:14:44 +06:00
John Preston 3e5f51f45a Everywhere TextWithTags and TextWithEntities are used. 
Copy tags from messages to clipboard, to drag mime data.
Sorting entities while processing (links, monospace, mentions).
 2016-05-06 20:33:48 +03:00
John Preston 463450e607 Saving FlatTextarea tags to drafts, applying them in setText. 
Now instead of plain text a TextWithTags struct is used almost
everywhere. Started writing and reading serialized tags to drafts
from 9048, switched version to 0.9.48 for testing.
 2016-05-05 19:04:17 +03:00
John Preston 5a47d8e29b Marking tags by random values only inside of FlatTextarea. 
Added a strategy to convert tags to and from tags-for-mime-data.
 2016-05-04 23:38:37 +03:00
John Preston 45143c40c9 FlatTextarea handles tags on insertFromMime and tags editing. 
Fixed dependent messages update when message was edited.
Fixed entities parsing in Text when they follow one after another.
 2016-05-04 19:46:24 +03:00
John Preston 5300962ef3 Merge branch 'dev' into mentions 
Conflicts:
	Telegram/SourceFiles/core/basic_types.h
 2016-05-04 13:45:23 +03:00
John Preston 5f5109f1c4 Some global string constants "static const *" -> "constexpr str_const". 2016-05-04 13:41:41 +03:00
John Preston 5f440a0cbe Merge branch 'dev' into mentions 
Conflicts:
	Telegram/SourceFiles/core/version.h
	Telegram/Telegram.vcxproj.filters
 2016-05-04 13:21:04 +03:00
John Preston 58e185012c MSVC project files fixed. 2016-05-03 20:03:02 +03:00
John Preston be9915cef8 Fixed MetaLang custom build step in Telegram MSVC project. 2016-05-03 01:13:08 +03:00
John Preston 19d1f0fe8c Removed WinRT QFile::copy() fix from Qt patch: change approved to Qt. 2016-05-02 17:56:00 +03:00
John Preston dff5765f9f 0.9.47 alpha: fixed crash in text processing (Qt pach updated). 2016-05-02 16:42:09 +03:00
John Preston 21f462a77e Mention names support added to FlatTextarea, messages. 
Copy of mention names to clipboard done, pasting started.
 2016-04-30 20:04:14 +03:00
John Preston b4bc515079 Renamed MentionsDropdown to FieldAutocomplete, moved to separate file. 
Support for message field mentions without usernames was started.
 2016-04-29 16:46:16 +03:00
John Preston af248a6714 EntityInText made class instead of struct. Scheme updated. 
No left trim of monospace text block when sending / displaying text.
New entity type (mention name) introduced, but not supported yet.
 2016-04-29 15:00:48 +03:00
John Preston 724ba9e429 Open edit only for the messages that we can edit. 2016-04-28 12:07:59 +03:00
John Preston 9acf437534 Langs updated. Alpha version 0.9.46. 2016-04-27 19:08:27 +03:00
John Preston 1361eb3fba Alpha version 0.9.46. 2016-04-27 18:55:13 +03:00
John Preston d48826751e Some better path variables in Xcode project. 2016-04-27 17:59:38 +03:00
John Preston 301d84a831 Xcode build fixed. 2016-04-27 17:13:20 +03:00
John Preston fe6e3c5252 Build scripts improved, QtCreator build fixed. 
qmake and travis builds use -j4 for make.
 2016-04-27 16:59:08 +03:00
John Preston 0854dba76a Added moved files to git. 2016-04-27 15:03:10 +03:00
John Preston 745f89dbb9 Moving build / lang scripts from Telegram to subfolders. 
Travis build tested with -j param.
Xcode / QtCreator / qmake builds could be broken.
 2016-04-27 15:02:17 +03:00
John Preston 55f0432377 Merge pull request #1959 from Senorsen/patch-1 
Fixed doc building-msvc.md
 2016-04-26 19:51:16 +03:00
Zhang Sen 55619e4eb5 Fixed doc building-msvc.md 
just a small fix, added cd into the directory

Signed-off-by: Senorsen <senorsen.zhang@gmail.com> (github: Senorsen)
 2016-04-27 00:12:15 +08:00
John Preston 77e5925cf0 Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev 2016-04-26 16:01:16 +03:00
John Preston 390a1b0754 Some improvements for winrt. 2016-04-26 16:00:23 +03:00
John Preston 487406ac46 Moved to the Visual Studio Update 2. 2016-04-26 12:55:34 +03:00
John Preston 1e64a56986 Fixed travis build output file check. 2016-04-25 11:55:15 +03:00
John Preston d5ed93edd5 Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev 2016-04-25 11:06:50 +03:00
John Preston d2922a4173 Fix travis build. Xcode project path fix. 2016-04-25 11:06:13 +03:00
John Preston 8518f01bc0 Merge pull request #1952 from telegramdesktop/auchri/fix_travis_patch 
Fix path to qt patch
 2016-04-24 12:20:30 +03:00
Christoph bd41ce024a Fix path to qt patch 
Signed-off-by: Christoph <auer.chrisi@gmx.net>
 2016-04-23 20:02:17 +02:00
John Preston 53a56bbc2a Telegram.pro using final Qt install path. 2016-04-23 14:53:48 +03:00
John Preston 0130d0cd63 Moved patches to Telegram/Patches, travis builds debug version. 2016-04-23 14:50:28 +03:00
John Preston 9c5e2bbb00 Merge branch 'dev' 2016-04-23 14:41:54 +03:00
John Preston 2834ce0344 Moving to Qt 5.6.0, instructions can be broken. 2016-04-23 14:40:42 +03:00
John Preston e6bc92f46d Merge pull request #1935 from jleclanche/master 
Remove nonexistant MIME type from desktop file
 2016-04-23 10:14:39 +03:00
John Preston 4aa1f1334c Dev version 0.9.45: first version on new styles codegen. 2016-04-22 13:01:41 +03:00