Tux3 / Mlkj / !Lev.uXFMLA
|
65331117d8
|
Merge branch 'pr525'
|
2014-10-24 17:16:20 +02:00 |
|
krepa098
|
fadbb10ebc
|
fixup rebase
|
2014-10-24 16:33:44 +02:00 |
|
krepa098
|
7d4230095c
|
cleanup, use chroma_shift
|
2014-10-24 16:04:47 +02:00 |
|
krepa098
|
f05e2ba9c9
|
refactoring
|
2014-10-24 16:04:47 +02:00 |
|
krepa098
|
20b7fb0c67
|
cleanup
|
2014-10-24 16:03:45 +02:00 |
|
krepa098
|
15851604cd
|
moved video stuff to src/video
|
2014-10-24 16:02:55 +02:00 |
|
krepa098
|
c5dfb33999
|
non-blocking cam communication, fixed CameraWorker::probeResolutions ...
called from wrong thread, try fix #408 and #495
|
2014-10-24 16:02:07 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
2d4329767e
|
Delay webcam res probing until first use
Fixes #520
|
2014-10-24 13:42:08 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
e2bde38358
|
Probe more camera resolutions
|
2014-10-24 12:37:22 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
2401654009
|
Merge branch 'pr521'
|
2014-10-24 12:13:07 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
3932788ad5
|
Merge branch 'pr519'
|
2014-10-24 11:57:21 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
6028bd678e
|
Merge branch 'pr522'
|
2014-10-24 11:57:03 +02:00 |
|
Ansa89
|
454c165783
|
Italian translation: update
|
2014-10-24 11:39:31 +02:00 |
|
Zetok Zalbavar
|
2297739dd5
|
Change file sending button tooltip to indicate ability to select and send multiple files
|
2014-10-24 08:43:13 +01:00 |
|
Zetok Zalbavar
|
02af1c36b7
|
Update refined mannol translation
|
2014-10-24 08:24:34 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
3607240152
|
README: Update download links
|
2014-10-24 00:52:37 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
978f051060
|
Fix typo in message box
|
2014-10-24 00:41:35 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
7571309142
|
Update french translation
|
2014-10-24 00:36:47 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
2ba994c73a
|
Force font size in groupchat header for all DPIs
Fixes #75
|
2014-10-24 00:18:48 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
8dcf5ef6f3
|
Add tooltips to chat buttons
Fixes #516
|
2014-10-24 00:00:30 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
87f1ae2ccb
|
Disable history encryption again
For some reason it didn't work the first time, thanks @agilob for reporting that
|
2014-10-23 23:01:50 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
80e648a5a2
|
Force smiley size to match text size
Fixes #501
|
2014-10-23 22:39:03 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
fa44956010
|
Disable encryption options for the moment
|
2014-10-23 22:11:37 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
1dc77a5d32
|
Fix chat head style for high DPI
Fixes #75
|
2014-10-23 21:53:45 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
5fae61c4e8
|
Don't show msgboxes outside of the GUI thread
Fixes #511
|
2014-10-23 20:39:28 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
f1601f389f
|
Merge branch 'pr423'
|
2014-10-23 18:47:35 +02:00 |
|
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 |
|