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

120 Commits

Author SHA1 Message Date
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
875f910fb6
Merge pull request #3040
Zetok Zalbavar (1):
      fix: increase faux offline message timeout
2016-03-24 20:15:55 +01:00
sudden6
9a80950ac6
Fix #2161 2016-03-24 01:14:25 +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
Zetok Zalbavar
76d8e19320
fix: increase faux offline message timeout
Should make problem with duplicated messages less common.
Related to #2726.
2016-03-23 10:53:43 +00: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
94f3e6d6e4
Async smiley loading for fast start
This can be a ~1s win on startup time with a HDD, now we load and cache the smileys in the background, blocking only if we try to use them while they are still loading
2016-01-21 07:47:15 +01: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
tux3
19582c1c69
Merge branch 'pr2821' 2016-01-20 17:01:23 +01:00
tux3
529299c7ba
Merge branch 'pr2822' 2016-01-20 14:33:17 +01:00
tux3
f79bb24024
Fix ODR violation in SettingsSerializer
Fixes #2173

Also fixes some compilation errors in some situations
2016-01-19 16:28:49 +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
a68366
65421e8992 Fix a typo in function name 2016-01-18 16:50:11 +03:00
a68366
dba7a53ec7 Fixes #2522 2016-01-18 16:45:29 +03:00
tux3
38c68658e0
Fix personnal->personal typo
Closes #2810
2016-01-16 20:08:43 +01:00
tux3
aeb26d1af7
Merge branch 'pr2782' 2016-01-14 14:03:03 +01:00
Taha
13b2ec54aa Removed static modifier 2016-01-09 19:55:03 -05:00
Nils Fenner
26019c20e2
Merge pull request #2725 from 'r-ku:ipc-cleanup' 2016-01-09 23:37:07 +01: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
rku
056a77d4dd Cleaned up all the ipc/startup code:
* Removed duplicate code of ipc event sending
 * Removed duplicate code of profile loading
 * Fixed bug where activating existing instance still started new instance of qtox asking to select a profile
 * IPC messages are now profile-aware and are sent to instance that runs specified profile in -p flag or to ipc owner if -p is not specified.

If -p flag is specified ipc events will be send to instance which runs specified profile. If instance using that profile does not run - new qTox instance will be started. This works with password-protected profiles too - new instance will handle "uri" or "save" events after accepting user password.
2015-12-22 14:59:55 +02:00
Jacob Henner
e9b34f5154
Fixes #2686 - Profiles will store avatars in distinct files 2015-12-21 13:30:46 +01:00
Jacob Henner
3f4c21216a
Fixes #2629: avatars will be re-encrypted when the profile password changes 2015-12-21 13:30:46 +01:00
tux3
a0645d5cba
Fix #2700 2015-12-19 16:51:15 +01:00
tux3
40ddf81fd1
Instead of saving empty files, delete empty avatars 2015-12-19 16:43:09 +01:00
tux3
cbe8104576
Fix bad handling of empty avatars
Fixes #2694
2015-12-19 16:28:57 +01:00
tux3
698144c803
Fix some RawDatabase interface comments 2015-12-19 05:50:41 +01:00
tux3
8adb40d09f
Minor database fixes 2015-12-19 05:47:35 +01:00
tux3
489016f358
Fix #2439 2015-12-19 05:00:23 +01:00
tux3
9b9fa13636
Change column order when filling peer cache
A minor detail, but worth it.
2015-12-19 04:42:55 +01:00
tux3
9762839b78
Fix batches bigger than limit on import 2015-12-19 04:40:31 +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
9cf0cbde6b
Fix avatar deletion not visible 2015-12-15 20:59:09 +01:00
tux3
4e1029808b
Remove useless TODO 2015-12-15 19:09:28 +01:00
tux3
63644050f3
Fix #2683
There is still an issue with the history keeping the old password, though
2015-12-14 23:27:12 +01:00
tux3
c32e0e9f1b
Check updates by default on new profiles
Fixes #2653
2015-12-12 18:37:37 +01:00
tux3
94a6df47cc
Update avatar encryption when changing password 2015-12-05 22:35:16 +01:00
tux3
45ac45c019
Create avatars directory on the fly 2015-12-05 22:01:36 +01:00