1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

66 Commits

Author SHA1 Message Date
Diadlo
204fe1d3de feat(toxme): Add save toxme info 2016-04-12 09:34:38 +03:00
sudden6
78551e970e
Merge pull request #2978
sudden6 (12):
      Revert "Revert changes from merge of  #2092 pull request"
      port groupinvitform to new ui
      fix segfaults
      adapt groupinviteform to existing conventions
      Fix notification opening wrong form
      notify on friendrequest and groupchat invite
      fix layout of friendrequest form
      fix segfault when logging out and in again
      reject multiple friend requests from one person     makes https://github.com/TheSpiritXIII/qTox/commit/
      fix wrong text on button
      fix friend request notification if friendrequestform is hidden
      fix notification if friendrequest tab is visible, don't display     friendrequests with html
2016-03-24 20:37:35 +01:00
sudden6
252c9c8fae
Merge pull request #2980
Michał Šrajer (4):
      fix #2976
      make fix for #2976 Qt5.3 compatible.
      fix logs and screenshots path on linux
      ensure screenshots directory exists
2016-03-23 15:49:46 +01:00
Michał Šrajer
528b0d99a2 fix logs and screenshots path on linux
The QStandardPaths generates paths with app name (qTox) subdirectory
for DataLocation and CacheLocation. No need to add '/tox'.
Both screenshots dir and log file are now in qTox dir in proper location on linux.
2016-03-23 09:56:21 +01:00
tux3
c3caba2e3f
Merge branch 'pr2832'
Markdown support!
2016-03-12 01:34:44 +01:00
Michał Šrajer
a4c5661443 make fix for #2976 Qt5.3 compatible. 2016-02-28 18:55:10 +01:00
Michał Šrajer
3227f6ea5b fix #2976
on linux logs goes to ~/.cache/...
and screenshots goes to ~/.local/share/...
2016-02-28 15:36:28 +01:00
sudden6
685d91f0a3 Completely remove filteraudio checkbox from the ui 2016-02-27 14:59:21 +01:00
sudden6
c4c0740cc4 reject multiple friend requests from one person
makes https://github.com/TheSpiritXIII/qTox/commit/
2016-02-25 16:46:40 +01:00
sudden6
a89b673b40 Revert "Revert changes from merge of #2092 pull request"
This reverts commit 06611d618e.
2016-02-20 22:32:57 +01:00
Andrew Morgan
db84074926 Markdown Preference now uses enumeration type instead of integer. 2016-01-30 21:43:58 -08:00
tux3
7a846b85e0
Merge branch 'pr2894' 2016-01-30 18:21:20 +01:00
Andrew Morgan
e15315b618 Added markdown preference chooser to settings which chat abides by.
Don't parse md if only one character is involved.
Prevent things like ~3~ being caught
2016-01-28 15:18:32 -08:00
tux3
963e8996fb
Fix #1016: QSettings UTF-8 issues 2016-01-21 04:59:20 +01:00
tux3
6cc36a969a
Fix capitalization of Settings::loadpersonal()
My bad, thanks to @antis81 for noticing
2016-01-21 03:00:46 +01:00
sudden6
98f49c4494 Merge branch 'master' of https://github.com/sudden6/qTox into proxy_everything 2016-01-21 01:49:25 +01:00
sudden6
f14bc8316c Add proxy support to toxme and autouptdate 2016-01-19 00:19:07 +01:00
Rowen Stipe
f7c262fb07 Touchups
This commit has several touch ups that only effect the OS X clients.

