1614 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tux3 / Mlkj / !Lev.uXFMLA	5d69887b6d	Merge branch 'pr475'	2014-10-23 18:35:14 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	353075d512	Change call ringing time to 45s, fix #507	2014-10-23 17:57:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	7086f62c59	Merge branch 'pr508'	2014-10-23 17:48:33 +02:00
apprb	0a6342ae98	FileTransferInstance improvements	2014-10-24 00:39:55 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	93ea674e07	Fix #503	2014-10-22 21:23:37 +02:00
agilob	bb9f7b8b63	minimum size for camera preview 160x120	2014-10-22 17:11:55 +01:00
agilob	575e57cd00	profile settings in scrollarea	2014-10-22 17:09:59 +01:00
agilob	5eec74c032	scrollbar in generalsettings	2014-10-22 16:57:41 +01:00
agilob	28d1287b18	implemented krepas suggestions about style	2014-10-22 16:27:15 +01:00
agilob	9bc1568c0d	Merge remote-tracking branch 'upsteam/master' into style	2014-10-22 16:21:01 +01:00
apprb	277605ff17	cleanup	2014-10-22 23:14:42 +09: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
apprb	5c0370eaed	Tox datafile/encrypted history: different passwords	2014-10-22 22:36:36 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	d92bad3f9c	Attempted temp workaround for #408	2014-10-21 22:44:22 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	0a64377007	Merge branch 'pr499'	2014-10-21 20:44:40 +02:00
Zetok Zalbavar	3ed6f2afa9	Update Polish translation	2014-10-21 19:27:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	bdf89f16e1	Merge branch 'pr496'	2014-10-21 20:04:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	f9d9b57bef	Merge branch 'pr494'	2014-10-21 20:03:48 +02:00
Ansa89	e2296f6b12	Italian translation: update	2014-10-21 10:43:34 +02:00
Сухарик	a73adbf6d1	translations/ru: update	2014-10-21 02:55:25 +04:00
Tux3 / Mlkj / !Lev.uXFMLA	590ca8dc5a	Merge branch 'pr492' into HEAD	2014-10-20 20:21:41 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	50e1ecf46b	Merge branch 'pr482' into HEAD	2014-10-20 20:21:36 +02:00
agilob	7ad723a656	tryicon is made in widget.cpp now	2014-10-20 19:09:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	a2adc5edae	Merge branch 'pr489'	2014-10-20 17:20:18 +02:00
agilob	68309ef55e	a/v setting tab redesign	2014-10-20 14:54:27 +01:00
agilob	6e5068840d	minimize to tray	2014-10-20 14:11:03 +01:00
agilob	df03a0df5a	more styles	2014-10-20 13:26:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	b6d581a462	Merge branch 'pr488'	2014-10-20 14:13:27 +02:00
dubslow	995e86aad9	ADD FORGOTTEN FILES WHY DO THESE THINGS HAPPEN (and fix outbound actions)	2014-10-20 06:53:17 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	cd59117fa9	Update french translation	2014-10-20 13:35:32 +02:00
dubslow	aa55dcae1e	fix bug, fix actions to be like irc, and a disabled feature for future	2014-10-20 06:34:17 -05:00
dubslow	30e2afcc92	add alerts on user mention (could use some tweaking, but is plenty fine for now)	2014-10-20 06:05:45 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	55225aca0f	Merge branch 'pr487'	2014-10-20 12:57:24 +02:00
dubslow	5b85f79055	tab completion for groupchats (fixes #486)	2014-10-20 05:01:22 -05:00
dubslow	a1ebf905b2	add global file auto accept	2014-10-19 23:25:52 -05:00
dubslow	6b8ddab84b	fix #484 (took me a while to figure out lol)	2014-10-19 23:07:24 -05:00
dubslow	c1cef51d56	check for existing profile (fixes #466)	2014-10-19 22:36:39 -05:00
dubslow	eaf01aadc3	added new profiles, default name/status (fixes #465 and fixes #460)	2014-10-19 22:07:51 -05:00
krepa098	523847d23b	fixed #451	2014-10-19 21:24:11 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	6f316c549a	Debian: Depend on libstdc++-6 >= 4.8.2 not >= 4.9	2014-10-19 23:36:56 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	a129f9f1b3	Merge branch 'pr481'	2014-10-19 22:45:13 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	7552efdb2a	Merge branch 'pr480'	2014-10-19 22:33:42 +02:00
agilob	d268360c51	closing to tray, gui and settings	2014-10-19 20:47:06 +01:00
Sean Qureshi	04ef356a32	OS X icon support	2014-10-19 12:12:10 -07:00
Zetok Zalbavar	d01848562c	Update link for os x binary	2014-10-19 19:27:15 +01:00
apprb	dfd5b6411a	Tox datafile encryption: check	2014-10-19 23:59:58 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	9ba1d4cf41	Fix ChatForm::onAvMediaChange not checking callId/friendId ... May help with #458	2014-10-19 11:32:48 +02:00
apprb	f413f14055	warn user about old encrypted history	2014-10-19 18:02:15 +09:00
apprb	eaa315eddb	various fixes	2014-10-19 17:48:10 +09:00
apprb	6febde3167	Load encrypted history log/tox datafile	2014-10-19 16:35:11 +09:00