apprb
|
e3d5853ca3
|
no reason to keep action flag in the logfile
|
2014-10-14 23:36:32 +09:00 |
|
apprb
|
c07a0cd7f8
|
Fetch history only from asked profile ID
|
2014-10-14 22:55:25 +09:00 |
|
apprb
|
ec3d8146c6
|
correct action saving into the logfile
|
2014-10-14 22:43:03 +09:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
f2f572273c
|
Merge pull request #433 from dubslow/master
fix #431, fix export cancels, and more debug prints
|
2014-10-14 13:36:57 +02:00 |
|
apprb
|
14a71a0f3f
|
precise timestamps keeping
|
2014-10-14 14:49:27 +09:00 |
|
dubslow
|
48faffaa3e
|
fix compile warning, they are fatal to Qt Creator
|
2014-10-13 19:27:24 -05:00 |
|
dubslow
|
3b32727d9e
|
We handle .tox files (still need actual command line support)
|
2014-10-13 17:45:52 -05:00 |
|
krepa098
|
cbf8d610c8
|
fixed #425
|
2014-10-13 16:35:57 -05:00 |
|
dubslow
|
68de366738
|
fix #431, fix export cancels, and more debug prints
|
2014-10-13 16:17:42 -05:00 |
|
dubslow
|
33e0c95ab6
|
Merge branch 'master' into corencryption
Conflicts:
src/core.cpp
|
2014-10-13 16:07:03 -05:00 |
|
agilob
|
db5c115a91
|
removed duplicated emoticons
|
2014-10-13 19:50:54 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
a8ca4aeadb
|
Merge pull request #430 from apprb/ftrans
FileTransferWidget improvements
|
2014-10-13 20:07:49 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
259a1d042b
|
Merge pull request #414 from dubslow/profiles
Profiles -- they actually work!!!!!!!
|
2014-10-13 19:54:16 +02:00 |
|
apprb
|
339afafa05
|
magic number removed in FileTransferInstance
|
2014-10-13 16:43:20 +09:00 |
|
apprb
|
57943e2435
|
FileTransferWidget improvements
|
2014-10-13 00:02:55 +09:00 |
|
dubslow
|
71e42cf6c8
|
add decryption
|
2014-10-12 05:24:57 -05: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 |
|
agilob
|
45c60a17c0
|
Merge remote-tracking branch 'upsteam/master' into emoticon-preview
|
2014-10-12 11:12:10 +01:00 |
|
agilob
|
5abf693611
|
Merge remote-tracking branch 'upsteam/master' into style
|
2014-10-12 11:08:10 +01:00 |
|
dubslow
|
235d6609b9
|
Merge branch 'master' into profiles
Conflicts:
src/widget/form/settings/identityform.cpp
|
2014-10-12 04:58:56 -05:00 |
|
dubslow
|
63bb51a089
|
Merge branch 'master' into corencryption
|
2014-10-12 04:55:02 -05:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
e33a37c52c
|
Merge pull request #405 from dubslow/src
Move code into src/
|
2014-10-12 11:45:42 +02:00 |
|
apprb
|
9ace74087a
|
typos
|
2014-10-12 18:44:03 +09: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 |
|
dubslow
|
c33d387465
|
add save encryption
|
2014-10-12 02:31:48 -05:00 |
|
dubslow
|
9df2b49d07
|
more
|
2014-10-11 19:07:29 -05:00 |
|
agilob
|
27e4debb72
|
yup, too many brackets
|
2014-10-11 23:25:22 +01:00 |
|
dubslow
|
bee852a28c
|
partial work towards core encryption functionality
|
2014-10-11 16:54:25 -05:00 |
|
agilob
|
ca3182e281
|
error handling for missing graphical icons
preview of emoticons based on dynamic list of emoticons, not hardcoded anymore
|
2014-10-11 16:53:20 +01:00 |
|
apprb
|
02092c9a90
|
cleanup
|
2014-10-11 20:52:29 +09:00 |
|
apprb
|
b0ef7e8152
|
Merge remote-tracking branch 'upstream/master' into history
Conflicts:
qtox.pro
|
2014-10-11 18:26:47 +09:00 |
|
apprb
|
625cb32b32
|
History: retrieve history from save
|
2014-10-11 16:26:52 +09:00 |
|
dubslow
|
6eeec77cce
|
Merge branch 'master' into profiles
Conflicts:
misc/settings.cpp
misc/settings.h
widget/widget.cpp
|
2014-10-10 17:43:15 -05: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 |
|
dubslow
|
6ab90d4516
|
read tox_save if no data; if no profiles, no popup
|
2014-10-10 17:07:18 -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 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
f8057c8046
|
Merge pull request #409 from agilob/trayicon
support for hiding in tray
|
2014-10-10 21:01:01 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
66b8e57776
|
Merge pull request #413 from burunduk/master
Update Ukrainian translation
|
2014-10-10 21:00:32 +02:00 |
|
apprb
|
6860790205
|
clear chat area
|
2014-10-11 01:54:21 +09:00 |
|
apprb
|
2ede886c7d
|
add insert chatlog capability (not finished)
|
2014-10-11 01:22:57 +09:00 |
|
apprb
|
8630ab80e2
|
class expantion
|
2014-10-11 00:45:58 +09:00 |
|
apprb
|
7069e2cd74
|
History: keep unencrypted history
|
2014-10-09 23:36:35 +09:00 |
|
dubslow
|
a99e7d2b94
|
tweaks
|
2014-10-09 04:26:32 -05:00 |
|
dubslow
|
983879e799
|
IT WORKS, IT FINALLY WORKS
|
2014-10-09 03:59:35 -05:00 |
|
dubslow
|
0050589cde
|
(Re)implement profiles UI, using some of the old code.
Avatars aren't handled on switching, and also something about friends disappearing...
|
2014-10-09 03:07:26 -05:00 |
|
dubslow
|
eb687b2bfe
|
readd profiles ui
|
2014-10-09 01:23:33 -05:00 |
|
Olexandr Nesterenko
|
be9b9dd4c9
|
Update Ukrainian translation
|
2014-10-09 09:01:41 +03:00 |
|
dubslow
|
7ce7da0776
|
properly implement clearing contacts list
|
2014-10-09 00:58:35 -05:00 |
|
dubslow
|
2181313d37
|
add startup profile detection
|
2014-10-09 00:40:05 -05:00 |
|
dubslow
|
1bacd2da7a
|
Merge branch 'master' into profiles... yikes
Conflicts:
core.cpp
core.h
misc/settings.cpp
misc/settings.h
widget/form/settings/generalform.h
widget/form/settingsform.cpp
widget/widget.cpp
widget/widget.h
|
2014-10-08 20:25:26 -05:00 |
|