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
1,930 Commits 3 Branches 42 Tags 60 MiB
ad39251166
Commit Graph

1930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
krepa098
ea467152aa filetransferwidget: fixed pause button, ETA, font size, resource usage 2015-01-04 12:04:30 +01:00
zero-one
672cd42065 Merge remote-tracking branch 'upstream/master' into alphabetize 2015-01-04 01:30:11 -08:00
zero-one
7569003e87 Alphabetizes groupchat user list (fixes #701) 2015-01-04 01:26:53 -08:00
Tux3 / Mlkj / !Lev.uXFMLA
d042c2f346
Filter incoming audio, not sent audio 2015-01-04 02:04:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
ab2f70e452
Fix windows builds: Link with filter_audio 2015-01-04 00:42:54 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
78065ec7d7
Update windows build server IP 2015-01-04 00:01:22 +01:00
krepa098
f630583e59 cleanup 2015-01-03 21:20:51 +01:00
krepa098
b3507152eb fixed eliding (ie. invisible nicknames) 2015-01-03 21:19:28 +01:00
krepa098
64f7f7c45e use resolveToxID 2015-01-03 20:38:06 +01:00
krepa098
d04a79a599 ChatLine: cell spacing 2015-01-03 20:37:40 +01:00
krepa098
99a230ccf5 cleanup 2015-01-03 19:06:10 +01:00
krepa098
698fcb70f0 check "use emoticons" 2015-01-03 19:05:38 +01:00
krepa098
a0a56e32a0 fix no visible line case 2015-01-03 15:32:12 +01:00
krepa098
2938702c1e refactoring, fixes 2015-01-03 15:03:33 +01:00
krepa098
8a1ea18ed4 fixed history 2015-01-03 14:08:04 +01:00
krepa098
d7f5068fbf quoting support, toHtmlChars, fixes 2015-01-03 13:52:56 +01:00
krepa098
f3d5b4bb57 fixed anchors 2015-01-03 13:20:53 +01:00
krepa098
d88aa965fa fixup merge 2015-01-03 13:13:12 +01:00
apprb
64e0116476 honouring aliases in the loaded history 
Conflicts:
	src/widget/form/chatform.cpp
 2015-01-03 13:10:19 +01:00
krepa098
2ee1363be5 don't set cache mode 2015-01-03 10:24:12 +01:00
krepa098
1945bcc1f6 don't use DesignMetrics 2015-01-03 10:24:04 +01:00
krepa098
b76e9a295d disabled group joined/left messages 
Conflicts:
	src/widget/widget.cpp
 2015-01-03 10:23:50 +01:00
krepa098
40cc14bd44 respect time format 2015-01-03 10:21:50 +01:00
krepa098
2828a97d54 styled chatlog, cleanup 2015-01-03 10:21:15 +01:00
krepa098
96789182cf chatlog: Don't accept drops 2015-01-03 10:21:05 +01:00
krepa098
5ae111e7c4 chatline: set row and col number 2015-01-03 10:20:53 +01:00
krepa098
b0c3b4032f chatlog: save chat log 2015-01-03 10:20:40 +01:00
krepa098
1c653c5f65 filetransferwidget: use CroppingLabel 2015-01-03 10:20:29 +01:00
krepa098
3c9e071a39 chatlinecontentproxy: scaling behaviour 2015-01-03 10:20:05 +01:00
krepa098
4997788b13 fix selection 2015-01-03 10:19:54 +01:00
krepa098
eecd886745 filetransferwidget layout changes 2015-01-03 10:19:41 +01:00
krepa098
a0ea0675a7 Merge branch 'master' into chatlog_v3_1 
Conflicts:
	qtox.pro
	res.qrc
	src/misc/smileypack.cpp
	src/widget/chatareawidget.cpp
	src/widget/chatareawidget.h
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/generalform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/systemmessageaction.cpp
	src/widget/widget.cpp
 2015-01-03 10:17:53 +01:00
Dubslow
eb6a563f8b
Merge branch 'pr970' 2014-12-31 19:14:09 -06:00
Dubslow
8ef6e5b9d5
Merge branch 'pr969' 2014-12-31 19:13:53 -06:00
Zetok Zalbavar
86c672b8d7
Update INSTALL.md 2014-12-31 12:43:43 +00:00
krepa098
f1f42fc237 innerStyle, groupchats 2014-12-31 13:42:06 +01:00
krepa098
7a4af239b0 Text: toHtmlChars 2014-12-31 09:59:35 +01:00
Ansa89
956f680eed Italian translation: update 2014-12-31 09:47:49 +01:00
Dubslow
f7bef8d5c3
Merge branch 'pr966' 2014-12-31 00:55:59 -06:00
Dubslow
75331af311
Merge branch 'pr965' 2014-12-31 00:50:03 -06:00
Dubslow
7fbd6438df
Merge branch 'pr959' 2014-12-31 00:22:00 -06:00
Dubslow
4795349198
Merge branch 'pr957' 2014-12-31 00:20:00 -06:00
Dubslow
2489f2a49d
Merge branch 'pr950' 
Finally have access to a gnu-linux box for a couple of days... but the internet is so bad my ssh sometimes lags :/
 2014-12-31 00:15:00 -06:00
apprb
1194df2f78
renaming: Direct Connect -> None 2014-12-30 22:02:26 +06:00
apprb
f8bdaac121
messages splitting fix 2014-12-28 23:32:19 +06:00
apprb
1719c72f67
tiny polishing 2014-12-28 19:04:32 +06:00
apprb
a14da15d79
fix #963 2014-12-28 18:32:25 +06:00
Toxicop
78f33edfb3 Update Deutsch translation 2014-12-24 08:20:46 +01:00
Théo Bueno
0c2473d68f update nodes list 
the previous one was 4 months old
 2014-12-22 13:22:02 +01:00
novist
30d9862c4f Removed explanations from tray menu 2014-12-18 20:32:28 +02:00