Andrew Morgan
0120cfb9fe
Fix merge issues
2016-01-30 21:46:19 -08:00
Andrew Morgan
db84074926
Markdown Preference now uses enumeration type instead of integer.
2016-01-30 21:43:58 -08:00
Andrew Morgan
4c51be9a6b
Changed rules to keep in line with actual markdown. Although Tox is marketed somewhat as a Skype-replacement, that doesn't mean we have to break compatibility with the rest of the web.
2016-01-29 15:17:41 -08:00
Andrew Morgan
a809897850
Removed leftover debug logging.
2016-01-28 16:57:34 -08:00
Andrew Morgan
518a398ca0
Added tooltip to warn user markdown preference will not change until restart.
2016-01-28 16:43:41 -08:00
Andrew Morgan
a5f9e77a6b
Changed asterisk rule to bold instead of italics. Fixed extraneous container in settings.
2016-01-28 15:30:24 -08:00
Andrew Morgan
aa5d0f660c
Changed markdown settings titles
2016-01-28 15:30:24 -08:00
Andrew Morgan
fd31dd816d
Added space detection for markdown #imdeadinside
2016-01-28 15:30:15 -08: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
Andrew Morgan
4a1da7099f
Added markdown support. Underline, Italics, Strikethrough and Bold supported.
2016-01-21 02:50:51 -08:00
anoadragon453
bfb866cfa2
Removed extraneous qtox.log :)
2016-01-20 17:34:03 -08:00
Andrew Morgan
3015be87ff
Removed inconsistancies with logFileDir and handle error on removal of old log file.
2016-01-20 17:22:43 -08:00
Andrew Morgan
93991368c6
Added log rotation functionality.
...
This is to prevent log files from ever exceeding a limit of 1MB each. Only the current and one other log file are kept, giving hopefully enough history for any neccessary debugging.
2016-01-20 16:32:24 -08:00
tux3
286cea1629
Merge branch 'pr2828'
2016-01-21 01:15:34 +01:00
sudden6
641486d507
Simpliefy code, return early on error
2016-01-21 01:11:47 +01:00
sudden6
789eeec777
fix toxme error handling
...
fixes a bug in Toxme::deleteAddress returning a QNetworkReply::NetworkError
adds some warning messages
2016-01-21 00:29:54 +01:00
tux3
19582c1c69
Merge branch 'pr2821'
2016-01-20 17:01:23 +01:00
tux3
e93c1baa6c
Merge branch 'pr2818'
2016-01-20 16:58:16 +01:00
tux3
529299c7ba
Merge branch 'pr2822'
2016-01-20 14:33:17 +01:00
Rowen Stipe
df584531c8
Enable OS X Auto-run at login
2016-01-20 05:17:03 -05:00
Rowen Stipe
a05310e155
Added case for /Application Support/Tox already existing
...
I tried to get it done without bash… But this was the simplest method
that works for this special case scenerio.
2016-01-20 01:22:25 -05:00
tux3
aef447d7c7
Have v4l2 read MJPEG video by default
...
Fixes #2826
Thanks to @seanlaguna for finding a fix
2016-01-20 00:00:03 +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
tux3
96582c4161
Merge branch 'pr2824'
2016-01-19 13:32:53 +01:00
Rowen Stipe
27fda2e579
Added basic migration compatibility code.
...
This code works if the ~/Library/Application Support/Tox directory does
not already exist.
2016-01-19 06:36:15 -05:00
Rowen Stipe
e05e736d33
Performed auto-indentation
...
Ran an auto indentation script included in one of my text editors
(TextMate:greenheart:)
2016-01-19 04:36:41 -05:00
kehugter
df792b0748
Check spelling, standardise punctuation and terms, small markdown fixes
2016-01-19 03:17:08 +01:00
Zetok Zalbavar
2e0e8f778f
Login window: disable Load automatically if profile is encrypted
2016-01-18 20:54:32 +00: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
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
