1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

3613 Commits

Author SHA1 Message Date
Nils Fenner
6644622301
fix #2360
The valid result prevents starting a second instance.
2015-10-11 23:08:49 +02:00
Nils Fenner
7cf1f564b0
remove dead code 2015-10-11 23:07:37 +02:00
Nils Fenner
5ddfc2eefe
cleanup inheritance QThread --> QObject and includes
IPC is actually not running in a thread; And if, QThread should not be inherited.
2015-10-11 13:49:22 +02:00
Nils Fenner
42a917fc58
remove obsolete QThread::msleep completely 2015-10-11 13:47:19 +02:00
Zetok Zalbavar
59b9e01b02
Merge pull request #2376 from BiTOk:Fix2015
Added clear button for search field #2015
2015-10-11 00:17:34 +01:00
bitok
23a0f748dd Added clear button for search field #2015 2015-10-11 01:15:30 +03:00
agilob
375c34c079
Merge remote-tracking branch 'thenain38/fix-User-display-name-empty' 2015-10-10 12:46:07 +01:00
TheNain38
2db1d1449f Fixdisplaying Pub key when name empty 2015-10-10 13:25:58 +02:00
tux3
aa303b24b3
Merge branch 'pr2363' 2015-10-10 12:32:19 +02:00
tux3
b0647b0b4b
Merge branch 'pr2361' 2015-10-09 09:42:40 +02:00
tux3
19a1851547
Small startup speed improvement 2015-10-09 02:11:06 +02:00
bitok
aff85a7ea6 2257 Fix and Style comboBox fix 2015-10-09 01:31:34 +03:00
Zetok Zalbavar
e89b7e1c6d
[README.md] inform that osx maintainer is wanted 2015-10-08 22:57:22 +01:00
bitok
af7b8b7a25 Merge branch 'master' of https://github.com/tux3/qTox into FriendListLayoutFix 2015-10-08 22:55:42 +03:00
bitok
42e0770991 Fixed FriendListLayout constructor delegation fix 2015-10-08 22:53:46 +03:00
agilob
6e0c0d1210
Merge remote-tracking branch 'PKEv/fix_save_position_when_moving_widget' 2015-10-08 20:39:28 +01:00
agilob
bc6e2287d9
Merge remote-tracking branch 'thenain38/master' 2015-10-08 19:00:08 +01:00
agilob
de9aba2734
Merge remote-tracking branch 'zetok/fix-emoticon' 2015-10-08 18:55:51 +01:00
tux3
59e0692069 Sleep 10ms in IPC wait loop, not 10 SECONDS!
Fixes #2334
2015-10-08 19:54:06 +02:00
Zetok Zalbavar
1e5043707f
TwitterEmojiSVG: make only 😊 (1f60a) to be associated with ^_^
also change tabs to spaces

