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

26 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
krepa098
921b8478f6 removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c0f1f196b1 Merge pull request #176 from krepa098/smileys
Smileys
2014-08-01 16:06:05 +02:00
krepa098
51ac007baf default settings 2014-08-01 14:46:28 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2a04fcfcf9 Merge pull request #175 from krepa098/smileys
Smileys
2014-07-31 18:04:35 +02:00
krepa098
6fed143048 cleanup 2014-07-31 17:36:55 +02:00
krepa098
0d493f4bcf ability to detect smileyPacks 2014-07-30 09:18:41 +02:00
Bill Winslow
5b6ccf67fd incremental, commiting in order to push 2014-07-28 16:52:05 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
cc65aa4fd5 Merge pull request #166 from krepa098/smileys
Smileys
2014-07-28 13:41:22 +02:00
Bill Winslow
22375e3b8f Randomized the bootstrap table, to distribute load away from the first 5 2014-07-27 15:55:22 -05:00
Bill Winslow
08ab94bf5a more incremental commits, compiles and sort of works now 2014-07-27 03:27:15 -05:00
krepa098
e01467e386 basic support for smileys 2014-07-25 14:52:14 +02:00
Bill Winslow
f9a3192f30 incremental improvements to profiles, more work required 2014-07-23 04:22:09 -05:00
dubslow
46848d7712 Profiles, with at least a few bugs:
sanitizing file names isn't done, delete fails because of autosaves, and imports segfault for me
2014-07-16 20:00:23 -05:00
dubslow
f423c174e7 forgot a button, also the ui is fucked at default size (expand a few pixels and its fine though) 2014-07-16 17:46:51 -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
14a7d298f4 Added GPL header to all source files 2014-07-06 12:19:45 -04:00
Bill Winslow
27bf913a27 Add a missing connect and missing tr() 2014-07-06 05:51:01 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
f9289438af Add option to disable translations 2014-07-04 19:22:43 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
3aae8dcde7 Improve Tox ID display in settings
Fixes #42
2014-07-04 18:49:30 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
537d55bd7f Makes toxgui translatable 2014-07-03 21:42:23 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2e2e61962d Add option to disable IPv6
Fixes #50
2014-07-02 00:47:06 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6ff776f345 New camera system, preparation for video 2014-06-29 23:41:47 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
036827086b Add Test Video feature in settings form
Tested on Windows.
2014-06-28 22:24:39 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
17cca2e3cd Preparation for audio calls, refactoring 2014-06-27 00:42:45 +02:00