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

7440 Commits

Author SHA1 Message Date
Tux3 / Mlkj / !Lev.uXFMLA
983260e836 Merge pull request #286 from krepa098/master
added smiley selection to the new settings dialog...
2014-09-12 21:17:50 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d7fbcb60db Merge pull request #287 from apprb/dev
get rid of .setBlockFormat(..)
2014-09-12 21:16:26 +02:00
apprb
968b46a86b get rid of .setBlockFormat(..) in ChatAreaWidget::insertMessage(..) function 2014-09-13 01:54:03 +07:00
Dubslow
d16b6cd283 Merge commit '5a005a1aafe96061301a4e113cb5450770009b88' into profiles
Conflicts:
	core.cpp
	widget/form/settingsform.cpp
	widget/form/settingsform.h
2014-09-12 13:53:29 -05:00
krepa098
7e7cebf6b6 added smiley selection to the new settings dialog, new default search- 2014-09-12 19:09:05 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2aff9fde5c Merge pull request #284 from retuxx/config-new
"rebased" Settings Dialog
2014-09-12 15:55:43 +02:00
Marcel
f3ecf4fa0f added images 2014-09-12 15:50:39 +02:00
Marcel
1b2855e05b use settings dialog in widget 2014-09-12 15:46:34 +02:00
Marcel
4e5d1c170b do not use getInstance of camera 2014-09-12 15:45:02 +02:00
Marcel
28e8406be9 added settingsdialog 2014-09-12 15:41:46 +02:00
Marcel
c3a8cd01f3 removed settingsform, removed selfcamview from widget 2014-09-12 15:35:48 +02:00
Marcel
04657d2c1d added ToxID struct 2014-09-12 15:23:30 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5a005a1aaf Merge pull request #282 from apprb/dev
filetransfer: corrected pause/resume behaviour
2014-09-11 20:37:10 +02:00
apprb
6c5cd7c010 filetransfer: corrected pause/resume behaviour 2014-09-12 01:32:31 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
6440ef8310 Make group <unknown> name translatable 2014-09-11 18:05:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
fd2419669c README: Update screenshot 2014-09-11 16:08:14 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a7c75e63a5 Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e91846e821 Fix #205 2014-09-11 13:40:44 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5198dd1404 Merge pull request #278 from dubslow/master
change bootstrap.sh
2014-09-11 00:45:35 +02:00
Dubslow
9e97011a39 sigh 2014-09-10 17:44:12 -05:00
Dubslow
26e25ffe3a change bootstrap.sh 2014-09-10 17:41:46 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
3ef211f50d Merge pull request #277 from dubslow/master
simplify compilation
2014-09-11 00:41:35 +02:00
Dubslow
ca77520736 Merge branch 'master' of https://github.com/tux3/qTox 2014-09-10 17:37:39 -05:00
Dubslow
f148100fe3 simplify compilation 2014-09-10 17:36:34 -05:00
krepa098
b6848772fc converted notification.wav to notification.pcm (raw audio) fixes #256 2014-09-10 23:21:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
0ae0d01a61 Generalize #275 to groupchats 2014-09-10 23:00:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c76f6a7e73 Fix #275 2014-09-10 22:53:02 +02:00
Dubslow
e4c6216ba8 swapping profiles is now less buggy, but friends still don't come online 2014-09-10 15:47:48 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
960fbfff48 Remove \n when copying own tox ID 2014-09-10 22:27:56 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c564367354 Fix #234 2014-09-10 22:24:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
fc521a0845 Merge pull request #274 from apprb/dev
HTML table chat representation replacement
2014-09-10 21:53:43 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f16ae3a223 Remove unnecessary header 2014-09-10 21:50:09 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
cb9d626155 Fix #237, don't use ports in big endian 2014-09-10 21:43:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
87eb5704ec Use homemade endianess conversion for DHT
Should help with #237
2014-09-10 21:34:55 +02:00
apprb
db68afe8dd sometimes names are just incredible 2014-09-11 02:28:43 +07:00
apprb
096874d5f4 HTML table chat representation replaced by QTextTable one 2014-09-11 02:28:43 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
beb93c192e Merge pull request #273 from apprb/master
autoscroll fix
2014-09-10 20:32:27 +02:00
apprb
ff9e0bbf93 autoscroll fix 2014-09-11 01:28:05 +07:00
krepa098
c3e55489b0 don't accept RichText as input 2014-09-10 18:52:54 +02:00
krepa098
1b4afcb937 detect URLs and show them as hyperlink 2014-09-10 18:52:54 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5aa5e266b2 Free some RAM when a file transfer ends 2014-09-10 18:46:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7f2edfae7d Fix #266 2014-09-10 18:30:19 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5773996e15 Merge pull request #271 from dubslow/master
minutiae
2014-09-10 16:18:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
737e76c72f Undo #266 fix 2014-09-10 16:17:44 +02:00
Dubslow
88eb571b92 minutiae 2014-09-10 09:12:15 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
afa794d92a Fix #266 2014-09-10 15:42:22 +02:00
Dubslow
b684e56df0 simplification 2014-09-10 08:36:11 -05:00
Dubslow
05c654373f Fixed misusing tox_load; profiles are significantly less buggy 2014-09-10 08:12:43 -05:00
Dubslow
e477c4ef64 Merge branch 'master' into profiles 2014-09-10 07:01:05 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
3f35a5a48d Fix #266 2014-09-09 22:36:34 +02:00