StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity
2,015 Commits 3 Branches 42 Tags 60 MiB
2a94dbb4ca
Commit Graph

684 Commits

Author SHA1 Message Date
Tux3 / Mlkj / !Lev.uXFMLA
9d5b5d437d
Enable swedish translation 2014-11-05 23:34:35 +01:00
agilob
d9a3f1a5e2
cleaning in settings.cpp filetransferinstance.cpp and friendwidget.cpp, global autoaccept, per friend and qmenunu simplificated 2014-11-05 22:34:28 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
0b6a4a6481
Implement tox3 support, keep tox1 as silent fallback 2014-11-05 23:27:51 +01:00
agilob
c702e18ccf
global autoaccept files 2014-11-05 21:59:29 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
de3befe116
Fix compilation warning 2014-11-05 22:46:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d158d27fc5
Check Tox DNS protocol version, reject if not tox1 
We only support tox1 for now, and soon we should tox3
 2014-11-05 20:48:46 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7372fe5314
Merge branch 'pr630' 2014-11-05 17:43:02 +01:00
agilob
9a5c5484ba
autoaccept: unused code 2014-11-05 15:52:05 +00:00
agilob
b9a3341e95
autosavedir: keep previous directory in case of cancelling 2014-11-05 15:49:55 +00:00
agilob
3dbbbd1caf
autosaveDir, useEmoicons, selectTimestamp added to GUI and settings 2014-11-05 15:20:32 +00:00
agilob
a07c83466c
another unused opration 2014-11-05 12:14:39 +00:00
agilob
954d53f64a
more pl translations 
* removed unused code
* notification about rejected call(not tested)
* notification about cancelled call
 2014-11-05 12:02:38 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
866a8a147e
Merge branch 'pr625' 2014-11-04 21:45:21 +01:00
dubslow
f8fa37e4a9 fix #624 2014-11-04 14:32:38 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
df64c9e933
Put translations in alphabetical order 2014-11-04 21:05:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
710ba48d30
Bulgarian translation: 'българин' -> 'Български' 2014-11-04 21:03:01 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
41237a9bbc
Release, enable bulgarian translation 2014-11-04 20:10:35 +01:00
dubslow
46b08f8850 workaround #618 2014-11-03 19:08:02 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
30d91693c0
Merge branch 'pr613' 2014-11-03 23:21:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
36017a124f
Merge branch 'pr612' 2014-11-03 23:21:11 +01:00
agilob
770d7b00a8
nulling timer 2014-11-03 17:01:02 +00:00
agilob
b386e4f08f
call duration 2014-11-03 01:51:56 +00:00
agilob
a3b95e332e
style for qlineedit in status panel 2014-11-02 23:26:23 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
2ac1a33cb5
Merge branch 'pr608' 2014-11-02 23:41:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5b1508d056
Merge branch 'pr607' 2014-11-02 23:40:53 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c39e0608f4
Fix possible heap corruption in CUserId() 
If the size of the userId is larger than TOX_CLIENT_ID_SIZE, then we used to memcpy more than we allocated
 2014-11-02 23:39:28 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0d251f24fd
Fix Core::getPeerName for long names 2014-11-02 23:37:54 +01:00
agilob
4f52fa2cff
default smiley pack is cylgom 2014-11-02 21:13:17 +00:00
agilob
755a5677a2
Call notifications 2014-11-02 21:07:41 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
98f15af670
Use Tox IDs internally as message author ID 
Instead of names. Fixes #603

Groupchats still use names internally, since there's currently no way to get a chat member's public key throught the toxcore API
 2014-11-02 18:36:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5bdbc3d6d0
Don't try to load the 'en' translation 
It's the default, not a translation
 2014-11-02 14:24:06 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
804c3c3336
Don't log null/same avatar infos 
Since avatars are pretty much stable, we don't need so much debug info
 2014-11-02 14:23:18 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
