697 Commits

Author	SHA1	Message	Date
Rohil Surana	a5919dc767	Typing indicator shows up once typing is resumed	2015-03-31 02:57:52 +05:30
Dubslow	885dc0638a	No more PRs shall be merged until the new_api branch in my repo is merged. Contributions are welcome. ... This commit fixes some minor style issues with #1406	2015-03-27 17:36:35 -05:00
Dubslow	72e78ff6cd	Merge branch 'pr1480' ... Conflicts: src/widget/form/addfriendform.cpp	2015-03-27 17:36:08 -05:00
Dubslow	2e388f03df	Merge branches 'pr1474', 'pr1406', 'pr1463' and 'pr1472'	2015-03-27 17:33:53 -05:00
Dubslow	5d129b471f	Possibly fix an old segfault that may or may not be a problem	2015-03-27 15:01:42 -05:00
Rohil Surana	b98af21456	On add friend clicked pastes Tox Id from clipboard if there is one	2015-03-27 22:13:25 +05:30
PKEv	4f650b3177	System menu translation	2015-03-26 23:02:08 +03:00
Rohil Surana	5a4443b7bb	Set focus to toxId Line edit on add friend window	2015-03-26 16:53:20 +05:30
kushagra	b2481fc1d8	proper splitting in friends chat,fixes #1375 ... what happened was- When message exceeded TOX_MESSAGE_LENGTH, the whole message was inserted in sender's chatlog X times. if length of message is N, X = (N/TOX_MESSAGE_LENGTH) + 1 There is no bug in recieving end. Receving end gets X messages (splitted). In the sample case provided, the message had whitespaces in the end, so the reciever thought the message is empty.	2015-03-26 11:15:05 +05:30
Dubslow	bab280a0ea	Change default datetime formats (d/m m/d agnostic), style fixes, removed unnecessary signals	2015-03-25 11:45:58 -05:00
Dubslow	14a565bc3a	Merge branch 'pr1393'	2015-03-25 11:32:05 -05:00
Dubslow	27f58c9ca6	Style fixes	2015-03-25 11:27:33 -05:00
zero-one	a1e228e60d	style fixes to conform to Allman style	2015-03-23 02:38:24 -07:00
zero-one	c15cc60137	Merge branch 'master' into friend_list	2015-03-23 02:35:20 -07:00
zero-one	de8eb5293c	Merge branch 'master' into friend_list ... Conflicts: src/widget/form/settings/generalform.cpp	2015-03-23 02:34:12 -07:00
Dubslow	f55fd40ec6	Merge branches 'pr1452', 'pr1453', 'pr1456' and 'pr1457'	2015-03-22 16:17:00 -05:00
PKEv	72c45a65fa	Correct #1448	2015-03-22 23:44:42 +03:00
Jookia	e3bdd6d221	Added option to disable notification sounds.	2015-03-23 07:27:44 +11:00
PKEv	becd923c09	#1441 correct	2015-03-22 02:26:17 +03:00
agilob	5f15bc8b75	iso date	2015-03-21 15:48:43 +00:00
agilob	77e333ab05	long time format	2015-03-21 15:47:09 +00:00
agilob	a873bb571f	generalsettings: time and date format from qlocale	2015-03-20 08:17:18 +00:00
Dubslow	9079b334b9	Merge branches 'pr1433', 'pr1435', 'pr1436', 'pr1438' and 'pr1439'	2015-03-19 23:02:02 -05:00
PKEv	e940459596	Correct for Maximized window	2015-03-19 22:41:31 +03:00
kushagra	cb8d892724	fixed display of contact_dark.svg	2015-03-18 21:21:58 +05:30
Dubslow	6a43aa8680	Merge branches 'pr1419', 'pr1420', 'pr1421' and 'pr1424'	2015-03-18 08:21:19 -05:00
kushagra	41dc562b64	fixes #1091	2015-03-18 14:15:51 +05:30
TheLastProject	6164426b13	Oops, forgot about groups	2015-03-18 00:51:22 +01:00
TheLastProject	ebf4af830d	Fix #1204	2015-03-18 00:45:57 +01:00
isn0gud	de423571eb	add friend on enter key pressed #1404	2015-03-17 13:23:34 -05:00
Dubslow	99e8d71fca	Merge branch 'pr1400', with style fixes @agilob ... Conflicts: src/widget/form/profileform.cpp	2015-03-17 13:18:47 -05:00
Dubslow	9d5b77aa61	Fix qr label wordwrap	2015-03-17 11:14:16 -05:00
Dubslow	42fe29e83d	Merge branch 'pr1397'	2015-03-16 17:53:00 -05:00
sudden6	0c4cc87ed0	fix #1394	2015-03-16 17:46:56 -05:00
Dubslow	fc720f570d	Merge branch 'pr1392'	2015-03-16 17:37:38 -05:00
Dubslow	4087778b88	Merge branch 'pr1378'	2015-03-16 16:47:12 -05:00
Dubslow	e96211199d	Check for writability for Qr saves	2015-03-16 16:41:59 -05:00
Dubslow	ad09980ce7	Less agressive tooltip	2015-03-16 16:15:34 -05:00
Dubslow	b908852e3b	Cleanup QR PR ... Fix coding style, #include "" -> #include <> Remove tooltip Move "tox:" addition out of qr-related code Conflicts: src/misc/qrwidget.cpp	2015-03-16 15:41:39 -05:00
Dubslow	01a4cdd07e	Merge branch 'pr1351'	2015-03-16 14:56:01 -05:00
zero-one	21a7152316	Merge branch 'master' into friend_list ... Conflicts: src/widget/form/settings/generalform.cpp	2015-03-16 11:10:28 -07:00
agilob	209f8a19ba	disable css interitance in setpassworddialog	2015-03-16 18:03:14 +00:00
agilob	b60cfef749	closes tux3/qtox #1399 ... disabling scrolling on comboboxes in all settings forms	2015-03-15 20:29:23 +00:00
agilob	42133a3d00	copy image to clipboard	2015-03-15 18:53:10 +00:00
agilob	9d99007e2c	qrcode always visible, button to save	2015-03-15 15:45:28 +00:00
agilob	e4c51e2a29	text in the label dateformat	2015-03-14 20:22:28 +00:00
agilob	4cf62bdefa	closes tux3/qtox#1368 - settings to change dateformat	2015-03-14 20:15:56 +00:00
PKEv	e3946b4435	#1379 correct	2015-03-14 23:06:33 +03:00
tux3	2547029140	Merge branch 'pr1390'	2015-03-14 19:51:17 +01:00
tux3	c5a8a17e21	Merge branch 'pr1389'	2015-03-14 19:49:04 +01:00