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

29 Commits

Author SHA1 Message Date
agilob
c702e18ccf
global autoaccept files 2014-11-05 21:59:29 +00:00
agilob
3dbbbd1caf
autosaveDir, useEmoicons, selectTimestamp added to GUI and settings 2014-11-05 15:20:32 +00:00
agilob
4f52fa2cff
default smiley pack is cylgom 2014-11-02 21:13:17 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
12bba9fe68
Don't triple save on exit 2014-11-02 09:00:05 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
fd67a375ea
Fix #591 2014-11-01 15:02:43 +01: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
434808cd67
Add audio in/out device to settings 2014-10-28 21:21:37 +01: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
Tux3 / Mlkj / !Lev.uXFMLA
50e1ecf46b
Merge branch 'pr482' into HEAD 2014-10-20 20:21:36 +02:00
agilob
6e5068840d minimize to tray 2014-10-20 14:11:03 +01:00
dubslow
a1ebf905b2 add global file auto accept 2014-10-19 23:25:52 -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
dubslow
43ac1dfd0d add ui for auto accept; fixes #182 and #280 2014-10-17 22:59:59 -05:00
dubslow
e10e0087a4 added auto accept settings 2014-10-17 22:02:13 -05:00
dubslow
4e7a183360 add choose translations (restart required, dynamic changing is lots of work) 2014-10-17 18:06:30 -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
8be4725acd cleanup "sign in change", since it's unnecessary 2014-10-16 17:52:45 +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
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
dubslow
e3cf2cac20 auto away; needs UI 2014-10-16 04:47:58 -05:00
dubslow
33e0c95ab6 Merge branch 'master' into corencryption
Conflicts:
	src/core.cpp
2014-10-13 16:07:03 -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
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