e5afa5f363
Silence buggy QTextBrowser qWarning spam 
'QFSFileEngine::open: No file name specified', happens whenever we display a base64 image
 2014-11-02 14:18:03 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
071310b82a
Try to improve file transfer speed 
May help with #376 since we're not recursing through processEvents anymore
 2014-11-02 14:03:39 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4453bbe266
Fix #602 2014-11-02 13:38:00 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
e17672acd8
Add tooltip for emoticons, fix #597 2014-11-02 12:58:18 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a908e036ce
Fix #600 2014-11-02 12:47:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
77edbb668e
Fix #599 2014-11-02 12:24:14 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b68134aaa7
Fix spacing of chat form head, fixes #598 2014-11-02 12:13:15 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
330ea59618
Fix #96 with a flow layout for groupchat user list 2014-11-02 10:41:58 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2ea99eb635
Fix #459 2014-11-02 09:45:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
85d3a7275b
Fix #557 2014-11-02 09:24:13 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
12bba9fe68
Don't triple save on exit 2014-11-02 09:00:05 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d90ce6b45f
Fix crash on exit 
Static destructors were being called in an inconvenient order, replace that with a pointer and check for nullity
 2014-11-02 08:55:11 +01:00
saneki
05d7734adb Sql typo 2014-11-01 17:49:35 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
fd67a375ea
Fix #591 2014-11-01 15:02:43 +01:00
apprb
99507465be
proper sending/receiving group actions 2014-11-01 22:00:43 +09:00
dubslow
19e0ef4641 remove a couple of debug statements 2014-11-01 00:30:04 -05:00
dubslow
b78737632e add logging to file; should make bug reports easier to handle 
(it's a bit of a hack, but it works)
 2014-11-01 00:28:37 -05:00
X-NicON
f6896819b8 Removed untranslatable strings 2014-10-31 21:24:28 +03:00
Tux3 / Mlkj / !Lev.uXFMLA
da3374c4aa
Windows: Save data in %APPDATA%/tox/ as per the STS 
Fixes #585
 2014-10-30 21:38:21 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4f639a4dcf
Fix minimumSize being too small 
Fixes part of #579, graphical glitches with the splitter
 2014-10-30 11:25:32 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
aabb656733
Jump to Add Friend form when quitting groupchat 
Fixes part of #579
 2014-10-30 10:44:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
91af4721c4
Handle received group actions 2014-10-30 09:40:47 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b1c5dbafcc
Rename variable to match displayed text 2014-10-29 22:01:05 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b193aa8623
Merge branch 'pr575' 2014-10-29 21:46:36 +01:00
agilob
2fc9f12d80
style selector is translatable now - made right 2014-10-29 20:46:10 +00:00
agilob
3f4550951c
network setting unification s/disable/enable/ UDP 2014-10-29 20:27:46 +00:00
agilob
c079641fc1
prevent duplicating emoticons on the list 2014-10-29 20:24:56 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
4330d7e058
Merge branch 'pr569' 2014-10-29 20:10:26 +01:00
X-NicON
fb5ed1c6b7 more strings for translation 2014-10-29 22:08:02 +03:00
Tux3 / Mlkj / !Lev.uXFMLA
e163ec8259
Embed cylgom and krepa emoticon packs 
Thanks to @cylgom and @krepa098

Closes #555, fixes #304
 2014-10-29 19:29:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
aec042e4ed
Merge branch 'pr566' 2014-10-29 17:38:40 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c15e303d31
Merge branch 'pr565' 2014-10-29 17:38:28 +01:00
apprb
63992fc522
multiple file sending race condition fix 2014-10-30 00:40:09 +09:00
apprb
36d4998eb8
Setting forms: similar outlook and inner structure 2014-10-29 23:23:48 +09:00
Olexandr Nesterenko
6047ffe9e7 add localized strings 2014-10-29 12:13:32 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
8ff3d1d960
Open the audio in/out devices of the settings 2014-10-28 21:27:51 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
434808cd67
Add audio in/out device to settings 2014-10-28 21:21:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8501f3e543
Add audio in/out device list (stubs) 
Clicking through the list currently has no effect
 2014-10-28 20:47:20 +01:00
Wouters Dorian
50513e0fb4 Made Mute speakers button work 2014-10-28 13:50:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
f9df6fc8f6
Fix small memory leaks 
Mostly to make valgrind happy
 2014-10-28 00:01:02 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7b3c2bd1e8
Add some core doc comments, remove dead code 2014-10-27 00:31:51 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
cb81200582
Fix leak, enable NRVO in Core::getStatusMessage 2014-10-26 21:33:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
9fd8a6124e
Handle toxcore failures in Core::onAvMediaChange 
No, I'm not above using goto for centralized error handling.
 2014-10-26 21:31:25 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
eb2b7d03ad
Fix uninitialized return value in createVpxImage 2014-10-26 21:22:04 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3047a65120
Fix leak, enable NRVO in Core::getUsername 2014-10-26 21:18:45 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
edca806af1
Rescale smileys smoothly, fix #501 2014-10-26 21:12:39 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32c3302462
Merge branch 'pr545' 2014-10-26 17:08:36 +01:00
krepa098
4aef811e44 format shader code 2014-10-26 17:08:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8da7b48f3c
Merge branch 'pr544' 2014-10-26 16:25:07 +01:00
apprb
77d65a3cad
QSharedPointer<ChatAction> instead ChatAction* 2014-10-27 00:04:39 +09:00
krepa098
0d84087000 fix error: vector size mismatch for arithmetic operator 2014-10-26 09:54:57 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
09b94b24b8
Never call GUI methods from core directly, fix #436 2014-10-25 13:01:23 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7b70fd0008
Fix crash if call failed to start 2014-10-25 11:29:25 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
38da22dded
Log when core fails to load config 2014-10-24 20:55:54 +02:00
dubslow
54fa26fef4 revert coreav.cpp changes 2014-10-24 13:12:50 -05:00
dubslow
8153a3e8c3 add reconnect button for connection settings 
some ui guru should make it not stretch to width
 2014-10-24 12:35:01 -05:00
dubslow
576fd7269e disable switching buttons during calls 
fixes #436, fixes #500
(well, "fixes" by preventing users from doing dumb things)
 2014-10-24 12:33:46 -05:00
apprb
8300f42e02
Reducing memory consumption: no reason to store all displayed ChatActions in memory 2014-10-25 01:25:28 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
57a995117f
Merge branch 'pr523' 2014-10-24 17:21:04 +02:00
dubslow
4265b114b8 remove dead comments 2014-10-24 10:18:32 -05:00
krepa098
fadbb10ebc fixup rebase 2014-10-24 16:33:44 +02:00
krepa098
7d4230095c cleanup, use chroma_shift 2014-10-24 16:04:47 +02:00
krepa098
f05e2ba9c9 refactoring 2014-10-24 16:04:47 +02:00
krepa098
20b7fb0c67 cleanup 2014-10-24 16:03:45 +02:00
krepa098
15851604cd moved video stuff to src/video 2014-10-24 16:02:55 +02:00
krepa098
c5dfb33999 non-blocking cam communication, fixed CameraWorker::probeResolutions ... 
called from wrong thread, try fix #408 and #495
 2014-10-24 16:02:07 +02:00
dubslow
34a68b2f84 fix encrypted tox loading 2014-10-24 08:56:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
2d4329767e
Delay webcam res probing until first use 
Fixes #520
 2014-10-24 13:42:08 +02:00
dubslow
7260fdd38d fixed encryption, major testing required 2014-10-24 06:35:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
e2bde38358
Probe more camera resolutions 2014-10-24 12:37:22 +02:00
Zetok Zalbavar
2297739dd5
Change file sending button tooltip to indicate ability to select and send multiple files 2014-10-24 08:43:13 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
978f051060
Fix typo in message box 2014-10-24 00:41:35 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2ba994c73a
Force font size in groupchat header for all DPIs 
Fixes #75
 2014-10-24 00:18:48 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
8dcf5ef6f3
Add tooltips to chat buttons 
Fixes #516
 2014-10-24 00:00:30 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
87f1ae2ccb
Disable history encryption again 
For some reason it didn't work the first time, thanks @agilob for reporting that
 2014-10-23 23:01:50 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
80e648a5a2
Force smiley size to match text size 
Fixes #501
 2014-10-23 22:39:03 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
fa44956010
Disable encryption options for the moment 2014-10-23 22:11:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
1dc77a5d32
Fix chat head style for high DPI 
Fixes #75
 2014-10-23 21:53:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5fae61c4e8
Don't show msgboxes outside of the GUI thread 
Fixes #511
 2014-10-23 20:39:28 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f1601f389f
Merge branch 'pr423' 2014-10-23 18:47:35 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5d69887b6d
Merge branch 'pr475' 2014-10-23 18:35:14 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
353075d512
Change call ringing time to 45s, fix #507 2014-10-23 17:57:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7086f62c59
Merge branch 'pr508' 2014-10-23 17:48:33 +02:00
apprb
0a6342ae98
FileTransferInstance improvements 2014-10-24 00:39:55 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
93ea674e07
Fix #503 2014-10-22 21:23:37 +02:00
agilob
bb9f7b8b63
minimum size for camera preview 160x120 2014-10-22 17:11:55 +01:00
agilob
575e57cd00
profile settings in scrollarea 2014-10-22 17:09:59 +01:00
agilob
5eec74c032
scrollbar in generalsettings 2014-10-22 16:57:41 +01:00
agilob
28d1287b18
implemented krepas suggestions about style 2014-10-22 16:27:15 +01:00
agilob
9bc1568c0d Merge remote-tracking branch 'upsteam/master' into style 2014-10-22 16:21:01 +01:00
apprb
277605ff17
cleanup 2014-10-22 23:14:42 +09:00
apprb
6caa9f1e9f
Merge remote-tracking branch 'upstream/master' into history 
Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/identityform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/messageaction.h
	src/widget/widget.cpp
 2014-10-22 23:05:04 +09:00
apprb
5c0370eaed
Tox datafile/encrypted history: different passwords 2014-10-22 22:36:36 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
d92bad3f9c
Attempted temp workaround for #408 2014-10-21 22:44:22 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
590ca8dc5a
Merge branch 'pr492' into HEAD 2014-10-20 20:21:41 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
50e1ecf46b
Merge branch 'pr482' into HEAD 2014-10-20 20:21:36 +02:00
agilob
7ad723a656
tryicon is made in widget.cpp now 2014-10-20 19:09:35 +01:00
agilob
68309ef55e a/v setting tab redesign 2014-10-20 14:54:27 +01:00
agilob
6e5068840d minimize to tray 2014-10-20 14:11:03 +01:00
agilob
df03a0df5a
more styles 2014-10-20 13:26:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b6d581a462
Merge branch 'pr488' 2014-10-20 14:13:27 +02:00
dubslow
995e86aad9 ADD FORGOTTEN FILES WHY DO THESE THINGS HAPPEN (and fix outbound actions) 2014-10-20 06:53:17 -05:00
dubslow
aa55dcae1e fix bug, fix actions to be like irc, and a disabled feature for future 2014-10-20 06:34:17 -05:00
dubslow
30e2afcc92 add alerts on user mention (could use some tweaking, but is plenty fine for now) 2014-10-20 06:05:45 -05:00
dubslow
5b85f79055 tab completion for groupchats (fixes #486) 2014-10-20 05:01:22 -05:00
dubslow
a1ebf905b2 add global file auto accept 2014-10-19 23:25:52 -05:00
dubslow
6b8ddab84b fix #484 (took me a while to figure out lol) 2014-10-19 23:07:24 -05:00
dubslow
c1cef51d56 check for existing profile (fixes #466) 2014-10-19 22:36:39 -05:00
dubslow
eaf01aadc3 added new profiles, default name/status (fixes #465 and fixes #460) 2014-10-19 22:07:51 -05:00
krepa098
523847d23b fixed #451 2014-10-19 21:24:11 -05:00
agilob
d268360c51
closing to tray, gui and settings 2014-10-19 20:47:06 +01:00
apprb
dfd5b6411a
Tox datafile encryption: check 2014-10-19 23:59:58 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
9ba1d4cf41
Fix ChatForm::onAvMediaChange not checking callId/friendId 
May help with #458
 2014-10-19 11:32:48 +02:00
apprb
f413f14055
warn user about old encrypted history 2014-10-19 18:02:15 +09:00
apprb
eaa315eddb
various fixes 2014-10-19 17:48:10 +09:00
apprb
6febde3167
Load encrypted history log/tox datafile 2014-10-19 16:35:11 +09:00
agilob
41327910a4
fix #457, styles in mainContent for qtextedit, qspinbox and more 2014-10-18 19:56:09 +01:00
apprb
08d7964dae
fixes in profile change and log password check 2014-10-19 02:52:43 +09:00
apprb
1a37c1c421
History: almost correct handling encrypted history load/save 
Things are left to do:
 1. load/save encrypted tox datafile
 2. incorrect passwords processing (ask to retype, wipe everything, etc.)
 3. reencryp history log with new password
 2014-10-19 02:38:47 +09:00
Yuri
dc8ef40fba Added forgotten 'include math.h' 2014-10-18 10:30:55 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
42ec564b9a
Use cross platform types: s/u_int*/uint* 2014-10-18 18:43:12 +02:00
agilob
f8f5a3ca29
all form are translatable now 
changed type of main tabs to pointers to fix that
 2014-10-18 15:54:52 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
1af7451c8e
Merge branch 'pr464' 2014-10-18 12:44:16 +02:00
agilob
65780941ce
version in debug message based on git HEAD 2014-10-18 08:47:42 +01:00
dubslow
e2b4d7280d tweak speed shown back to recent speed, keep eta avg speed 2014-10-17 23:54:02 -05:00
dubslow
6e15bcb8d8 actually auto accept 2014-10-17 23:53:29 -05:00
dubslow
43ac1dfd0d add ui for auto accept; fixes #182 and #280 2014-10-17 22:59:59 -05:00
dubslow
3dbbbca587 add backend for autoaccept 2014-10-17 22:30:04 -05:00
dubslow
e10e0087a4 added auto accept settings 2014-10-17 22:02:13 -05:00
dubslow
2d3cb18f58 fix #351 (again) 2014-10-17 21:15:54 -05:00
dubslow
ee0f94a890 fix #461, cleanup 2014-10-17 20:15:26 -05:00
dubslow
4e7a183360 add choose translations (restart required, dynamic changing is lots of work) 2014-10-17 18:06:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
26eb08aa00
Merge branch 'pr452' 2014-10-17 21:00:24 +02:00
agilob
2cbae5265b
max value in autoAway time, tooltip for spinbox 2014-10-17 17:57:02 +01:00
apprb
72aa313605
switch to tox_pass_encrypt/tox_pass_decrypt functions 2014-10-18 00:53:06 +09:00
Zetok Zalbavar
c42b31fb45
Remove redundancy from settings tabs 2014-10-17 16:27:28 +01:00
krepa098
8ccadaad26 avsettings.ui layout changes 2014-10-17 16:18:34 +02:00
apprb
177b27882b
Merge branch 'history_fx' into history 
Conflicts:
	src/misc/db/encrypteddb.cpp
	src/misc/db/encrypteddb.h
 2014-10-17 22:14:27 +09:00
dubslow
35f95ea501 fix #438 2014-10-17 07:36:10 -05:00
apprb
1ce4820aa4
clenup 2014-10-17 21:33:00 +09:00
dubslow
9207dfc888 ui tweaks 2014-10-17 07:11:26 -05:00
dubslow
81003b8523 encrypted db uses core encryption 2014-10-17 04:26:31 -05:00
dubslow
041ed3b998 Merge branch 'corencryption' into history, remove file encryption, store key instead of hash 
(I forgot to commit the merge before starting work...)

Conflicts:
	qtox.pro
 2014-10-17 04:13:42 -05:00
dubslow
41365ce057 Merge branch 'master' into history 
Conflicts:
	src/widget/form/genericchatform.h
	src/widget/widget.cpp
 2014-10-17 03:56:59 -05:00
dubslow
18d1ee9f1f Merge branch 'master' into corencryption 
Conflicts:
	src/misc/settings.cpp
	src/misc/settings.h
	src/widget/widget.h
 2014-10-17 03:46:52 -05:00
dubslow
3e8557466c fix #445 2014-10-17 03:02:19 -05:00
krepa098
4582706243 EmoticonsWidget: Do not close on misclick (#393) 2014-10-17 09:11:39 +02:00
krepa098
6b39184915 allow drag&drop on GroupWidget 2014-10-17 09:11:39 +02:00
krepa098
5ae2afb5c6 moved src/widget/camera.* to src/camera.* 2014-10-17 09:11:39 +02:00
krepa098
bd07666275 fixes, cleanup 2014-10-17 09:11:39 +02:00
krepa098
6e61da68e4 Settings: use QTabWidget, IdentityForm: cleanup 2014-10-17 09:11:38 +02:00
krepa098
87132389aa fixed infinite recursion under certain conditions 2014-10-17 09:09:59 +02:00
krepa098
c4529d4062 fixed css, comments, cleanup 2014-10-17 09:09:59 +02:00
krepa098
e8416a98a2 fixed compilation error + warning 2014-10-17 09:09:59 +02:00
krepa098
2913326fb2 fix #416, cleanup 2014-10-17 09:09:59 +02:00
krepa098
118b67a970 cleanup 2014-10-17 09:09:59 +02:00
krepa098
f2b730cdb9 NetVideoSource, YUV shader, fixes 2014-10-17 09:09:59 +02:00
krepa098
8b8a541826 simplified VideoSource, interface, BRG->YUV conversion changes + more 2014-10-17 09:09:59 +02:00
krepa098
b43d7197ed CameraWorker: cleanup, poll at 60Hz 2014-10-17 09:09:59 +02:00
krepa098
122e13ff98 partial fix for #426 2014-10-17 09:09:59 +02:00
krepa098
1d4055858f VideoSurface: aspect ratio 2014-10-17 09:09:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2a401a7e3b
Merge branch 'pr447' 2014-10-16 20:57:36 +02:00
agilob
ca08015528
s/min/minutes/ 2014-10-16 19:52:13 +01:00
agilob
f854d0e90f
set idle timer in widget.cpp 2014-10-16 19:48:45 +01:00
agilob
db6b488515
UI for autoaway 2014-10-16 18:49:50 +01:00
agilob
6bda375a7e
fixes regression sent by apprb 2014-10-16 18:24:16 +01:00
agilob
815314330e Merge branch 'master' of https://github.com/tux3/qTox into style 2014-10-16 17:17:41 +01:00
agilob
5538167a46
fix for #442 2014-10-16 17:17:25 +01:00
dubslow
8be4725acd cleanup "sign in change", since it's unnecessary 2014-10-16 17:52:45 +02:00
agilob
8788931f36 number of messages is more reliable then activities 2014-10-16 17:47:19 +02:00
agilob
fea3fa3ac7 renamed function 2014-10-16 17:47:18 +02:00
agilob
698902a8dc status changes messages and sign in notifications 
sign in notifications available only in settings and as a message in chat
 2014-10-16 17:47:18 +02:00
apprb
1b9eb3d239
Encryption: it works! Code cleanup is still required 2014-10-17 00:38:15 +09:00
agilob
14ea88c070 style selector 
Unfortunately Qt developers removed some old native skins from support, only 3 skins are supported on Linux.
Number of native skins depends on OS and Qt built system.
 2014-10-16 15:18:19 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d96ef1a970
Merge branch 'pr419' 2014-10-16 14:05:05 +02:00
dubslow
e3cf2cac20 auto away; needs UI 2014-10-16 04:47:58 -05:00
dubslow
c1572abedf more details 2014-10-15 11:38:16 -05:00
dubslow
34bb83aca7 Merge branch 'thread' into corencryption 2014-10-15 10:51:24 -05:00
apprb
3cf224a34e
Encrypted Logs: part 2: all encryption to be implemented in EncryptedDb class 2014-10-16 00:39:43 +09:00
apprb
172f1181c5
Encrypted Logs: part 1 2014-10-15 22:48:08 +09:00
dubslow
63671ae3ff I learned some things: improve thread safety 2014-10-14 21:06:44 -05:00
dubslow
a0ca379c1b fix #436 2014-10-14 20:04:53 -05:00
apprb
e3d5853ca3
no reason to keep action flag in the logfile 2014-10-14 23:36:32 +09:00
apprb
c07a0cd7f8
Fetch history only from asked profile ID 2014-10-14 22:55:25 +09:00
apprb
ec3d8146c6
correct action saving into the logfile 2014-10-14 22:43:03 +09:00
apprb
14a71a0f3f
precise timestamps keeping 2014-10-14 14:49:27 +09:00
dubslow
48faffaa3e fix compile warning, they are fatal to Qt Creator 2014-10-13 19:27:24 -05:00
krepa098
cbf8d610c8 fixed #425 2014-10-13 16:35:57 -05:00
dubslow
68de366738 fix #431, fix export cancels, and more debug prints 2014-10-13 16:17:42 -05:00
dubslow
33e0c95ab6 Merge branch 'master' into corencryption 
Conflicts:
	src/core.cpp
 2014-10-13 16:07:03 -05:00
agilob
db5c115a91
removed duplicated emoticons 2014-10-13 19:50:54 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a8ca4aeadb Merge pull request #430 from apprb/ftrans 
FileTransferWidget improvements
 2014-10-13 20:07:49 +02:00
apprb
339afafa05
magic number removed in FileTransferInstance 2014-10-13 16:43:20 +09:00
apprb
57943e2435
FileTransferWidget improvements 2014-10-13 00:02:55 +09:00
dubslow
71e42cf6c8 add decryption 2014-10-12 05:24:57 -05:00
apprb
fc9f8a16f3
Merge branch 'master' into history 
Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/settings/privacyform.cpp
 2014-10-12 19:24:05 +09:00
agilob
45c60a17c0 Merge remote-tracking branch 'upsteam/master' into emoticon-preview 2014-10-12 11:12:10 +01:00
agilob
5abf693611 Merge remote-tracking branch 'upsteam/master' into style 2014-10-12 11:08:10 +01:00
dubslow
235d6609b9 Merge branch 'master' into profiles 
Conflicts:
	src/widget/form/settings/identityform.cpp
 2014-10-12 04:58:56 -05:00
dubslow
63bb51a089 Merge branch 'master' into corencryption 2014-10-12 04:55:02 -05:00
dubslow
bf75750166 Merge branch 'master' into src 
Conflicts:
	qtox.pro
	src/widget/form/settings/avform.h
	src/widget/selfcamview.cpp
	src/widget/selfcamview.h
	src/widget/widget.cpp
	widget/selfcamview.h
	widget/videosurface.h
 2014-10-10 17:21:54 -05:00
dubslow
3ba95d82ae Move code into src/ 2014-10-07 23:26:25 -05:00