`info.plist` and `qt.pro` are now configured to create an automatic
short version to help distinguish between clients clearly and include a
referenced file not put into the build when compiled.
`./img/icon/qtox_profile.icns’

`info.plist` also had it’s bundle version to be  updated to the 1.2.2
tag and supported languages added and fixed referenced file.

The default save location has also been moved to comply with the Tox
Client Standard. (Previous location was ~/Library/Prefrences/tox )

A basic bash profile mover has also been included to show I did think
of that.
2016-01-18 14:36:35 -05:00
tux3
38c68658e0
Fix personnal->personal typo
Closes #2810
2016-01-16 20:08:43 +01:00
Taha
13b2ec54aa Removed static modifier 2016-01-09 19:55:03 -05:00
Taha
03cb9d8a03 qTox uses default smiley pack if there's an invalid one in the qtox.ini file (fixes #2757) 2016-01-08 21:02:48 -05:00
ovalseven8
f70b249ed8 Fix default smiley pack. Necessary because of the name changes. 2015-12-24 16:00:05 +01:00
tux3
b5cdfb3dce
Implement new SQLCipher based database and history
qTox will automatically import the old history on startup.

This new database code is much more robust.
It is very resilient and will not corrupt or disappear after a crash or
power failure, unlike the old code.
The on-disk database format is also much more compact now.

The database sync option in the advanced settings has been removed,
we know run many database operations asynchronously so performance
should not be a problem anymore, but we always ensure resiliency
in case of abrupt termination, so there is no tradeoff anymore.
2015-12-19 04:17:28 +01:00
tux3
c32e0e9f1b
Check updates by default on new profiles
Fixes #2653
2015-12-12 18:37:37 +01:00
tux3
25ed3d4fba
Fix avatars for encrypted profiles
WARNING: Note that avatars for encrypted profiles are currently stored unencrypted!
2015-12-05 19:08:28 +01:00
agilob
95b5a75d0e
Add settings for notes per user 2015-11-09 20:54:28 +00:00
tux3
1f61534841 Merge branch 'pr2343' 2015-10-23 15:20:58 +02:00
Nils Fenner
33e54b841a
Merge pull request #2415 from antis81:ngf/mic 2015-10-21 22:19:37 +02:00
Zetok Zalbavar
c07aee18ad
Merge pull request #2346 from PKEv:save_avatar_in_DB
Save avatar in DB
add import avatars
update delete avatar action
correct import avatar for user without history
add multithreaded
make import run once
2015-10-20 21:01:20 +01:00
Nils Fenner
a2a32b61c4
Audio: persistent volume sliders, mic feedback and volume 2015-10-18 22:21:08 +02:00
Zetok Zalbavar
d60cfe07b6
Remove an empty line and unneeded slash 2015-10-18 17:04:49 +01:00
PKev
dd975c38eb Save avatar in DB
Partially addresses an issue #1656
2015-10-14 22:16:59 +03:00
agilob
266c0fb989
Merge branch TheSpiritXIII:video 2015-10-10 13:49:30 +01:00
Dmytro Shynkevych
c4e07f219c settings: fixed check on an uninitialized value
enableLogging has to be deserialized before
getEnableLogging() in Friends group can be called.
2015-10-04 15:48:17 -04:00
TheSpiritXIII
6a5fb9f518 Multi-window: Dispaly own username on detached windows, fix log out while having detached windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
014ba45ebb Multi-window: Keep window size, fix segfault, circle integration, changed defaults 2015-09-12 19:07:44 +02:00
TheSpiritXIII
7bcf654c72 Multi-window: Add drag/drop friends to windows, fix call confirm widget 2015-09-12 19:07:44 +02:00
TheSpiritXIII
fa3ab02cec Multi-window: Tabbed interface 2015-09-12 19:07:44 +02:00
TheSpiritXIII
22fcc3f7a0 Multi-window capabilities for all chats and menus 2015-09-12 19:07:44 +02:00
tux3
5f16c5c1da
Don't save settings a billion times on startup 2015-09-06 00:17:41 +02:00
tux3
8fbc0c8b59
Remove some debug output fluff 2015-09-06 00:11:47 +02:00
tux3
54c837a03e
Fix portable mode settings loading
Fixes partially #1883, avatars still don't carry over.
2015-09-05 19:20:18 +02:00
agilob
8db085c2c0
change logging, typing notification and compact layout to enabled 2015-08-31 11:47:09 +01:00
Zetok Zalbavar
06611d618e
Revert changes from merge of #2092 pull request
That pull request made qTox crash in a number of ways, with no quick fix
available.

Hopefully there will be a way to fix crash, so that this commit could be
reverted, and fix applied.
2015-08-30 21:28:53 +01:00
TheSpiritXIII
997418a9de Store friend requests 2015-08-20 17:58:03 -04:00
TheSpiritXIII
50041a3140 Video: Initial video when call starts 2015-08-18 17:44:34 -04:00
tux3
62d298462b
Fix circles doubling when reloaded
We do need to clear before reloading.
2015-06-27 21:32:11 +02:00
tux3
79d335ff4c
Merge branch 'pr1890' 2015-06-26 14:13:03 +02:00
TheSpiritXIII
d2c0301103 Circles: Fix circle color on theme change, remove debugging stuff
Conflicts:
	res.qrc
2015-06-26 13:38:51 +02:00
TheSpiritXIII
b6df8ce34a Circles: Fix sort circles on menus, fix groupchat rename through widget, improve activity sort performance 2015-06-26 10:54:50 +02:00