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
7,117 Commits 3 Branches 42 Tags 60 MiB
fef89d70f9
Commit Graph

7117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nobody of note.
eaadb4d244 Merge pull request #6 from tux3/master 
Rebase on upstream
 2014-07-06 14:17:44 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
af4706a892 Merge pull request #109 from F1ynn/fix-104 
Fix #104
 2014-07-06 19:46:05 +02:00
Nobody of note.
3404c9768d Merge pull request #5 from tux3/master 
``Rebase'' on upstream
 2014-07-06 10:45:03 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
22df83a5cf Merge pull request #108 from lance0/patch-1 
Much needed update to NURUPOWILLSUEME
 2014-07-06 19:44:15 +02:00
Kevin Flynn
7d15ae48aa Fix #104 2014-07-06 10:40:59 -07:00
Lance Tuller
a045456139 Update NURUPOWILLSUEME 
Not enough freedom. Fixed.
 2014-07-06 12:57:00 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
1f3c28c173 Merge pull request #106 from dubslow/master 
Added GPL header to all source files
 2014-07-06 18:45:33 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
eb3ffc313b Link with pthread on windows 2014-07-06 18:38:05 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
9da5741291 Fix maximizing disabled on windows 2014-07-06 18:37:46 +02:00
Bill Winslow
14a7d298f4 Added GPL header to all source files 2014-07-06 12:19:45 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
4dcccb8a08 Fix status icon not set on startup 2014-07-06 15:52:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
3a0e04f3dc Merge pull request #101 from dubslow/master 
Add a missing connect and missing tr()
 2014-07-06 12:05:01 +02:00
Bill Winslow
27bf913a27 Add a missing connect and missing tr() 2014-07-06 05:51:01 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
a015e3e035 Remove lone object file 
I blame git add .
 2014-07-06 11:35:39 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a129764114 Merge pull request #100 from dubslow/master 
Add a few tooltips
 2014-07-06 08:25:25 +02:00
Bill Winslow
e98ba55c56 Merge branch 'master' of https://github.com/tux3/toxgui 2014-07-06 02:08:24 -04:00
Bill Winslow
cf864c71e5 Add a few tooltips (I wish I'd had these at the beginning) 2014-07-06 02:07:43 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
fb26a1765d Merge pull request #99 from F1ynn/GUI-fixes 
Gui fixes
 2014-07-06 07:56:09 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
eb1959f540 Merge pull request #98 from F1ynn/master 
Fix #97
 2014-07-06 07:55:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
cb7f0f8df6 Merge pull request #95 from retuxx/master 
Use TOX_FRIEND_ADDRESS_SIZE from tox.h to calcualte length of a valid Tox ID
 2014-07-06 07:53:30 +02:00
Kevin Flynn
00a3617a5a Make spacing consistent 2014-07-05 21:07:43 -07:00
Kevin Flynn
cfbc73e435 Fix #97 2014-07-05 20:47:31 -07:00
marcel
4372fea9ea calculate tox id length from definition in tox.h instead of setting it manually 2014-07-06 02:29:57 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
b0fe026056 Merge pull request #94 from F1ynn/master 
Fix buttons on OS X (hopefully)
 2014-07-06 01:43:12 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
532f3336aa Update translations, enable german 2014-07-06 01:42:39 +02:00
Flynn
b52df4f17e Fix buttons on OS X (hopefully) 2014-07-05 16:39:35 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
a7b243fe14 Merge pull request #93 from retuxx/master 
German translation
 2014-07-06 01:31:20 +02:00
marcel
3e92b97d24 added german translation 2014-07-06 01:28:51 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5b0335f7df Merge pull request #92 from F1ynn/master 
Improve width of editablelabelwidgets used in name and status
 2014-07-06 00:51:27 +02:00
Kevin Flynn
7949031298 Improve width of editablelabelwidgets used in name and status 2014-07-05 15:41:39 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
378e8cae04 Merge pull request #91 from F1ynn/master 
Small fixes to status button
 2014-07-06 00:26:49 +02:00
Kevin Flynn
c5c0f35f59 Small fixes to status button 2014-07-05 15:03:53 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
7f4f7f068e Merge pull request #90 from mouseym/patch-2 
Some fixes.
 2014-07-06 00:03:15 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7608d4ef24 Merge pull request #88 from F1ynn/master 
Added proper status button
 2014-07-06 00:02:49 +02:00
mouseym
526194add3 Some fixes. 2014-07-05 22:29:37 +01:00
Kevin Flynn
0b45edbfd1 Fix spacing in file transfer widget 2014-07-05 14:00:22 -07:00
Kevin Flynn
46784cc1cc Improved status button 2014-07-05 13:54:27 -07:00
Kevin Flynn
a31304d9e2 Added proper status button 
Pixels in status image are shifted slightly, but since this involves
changing the .ui file it's better to merge sooner rather than later.
 2014-07-05 12:30:00 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
45563eafba Merge pull request #86 from F1ynn/master 
Fix segfault when using custom window borders
 2014-07-05 10:09:45 +02:00
Kevin Flynn
d1a3a42d88 Removed debug code accidentally included in last commit 2014-07-05 01:04:16 -07:00
Kevin Flynn
e6b17b470c Fix segfault when using custom window borders 2014-07-05 01:01:19 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
fe7c7c6648 Merge pull request #83 from F1ynn/master 
Fix bug #58, remove some uneeded code
 2014-07-05 08:53:37 +02:00
Kevin Flynn
898a366cdd Fix bug #58, clean up some uneeded code 2014-07-04 23:50:18 -07:00
F1ynn
6132c66d77 Merge pull request #4 from tux3/master 
Rebase on upstream
 2014-07-04 23:11:34 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
c30ecf2e91 Explicitely depend on QtNetwork 2014-07-05 08:08:47 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
0ea28fb109 Remove streches of size 0 2014-07-05 07:33:11 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a8dde773f5 Add special error message on NXDOMAIN 2014-07-05 07:28:15 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
8e46c78068 Merge pull request #80 from F1ynn/fix-widget-win8 
Small widget improvements
 2014-07-05 07:22:24 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
fce95e9637 Don't write tox_save when unnecessary 
Fixes #76 and makes the GUI noticeably faster on slow hard drive.
 2014-07-05 06:25:17 +02:00
Flynn
b5eddef8a9 Fix bug in new file transfer widget 2014-07-04 18:55:19 -07:00