Zetok Zalbavar
1757dfb2fc
Merge additional commit from PR #2919 from LittleVulpix:Format-discrepancy
...
Previous merge was pushed to master seconds after new commits arrived in PR.
Some minor grammar
2016-01-18 16:31:42 +00:00
LittleVulpix
d10761b6f2
Some minor grammar
...
seperate->separate
on the same time->at the same time
2016-01-18 17:26:10 +01:00
Zetok Zalbavar
452c9e12ba
Merge pull request #2819 from LittleVulpix:Format-discrepancy
...
User manual wording+changes
2016-01-18 16:07:33 +00:00
LittleVulpix
e70303908d
User manual wording+changes
...
Misleading information
The profile is actually in the top left corner, not the top right.
Updated and reworded the profile section
The section was given a unified look and some options were reworded to either be more clear or to fix grammatical errors.
Minor rewording of the general settings section
No capital S in status
Updated and reworded the chat section
Updated and reworded the theme section
simleys->smileys
Also they are not being replaced with unicode emoticons but instead with actual images, rectified.
Updated and reworded the connection settings section
Minor rewording of the NoSpam section
Minor rewording of the audio+video section
Minor rewording of the advanced section
Updated and reworded the groupchats section
Updated and reworded the multi window mode section
normaly->normally
if profile->if the profile
2016-01-18 16:46:15 +01: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
b804544408
Merge branch 'pr2815'
...
Fixes #2813
2016-01-17 18:41:07 +01:00
Dhruv Khattar
dc93d7f3ca
Issue 2813 solved
2016-01-17 23:00:21 +05:30
tux3
59ac2e54e1
Fix updater search paths on XP
...
Fixes #2807
2016-01-17 16:27:22 +01:00
tux3
0ea0918ce9
Merge branch 'pr2809'
2016-01-17 13:24:56 +01:00
Nils Fenner
251d53f340
temporary remove audio gain metering
2016-01-17 11:00:52 +01:00
tux3
f27214f131
Depend on Qt >= 5.3 (instead of 5.2)
...
Fixes #2812
2016-01-16 20:31:01 +01:00
tux3
38c68658e0
Fix personnal->personal typo
...
Closes #2810
2016-01-16 20:08:43 +01:00
tux3
d07bef21a3
Merge branch 'pr2769'
2016-01-16 15:44:51 +01:00
agilob
203274f6d1
Unify window icons
2016-01-16 14:31:34 +00:00
tux3
0955843b8d
Merge branch 'pr2799'
2016-01-16 14:30:41 +01:00
tux3
75bd5b7cea
Merge branch 'pr2805'
2016-01-16 14:22:27 +01:00
Corey Sheldon
19814ffb75
Update libsodium (again)
...
As of December 25,2015, libsodium bumped up to 1.0.8
2016-01-16 00:17:21 -05:00
tux3
c576a1485a
Scan-build cleanup
2016-01-16 02:24:13 +01:00
Zetok Zalbavar
a37f169386
Merge pull request #2804 from TheNain38:patch-2
...
Fix typo in user manual
2016-01-15 22:42:35 +00:00
TheNain38
225e442961
Fix typo in user manual
2016-01-15 23:37:22 +01:00
Zetok Zalbavar
b8080e48bb
Merge pull request #2787 from sudden6:usermanual2
...
sudden6 (12):
initial usermanual
most settings documented
write it in markdown
remove html version
Update user_manual_en.md
update user manual with @zetok s suggestions
fix some links and better wording in user manual
Add section about user profile to manual
remove last todos
slight clarifications in manual
Add user manual in README.md
fix formatting in manual
2016-01-15 22:21:03 +00:00
sudden6
878b3d65bd
fix formatting in manual
2016-01-15 23:19:03 +01:00
sudden6
c408cf4045
Add user manual in README.md
2016-01-15 22:56:34 +01:00
sudden6
376d685b25
slight clarifications in manual
2016-01-15 22:53:55 +01:00
sudden6
50081a51d2
remove last todos
2016-01-15 22:04:39 +01:00
Diadlo
bb9b1a4e32
Add Toxme support in Toxuri handle
2016-01-15 18:08:25 +01:00
Diadlo
7179ed4722
Add Toxme lookup support
...
qTox will try Toxme, and if Toxme not supported, ToxDNS
2016-01-15 18:08:25 +01:00
tux3
4806e684fa
Cherry-pick HTTP(S) toxme lookups from #2753
...
Implementation by @Diadlo
2016-01-15 18:08:25 +01:00
Zetok Zalbavar
94e467e561
INSTALL.md: correct link and mention sqlcipher for fedora dependencies
2016-01-15 16:49:54 +00:00
Zetok Zalbavar
68cc02a151
Merge pull request #2750 from linux-modder:patch-11
...
Corey Sheldon (4):
Some small updates.
Cleaned up sqlcipher instructions, added interlink
Cleaning up some more....
Cleaning up linkage again.
2016-01-15 16:44:15 +00:00
tux3
6b4f081fdf
dos2unix the updater
2016-01-15 17:40:12 +01:00
tux3
3645e39b89
Updater compatibility with Windows XP
...
With some LoadLibrary/GetProcAddress shenanigans
2016-01-15 17:38:40 +01:00
sudden6
38313d1e0a
Add section about user profile to manual
2016-01-15 15:34:35 +01:00
Zetok Zalbavar
ccfb81b2e4
Add some basic documentation about Tox ID in source
...
Lets not make plaintext gods angry by linking to a dead html page.
2016-01-14 20:21:00 +00:00
tux3
05162a63b9
Merge branch 'pr2793'
2016-01-14 14:11:52 +01:00
tux3
aeb26d1af7
Merge branch 'pr2782'
2016-01-14 14:03:03 +01:00
sudden6
212f97fd41
fix some links and better wording in user manual
2016-01-11 23:52:28 +01:00
sudden6
71bdb23246
update user manual with @zetok s suggestions
2016-01-11 23:46:37 +01:00
Zetok Zalbavar
ac077e0d44
Merge pull request #2790 from minj:l10n-lt
...
update Lithuanian translation
2016-01-11 19:06:39 +00:00
Zetok Zalbavar
1921a9887e
Remove empty src/main.h ( closes #2792 )
...
Looks like it was accidentally introduced in
9905042434
2016-01-11 19:00:43 +00: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
sudden6
861697d86e
Update user_manual_en.md
2016-01-09 22:23:19 +01:00
agilob
0836c78551
Merge remote-tracking branch 'antis81/audio/auto-close-devices'
2016-01-09 19:12:02 +00:00
sudden6
aeb80f1e78
remove html version
2016-01-09 19:28:43 +01:00
sudden6
87ee8e966c
write it in markdown
2016-01-09 19:21:05 +01:00
Nils Fenner
82dfe0f704
fix audio singleton implementation
2016-01-09 13:12:39 +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
agilob
ad3326b95d
Merge remote-tracking branch 'briskycat/issue2558_desktop'
2016-01-07 20:16:45 +00:00