Tux3 / Mlkj / !Lev.uXFMLA
291a1ec282
Merge branch 'pr632'
2014-11-05 23:30:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0b6a4a6481
Implement tox3 support, keep tox1 as silent fallback
2014-11-05 23:27:51 +01:00
willeponken
5af8ea6858
Swedish translation
2014-11-05 23:19:14 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
41237a9bbc
Release, enable bulgarian translation
2014-11-04 20:10:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
330ea59618
Fix #96 with a flow layout for groupchat user list
2014-11-02 10:41:58 +01:00
dubslow
9c8beeef6e
fix git_version issue without git
2014-11-01 01:17:50 -05:00
dubslow
b78737632e
add logging to file; should make bug reports easier to handle
...
(it's a bit of a hack, but it works)
2014-11-01 00:28:37 -05:00
dubslow
973904addd
fix jenkins git issue
2014-10-31 21:03:45 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
0ad4860e3b
Add icon on windows
2014-10-26 16:35:42 +01:00
krepa098
f05e2ba9c9
refactoring
2014-10-24 16:04:47 +02:00
krepa098
15851604cd
moved video stuff to src/video
2014-10-24 16:02:55 +02: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
dubslow
30e2afcc92
add alerts on user mention (could use some tweaking, but is plenty fine for now)
2014-10-20 06:05:45 -05:00
dubslow
5b85f79055
tab completion for groupchats ( fixes #486 )
2014-10-20 05:01:22 -05:00
Sean Qureshi
04ef356a32
OS X icon support
2014-10-19 12:12:10 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
b1705a9def
Linux: Do not link with rtmp, tbb, gnutls, avfilter
...
We really just don't need those rigth now, as lintian helpfully pointed out
2014-10-18 22:25:14 +02:00
apprb
1a37c1c421
History: almost correct handling encrypted history load/save
...
Things are left to do:
1. load/save encrypted tox datafile
2. incorrect passwords processing (ask to retype, wipe everything, etc.)
3. reencryp history log with new password
2014-10-19 02:38:47 +09:00
agilob
65780941ce
version in debug message based on git HEAD
2014-10-18 08:47:42 +01:00
dubslow
041ed3b998
Merge branch 'corencryption' into history, remove file encryption, store key instead of hash
...
(I forgot to commit the merge before starting work...)
Conflicts:
qtox.pro
2014-10-17 04:13:42 -05:00
krepa098
4679b6b7bf
fixup! NetVideoSource, YUV shader, fixes
2014-10-17 09:11:39 +02:00
krepa098
5ae2afb5c6
moved src/widget/camera.* to src/camera.*
2014-10-17 09:11:39 +02:00
krepa098
f2b730cdb9
NetVideoSource, YUV shader, fixes
2014-10-17 09:09:59 +02:00
apprb
1b9eb3d239
Encryption: it works! Code cleanup is still required
2014-10-17 00:38:15 +09:00
apprb
172f1181c5
Encrypted Logs: part 1
2014-10-15 22:48:08 +09:00
apprb
fc9f8a16f3
Merge branch 'master' into history
...
Conflicts:
qtox.pro
src/widget/form/chatform.cpp
src/widget/form/settings/privacyform.cpp
2014-10-12 19:24:05 +09:00
dubslow
63bb51a089
Merge branch 'master' into corencryption
2014-10-12 04:55:02 -05:00
dubslow
04699c376c
finished core functionality, still needs UI from #423
...
this also depends on irungentoo/toxcore#1114 being merged
2014-10-12 03:27:48 -05:00
apprb
b0ef7e8152
Merge remote-tracking branch 'upstream/master' into history
...
Conflicts:
qtox.pro
2014-10-11 18:26:47 +09:00
dubslow
bf75750166
Merge branch 'master' into src
...
Conflicts:
qtox.pro
src/widget/form/settings/avform.h
src/widget/selfcamview.cpp
src/widget/selfcamview.h
src/widget/widget.cpp
widget/selfcamview.h
widget/videosurface.h
2014-10-10 17:21:54 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
4e9d802d1f
Merge pull request #410 from krepa098/camera
...
Improved (self) camera
2014-10-10 21:03:01 +02:00
apprb
2ede886c7d
add insert chatlog capability (not finished)
2014-10-11 01:22:57 +09:00
krepa098
88ece1b213
renamed SelfCamView to VideoSurface
2014-10-08 16:44:32 +02:00
krepa098
de1445cdd8
cleanup, split
2014-10-08 16:37:42 +02:00
apprb
5c1e3360fe
privacy setting form added
2014-10-08 23:32:19 +09:00
apprb
beed30b156
history: base working implementation
2014-10-08 22:55:00 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
d036f5e061
Merge pull request #407 from zetok/translation-pirate
...
Add initial Pirate translation
2014-10-08 14:08:12 +02:00
Zetok Zalbavar
1919967082
Add initial Pirate translation
2014-10-08 11:57:41 +01:00
dubslow
3ba95d82ae
Move code into src/
2014-10-07 23:26:25 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
f441ffd74a
Try to link opencv statically in linux packages
2014-10-08 00:41:56 +02:00
krepa098
7f839b473b
camera controls
2014-10-07 16:59:21 +02:00
krepa098
af210d4d98
camera: initial PBO support, mode probing
2014-10-07 14:17:35 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a85372a5c0
Merge pull request #381 from apprb/newsettings_v2
...
Newsettings v2
2014-10-06 13:29:44 +02:00
apprb
8fa9457305
base refactoring
2014-10-06 01:17:01 +09:00
dubslow
5f106ab618
add receive actions (no one to test with currently)
2014-10-02 01:01:23 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
5b75937819
Update win32 build config
2014-10-01 01:39:53 +02:00
dubslow
e3580fc416
one frickin stinkin merge error
2014-09-30 05:02:49 -05:00
dubslow
6649ae568e
Merge branch 'master' into newsettings
...
Conflicts:
core.h
qtox.pro
widget/form/genericchatform.cpp
widget/settingsdialog.cpp
widget/tool/chataction.cpp
widget/widget.cpp
widget/widget.h
2014-09-30 04:57:05 -05:00
Olexandr Nesterenko
12c265aa9b
Add Ukrainian translation
2014-09-29 22:05:48 +03:00
dubslow
767f164a14
fix file mvs
2014-09-29 13:28:59 -05:00
krepa098
5662aa933f
Added MaskablePixmapWidget, improved avatar rendering
2014-09-26 19:13:08 +02:00
