2230 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dubslow	7552fc0ceb	Fix the segfault fix	2015-01-23 08:18:46 -06:00
Dubslow	7fb7ae1fc8	oops, fortunately this wasn't a bug yet...	2015-01-23 08:00:50 -06:00
Dubslow	358a56c555	Confirm decrypt data, various ui/txt tweaks	2015-01-23 07:07:52 -06:00
Dubslow	18e875ef20	Fix bug with initial password dialogs accepting empty passwords	2015-01-23 07:07:31 -06:00
Dubslow	dea2ccf0b7	Fix segfault, minor cleanup	2015-01-23 07:07:15 -06:00
Dubslow	29cc9e1b7d	Merge branch 'encryption' into master ... Conflicts: src/main.cpp	2015-01-23 01:51:39 -06:00
Dubslow	44ddb8789c	In groupchats, check for sanitized name as well ... Fixes #952	2015-01-23 01:35:21 -06:00
Tux3 / Mlkj / !Lev.uXFMLA	aa9d0e06d1	Use Yes/No, not Ok/No when asking questions	2015-01-22 20:21:13 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	3eb11c518e	Merge branch 'pr1035'	2015-01-22 19:45:52 +01:00
Ansa89	f9f04e1ded	Italian translation: update	2015-01-22 19:36:48 +01:00
Dubslow	89544c5d16	Merge branches 'pr1030' and 'pr1032'	2015-01-22 10:29:35 -06:00
Dubslow	908dafd3b8	Simplify regex	2015-01-22 10:20:38 -06:00
Dubslow	34b9236d58	Fix most of the things suhr mentioned ... also added colons a buncha places translation->language save files in->save to moved emoticon size after smiley pack Ignoring the excellent point raised by zer0-One for now	2015-01-22 10:07:20 -06:00
Dubslow	0428b5c87a	Move "Make Tox portable" to advanced settings tab	2015-01-22 09:55:24 -06:00
Tux3 / Mlkj / !Lev.uXFMLA	aef083934f	Merge branch 'pr1029'	2015-01-21 19:16:33 +01:00
Lednerb	00bea1fdf6	Added tox1-protocol prompt.	2015-01-21 18:15:07 +01:00
Lednerb	101a6ec2d3	Fixed translation errors.	2015-01-21 17:42:04 +01:00
krepa098	9cb7ba06ed	cleanup	2015-01-21 15:58:43 +01:00
novist	3bec2751e0	Separate setting to show window on new message (without focusing window) ... Setting to always notify on messages in group chats (like normal chats) Check for mentioned name only triggers if name is not in the middle of other word	2015-01-21 13:54:51 +02:00
novist	eade2969fe	General settings UI cleanup	2015-01-21 13:14:08 +02:00
Zetok Zalbavar	953009b0e0	Update Polish translation	2015-01-21 08:19:56 +00:00
Dubslow	f121937016	Merge branch 'pr1028'	2015-01-21 02:11:51 -06:00
Zetok Zalbavar	4d045950e9	Remove unnecesary word	2015-01-21 06:35:28 +00:00
krepa098	ad39251166	typo	2015-01-20 11:51:34 +01:00
krepa098	d0bd6e9dca	show 2 decimals starting from MiB	2015-01-20 11:08:40 +01:00
krepa098	2fa2fc1df5	fix divide by zero	2015-01-20 11:07:40 +01:00
krepa098	13e0a8a292	cleanup	2015-01-20 10:55:51 +01:00
Dubslow	b245fe034a	Merge branch 'pr949'	2015-01-20 03:48:37 -06:00
Dubslow	120af8f889	correct static lib extension on *nix	2015-01-20 03:46:28 -06:00
krepa098	5d5a0903f7	renamed get/setRowIndex to get/setRow	2015-01-20 10:31:50 +01:00
Dubslow	f0c3ca1c9e	check -P option for invalid profiles ... closes #977	2015-01-20 02:24:25 -06:00
Dubslow	96fd1e514d	Fix #967	2015-01-20 02:07:56 -06:00
Dubslow	2d2522626c	Typing notifications disappear automagically ... Fixes #984	2015-01-20 01:27:48 -06:00
Dubslow	7aa52ff754	Fix profile settings issue from command line, default unencrypt history is Cancel	2015-01-19 22:23:13 -06:00
Dubslow	5ea6e412f8	Slightly more useful initial password dialogs	2015-01-19 21:59:27 -06:00
Dubslow	f645faff51	Ignore empty history files on start ... This fixes an esoteric issue of enabling chat log encryption and then restarting before adding any messages	2015-01-19 21:49:41 -06:00
Dubslow	b1180a2038	Improve dialogs around unencrypting history, per zetok's suggestions	2015-01-19 21:16:28 -06:00
Dubslow	e233c8171f	minor reword ... (I meant to apply this with the relevant merge commit, but forgot to "git add"... life is hard)	2015-01-19 19:21:34 -06:00
Tux3 / Mlkj / !Lev.uXFMLA	c0fef7851c	Merge branch 'pr1024'	2015-01-20 00:13:07 +01:00
saneki	f3c0b7c24c	Context menu style fix for chat title	2015-01-19 13:32:34 -06:00
krepa098	bb29536df1	NotificationIcon	2015-01-19 19:04:19 +01:00
krepa098	b5b6ae99c0	Text: extractSanitizedText, hookup double-click selection	2015-01-19 17:56:37 +01:00
krepa098	1fd456833c	Merge pull request #3 from dubslow/chatlog_v3_1 ... minor code cleanup	2015-01-19 15:25:22 +01:00
krepa098	34c7c7250b	double-click selection	2015-01-19 15:19:54 +01:00
krepa098	a6e3fc671e	removed selectAll()	2015-01-19 15:07:15 +01:00
krepa098	85764d5973	Text: Do not rely on QTextCursor for selection	2015-01-19 15:04:11 +01:00
krepa098	f17ffdc491	cleanup	2015-01-19 11:14:53 +01:00
krepa098	2c8e7c638d	nice!	2015-01-19 10:08:43 +01:00
krepa098	691a8b0b71	fixed potential null deref. & memory leak	2015-01-19 10:07:51 +01:00
Dubslow	2805737b8d	Merge branch 'pr1015' ... also minor re-reword	2015-01-18 19:55:15 -06:00