closes #2358
2015-10-08 15:29:41 +01:00
Zetok Zalbavar
42659aefe8
Merge pull request #2356 from lukasepple:patch-1
adds japanese versions of the cat text smiley
2015-10-08 10:46:13 +01:00
tux3
bfc62ab38c
Merge branch 'pr2357' 2015-10-08 11:31:16 +02:00
Impyy
fbd95b0781 Fixed #2294 - Remember proxy type after retranslation 2015-10-07 19:44:12 +02:00
sternenseemann
215282014f adds japanese versions of the cat text smiley 2015-10-07 18:14:27 +02:00
tux3
3e75fd4dbc
Merge branch 'pr2354' 2015-10-07 17:20:40 +02:00
tux3
56cccc7492 Fix #2228: Friendlist too wide on first start 2015-10-07 15:28:20 +02:00
agilob
6c26262ba3
Merge remote-tracking branch 'thenain38/fix-HTML-username-status' 2015-10-06 19:01:45 +01:00
agilob
91d9f263ce
Merge remote-tracking branch 'thenain38/dynamic-call-video-mute-unmute-trans' 2015-10-06 18:56:48 +01:00
PKev
0152937eb4 fix: save position when moving widget
fix #2063
2015-10-06 16:13:47 +03:00
agilob
eaf44c45d5
Merge remote-tracking branch 'zetok/screenshotname' 2015-10-05 19:48:55 +01:00
agilob
f50f29b05f
Merge remote-tracking branch 'zetok/deprecated' 2015-10-05 18:18:33 +01:00
Zetok Zalbavar
50255e8926
[windows/bootstrap.sh] remove deprecated opencv part 2015-10-05 12:40:06 +01:00
Zetok Zalbavar
90d1f4be02 Fix incorrect copyright headers
The qTox Project is not associated with the Tox Project in any way, with the
exception of qTox using the Tox Projet's toxcore collection of libraries.
In particular, the Tox Projet does not own copyright over the qTox Project's
qTox collection of software, source code, and assets.
The qTox Project's assets are under the sole copyright of the qTox
contributors, and no partiular rights are granted to the Tox Project.
2015-10-04 23:43:32 +02:00
Zetok Zalbavar
a13969b9ba
Make screenshot names use ~ISO 8601 (timestamp) instead of random string
Now screenshots will be saved as: `qTox-Screenshot_yyyy-MM-dd HH-mm-ss.zzz`

Since miliseconds are used, it shouldn't cause filename conflicts when
saving screenshots.

Change should make it easier for users to navigate through screenshots
chronologically.
2015-10-04 15:10:04 +01:00
TheNain38
05d511bb66 Fix another parsing bug, fix Action message bold
When you are the author of an 'action' message, it is not in bold, but if reloading history it is
2015-10-04 14:36:38 +02:00
agilob
c5127e3654
Merge remote-tracking branch 'zetok/audio-win-fix' 2015-10-04 11:01:58 +01:00
agilob
7521cd4785
Merge remote-tracking branch 'PKEv/fix__switching_contacts_view' 2015-10-04 10:21:56 +01:00
TheNain38
f99c9f127d Fix ACTION messages, status, username HTML parsing 2015-10-03 21:31:41 +02:00
PKEv
164d6a124e Program crashes after switching the display view of contacts, from compact to normal view 2015-10-03 22:30:08 +03:00
agilob
2ec716cb54
Merge remote-tracking branch 'thenain38/fix-dynamic-trans-db' 2015-10-03 18:10:12 +01:00
agilob
a522624b2d
Merge remote-tracking branch 'PKEv/fix_2183_dir_to_Profile' 2015-10-03 17:52:12 +01:00
TheNain38
59e8755637 Dynamic translation of call, video, mute, unmute 2015-10-03 17:41:46 +02:00
Nils Fenner
cfe6462fef
Merge pull request #2324 from antis81:ngf/fix/screen-grabber 2015-10-03 10:22:04 +02:00
Nils Fenner
84a8e2789b
fix position of tooltip in screen grabber
The tooltip is shown centred at top of the screen which currently contains the mouse cursor.
2015-10-03 10:03:14 +02:00
agilob
e622b3fd48
Merge remote-tracking branch 'zetok/translation' 2015-10-02 20:12:57 +01:00
flan
00f2dcc47b translation fixups 2015-10-02 19:46:51 +01:00
Nils Fenner
80fa36e134
Merge pull request #2323 from dmshynk:fix_memory_leaks 2015-10-01 22:25:07 +02:00
Zetok Zalbavar
aaf3a446da
Update Polish translation 2015-10-01 15:54:58 +01:00
Dmytro Shynkevych
7b1b4655a5 systemtrayicon: image is now stack-allocated 2015-09-30 18:00:25 -04:00
Zetok Zalbavar
da9157f100
Merge pull request #2325 from aaannndddyyy:patch-10
Update translation es.ts
2015-09-30 20:14:38 +01:00