Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
...
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
Dubslow
c769c10138
Merge branches 'pr1105', 'pr1121' and 'pr1122'
2015-02-08 13:30:03 -06:00
Dubslow
4d56a6fdd8
Merge branch 'pr947'
...
Conflicts:
src/misc/settings.cpp
2015-02-08 13:29:19 -06:00
Joseph Anania III
6c21fab806
Set TwitteEmojiSVG as the default emoticon theme
2015-02-07 17:22:45 -05:00
krepa098
5506379a97
Merge branch 'master' into chatlog_v3_1
2015-02-07 18:49:06 +01:00
tux3/mlkj
331baa7447
Use GUI instead of Widget for common GUI tasks
2015-02-06 19:01:36 +01:00
novist
ff693807af
Autorun on OS startup
2015-02-06 18:10:54 +02:00
tux3/mlkj
46bba3f2f1
Initial Android support
...
We create a GUI class to abstract common GUI needs (showing a message box, asking a question, ...) from the actual GUI backend.
We also create a Nexus class to manage the startup and lifetime of our main systems (Core, GUI, ...) instead of delegating that to Widget.
Eventually, Widget will only be in charge of the Desktop GUI and AndroidGUI of the mobile GUI. Nexus will overview the system and GUI will provide a clean platform-independant interface.
2015-02-06 12:28:49 +01:00
Dubslow
a572ccff27
Merge branch 'encryption' into master
...
Conflicts:
src/core.cpp
src/historykeeper.h
2015-02-03 10:21:59 -06:00
krepa098
52f220c9e4
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
qtox.pro
res.qrc
src/widget/form/chatform.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
src/widget/tool/chatactions/chataction.h
src/widget/tool/chatactions/messageaction.cpp
src/widget/widget.cpp
ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d6b34aef78
Update for toxcore API break
2015-02-01 01:25:22 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c32eb98e6c
CppCheck, some video perf improvements
2015-01-30 13:40:04 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
da4fbf9ffb
Show systray icon by default on linux too
2015-01-29 17:46:31 +01:00
Dubslow
2dc5cea1d2
Merge branch 'encryption' into master
...
Conflicts:
src/autoupdate.cpp
src/core.cpp
src/core.h
src/misc/settings.cpp
src/widget/widget.cpp
2015-01-27 18:29:39 -06:00
krepa098
f509e07c45
make use of EmojiFontPointSize ( fix #1026 )
2015-01-26 23:19:18 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
801554bbd8
Fix #1037
2015-01-24 21:46:53 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8876dad457
Save camera video res in settings
...
Fixes #1033
2015-01-24 02:04:00 +01:00
Dubslow
29cc9e1b7d
Merge branch 'encryption' into master
...
Conflicts:
src/main.cpp
2015-01-23 01:51:39 -06:00
novist
3bec2751e0
Separate setting to show window on new message (without focusing window)
...
Setting to always notify on messages in group chats (like normal chats)
Check for mentioned name only triggers if name is not in the middle of other word
2015-01-21 13:54:51 +02:00
Dubslow
f645faff51
Ignore empty history files on start
...
This fixes an esoteric issue of enabling chat log encryption and then restarting before adding any messages
2015-01-19 21:49:41 -06:00
Dubslow
d74b95a7b7
Merge branches 'pr920', 'pr1001', 'pr1003' and 'pr1005'
2015-01-12 06:01:50 -06:00
krepa098
d9e15fb0ba
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
src/widget/chatareawidget.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
2015-01-09 19:41:16 +01:00
Dubslow
139cd3f4a6
Merge branch 'encryption' into master
...
Conflicts:
src/core.cpp
src/misc/settings.cpp
src/widget/widget.cpp
src/widget/widget.h
2015-01-05 20:55:47 -06:00
novist
2a8cbd189d
Added typing notification support and enabled by default
2015-01-04 13:21:56 +02: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
apprb
1719c72f67
tiny polishing
2014-12-28 19:04:32 +06:00
apprb
a14da15d79
fix #963
2014-12-28 18:32:25 +06:00
Dubslow
fc749880eb
minor style tweaks
2014-12-16 18:05:13 -06:00
Maximilian Wuttke
e0cb122abe
Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio
...
Added some `#ifdef QTOX_FILTER_AUDIO`s.
Conflicts:
qtox.pro
Conflicts:
src/coreav.cpp
2014-12-14 10:55:38 +01:00
Dubslow
a8b1f60256
Merge branch 'pr923'
2014-12-12 18:40:24 -06:00
novist
e2bf37c139
Light tray icon option
2014-12-12 12:12:12 +02:00
Zetok Zalbavar
e0993a72f6
Style corrections
...
'if()' → 'if ()'
'for()' → 'for ()'
2014-12-11 18:05:52 +00:00
lumirayz
038b4cedcb
make the code style more consistent
2014-12-11 15:31:01 +01:00
lumirayz
c73b07db72
added a compact layout for the friends list
2014-12-11 13:02:45 +01:00
Dubslow
0e21a8d497
check for non-existent file
2014-12-09 17:44:20 -06:00
Dubslow
7fc7b57934
refactor/fix switching profile with separate settings
2014-12-09 15:43:43 -06:00
Dubslow
e90dfd3083
Move privacy tab settings to per-profile settings file
...
This may lose the current settings in the tab, but currently only keep history is enabled anyways
2014-12-05 21:23:15 -06:00
Dubslow
961d5830c3
add fancier tray icons with status, remove relevant option
2014-12-05 17:14:48 -06:00
apprb
000eb8977d
history: encrypted <-> plain convertion
2014-12-04 21:22:17 +06:00
apprb
eb0b33be32
Fixes
2014-12-03 18:07:34 -06:00
apprb
a432a16e01
encrypted history: class constructor: refacroring
2014-12-03 18:01:31 -06:00
apprb
a9fb75b5ed
proper encrypted history loading
2014-12-03 18:01:31 -06:00
Dubslow
aea9eea8a4
move friend information to a separate ini file; fixes #594
2014-12-02 18:26:17 -06:00
Dubslow
4a14155724
move settings to qtox.ini
2014-12-02 16:47:55 -06:00
novist
479644833e
Option for tray icon to display user status
2014-11-27 19:46:36 +02:00
Maximilian
0660d2974f
The showSystemTrayIcon's default value is false for linux else it is false.
2014-11-17 17:35:20 +01:00
apprb
8f3e1c2ef3
fix #775
2014-11-17 19:11:51 +09:00
krepa098
4ea21c2d19
(c)
2014-11-16 12:58:43 +01:00
krepa098
fd1063eb2c
bye bye base64 emoticons
2014-11-16 12:52:53 +01:00
krepa098
74bd802863
progress
2014-11-16 12:40:44 +01:00
