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

21 Commits

Author SHA1 Message Date
Dubslow
7aab85251e Merge branch 'master' into profiles
Holy shit first big merge of my career, I'm mildly amazed it even compiles

Conflicts:
	core.cpp
	widget/form/settingsform.cpp
	widget/form/settingsform.h
	widget/widget.cpp
2014-09-05 03:53:00 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
c5c3513ee9 Write settings on toggling 'Make Tox Portable' 2014-08-31 22:44:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
73309d8b90 Fix #235, Fix #84 2014-08-31 22:26:45 +02:00
apprb
7fe938a7ca filenames and paths processing little fix 2014-08-31 22:02:08 +07:00
krepa098
62bcb86c8b State group in settings 2014-08-11 17:34:25 +02:00
krepa098
9c0d85da0c Merge branch 'style' 2014-08-11 17:25:45 +02:00
krepa098
6bb85c65b8 save/restore status of the splitter 2014-08-11 14:07:27 +02:00
krepa098
921b8478f6 removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
krepa098
7dc00889ee settings: default smiley pack 2014-08-10 18:50:40 +02:00
krepa098
af4623695c styling cleanup 2014-08-10 18:14:50 +02:00
krepa098
51ac007baf default settings 2014-08-01 14:46:28 +02:00
krepa098
e01467e386 basic support for smileys 2014-07-25 14:52:14 +02:00
Bill Winslow
b4a42cb34a more incremental changes, nothing works yet
(I just want to change branches)
2014-07-24 14:50:47 -05:00
dubslow
e3da9badac Basic infrastructure for profiles is in place, now I gotta hook up the UI 2014-07-16 17:43:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
ed0616dd91 Add option to make qTox portable 2014-07-12 22:59:36 +02:00
Bill Winslow
e0b6fd1e13 Remove username and status message from settings, instead use Core 2014-07-11 16:38:39 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
f9289438af Add option to disable translations 2014-07-04 19:22:43 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2e2e61962d Add option to disable IPv6
Fixes #50
2014-07-02 00:47:06 +02:00
Kevin Flynn
4d7c5f71f6 Use the default Tox save file 2014-06-28 10:09:16 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
b6b062d8b9 Fix DHT bootstraping
Fixes #1

Fixes bad translation of the DHT nodes' ports to big endian
2014-06-26 13:09:08 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
18cee41cfb Initial commit 2014-06-24 22:11:11 +02:00