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
8,149 Commits 3 Branches 42 Tags 60 MiB
73aa1f3f48
Commit Graph

8149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dubslow
9bc6ae57fa
try mac fix 2014-12-17 16:49:17 -06:00
Dubslow
0fff9dab3d
Merge branch 'pr943' 2014-12-17 14:44:26 -06:00
Dubslow
0e9a6fc10e
Merge branch 'pr942' 2014-12-17 14:44:01 -06:00
Dubslow
54e8be75d2
Merge branch 'pr938' 2014-12-17 14:43:34 -06:00
Dubslow
4853d60dd3
Merge branch 'pr898' 2014-12-17 14:42:56 -06:00
Zetok Zalbavar
e5b9e8c59c
Make quote colour more readable 2014-12-17 15:37:07 +00:00
agilob
5861c6daa5
removing fixed size from mic/volume buttons so they align nicely 2014-12-17 12:36:34 +01:00
Сухарик
e83c1a2ca1 update russian translation 2014-12-17 14:05:11 +03:00
agilob
f8d870f374
removing spacing from microphone layout 2014-12-17 12:00:41 +01:00
Ansa89
4caef8743b Italian translation: udpate 2014-12-17 10:30:08 +01:00
Dubslow
9d193c752e
Merge branch 'pr933' 2014-12-16 18:51:21 -06:00
Dubslow
5cbe175ddc
update the build system 2014-12-16 18:50:52 -06:00
Dubslow
fc749880eb
minor style tweaks 2014-12-16 18:05:13 -06:00
Dubslow
fa5f10ed69
Merge branch 'pr939' 2014-12-16 13:45:06 -06:00
Sean Qureshi
e30b74a984
Switch to subtree 2014-12-16 02:51:31 -08:00
Sean Qureshi
1e2e482c68
Merge commit '8934a11dbffce6b0611d97d5748668a5cdb8ba8a' as 'osx/updater' 2014-12-16 02:51:14 -08:00
Sean Qureshi
8934a11dbf
Squashed 'osx/updater/' content from commit a558402 
git-subtree-dir: osx/updater
git-subtree-split: a5584021435fc74a1e5da447524b37dcf7311bbc
 2014-12-16 02:51:13 -08:00