Zetok Zalbavar
7449e0efcd
Change wording "tox{1,3}" → "toxdns{1,3}"
...
Should help avoid confusion about security of Tox protocol.
2015-09-10 13:09:01 +01:00
Zetok Zalbavar
2409827582
Merge pull request #2192 from ovalseven8:patch-5
...
Replace char in file
2015-09-08 14:27:52 +01:00
Zetok Zalbavar
216af36b65
Merge pull request #2185 from ovalseven8:patch-4
...
Up-to-date German translation file
2015-09-08 14:25:30 +01:00
ovalseven8
2a8354a52e
Replace char in file
...
- Qt Linguist had problems with it
- Additionally, improved readability
2015-09-08 15:14:00 +02:00
ovalseven8
dd5704f8a3
Up-to-date German translation file
2015-09-08 15:12:44 +02:00
Zetok Zalbavar
15a2283000
Add links to qTox ARM builds
2015-09-08 10:25:53 +01:00
Zetok Zalbavar
8b11680421
Merge pull request #2186 from aaannndddyyy:patch-5
...
correct a typo
2015-09-08 09:52:04 +01:00
aaannndddyyy
4fb4ba7617
correct a typo
2015-09-07 20:50:41 +00:00
Zetok Zalbavar
9c65603e3d
Merge pull request #2182 from TheNain38:master
...
Update fr.ts
2015-09-06 12:49:19 +01:00
TheNain38
2765d5bf1e
Update fr.ts
2015-09-06 11:52:19 +02:00
Zetok Zalbavar
c4a92d9518
Merge pull request #2181 from tetraf:master
...
French translation (small update)
2015-09-06 10:50:08 +01:00
tetraf
70f797ec82
French translation (small update)
2015-09-06 10:08:58 +02:00
Zetok Zalbavar
fae7bdba8e
Merge pull request #2178 from TheNain38:master
...
Update fr.ts
2015-09-06 07:26:25 +01:00
Zetok Zalbavar
8cfd317ed6
Merge pull request #2180 from kehugter:master
...
Spanish translation update
2015-09-06 07:18:04 +01: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
kehugter
7f80c780d2
Spanish translation update
2015-09-05 23:07:08 +02:00
tux3
b14bc68702
Merge branch 'pr2172'
2015-09-05 20:36:32 +02:00
tux3
0596210099
Merge branch 'pr2150'
2015-09-05 19:30: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
TheNain38
37a2bbe457
Update fr.ts
2015-09-05 12:37:56 +02:00
Zetok Zalbavar
e15c32ad2b
Merge pull request #2177 from DavidWolfgang:master
...
Fixing some typos at spanish translation
2015-09-05 06:40:32 +01:00
David Wolfgang
124715a920
Fixing some typos at spanish translation
2015-09-05 03:08:32 +02:00
Zetok Zalbavar
7796421f73
Improve wording of login page: "Create Account" → "Create Profile"
...
This should improve situation with misunderstandings, and add more
consistency.
2015-09-04 14:03:24 +01:00
Zetok Zalbavar
6f032cca53
Show toxcore version
...
Even though currently it's listed as 0.0.0, it sill should be shown.
Closes #2086
2015-09-04 12:11:41 +01:00
agilob
12e8d07a97
revert change history to -7
2015-09-03 17:58:23 +01:00
agilob
31c44b9db0
Merge branch 'master' of github.com:tux3/qTox into default_dir_for_saving
2015-09-03 17:57:23 +01:00
tux3
05fece4fab
Remove unused clearAllLocks function
2015-09-03 17:25:09 +02:00
tux3
30c8980d1b
Profile locks are only stale if orphaned
...
Locks used to become stale after 30s of use, they now only become stale if their parent process dies.
2015-09-03 17:24:33 +02:00
tux3
dde68625ad
Merge branch 'pr2014'
2015-09-03 17:19:13 +02:00
agilob
3b4f8c5cf3
Merge remote-tracking branch 'gmscs/patch-1'
...
patch for intstall.md for opensuse
2015-09-02 20:57:33 +01:00
agilob
d5f6c5baef
Merge remote-tracking branch 'gmscs/patch-2'
...
fix for opensuse compilation from sources
2015-09-02 20:56:43 +01:00
gmscs
9421f92cac
Add OpenSUSE to simple_make.sh
...
Not too happy with: " -e /etc/redhat-release -o -e /etc/zypp " for the qmake-qt5.
Something similar could be done for Arch and *maybe* Void. I'll add to this when i get an Arch and a Void install up and running.
2015-09-02 20:40:16 +01:00
gmscs
a0f09fe86a
libffmpeg-devel
...
"'ffmpeg-devel' not found in package names. Trying capabilities.
'libffmpeg-devel' providing 'ffmpeg-devel' is already installed."
woops, sorry
2015-09-02 12:53:22 +01:00
gmscs
9cbd2d0b60
OpenSUSE ffmpeg-devel
...
Compilation of qTox under OpenSUSE requires ffmpeg-devel, not ffmpeg.
2015-09-02 12:38:45 +01:00
agilob
602143068c
fix opening directory/file in file transfer widger
2015-08-31 13:59:39 +01:00
Zetok Zalbavar
aaf0774f35
Merge pull request #2156 from agilob:minor_default_settings_changes
...
change logging, typing notification and compact layout to enabled
2015-08-31 12:01:53 +01: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
agilob
9c74488325
Merge remote-tracking branch 'protagonist/patch-2'
...
compress text about keyboard shortcuts when making screenshots
2015-08-30 20:42:47 +01:00
agilob
db5903c2fe
set one global initial file accept directory for all file transfers
2015-08-30 20:36:39 +01:00
ProMcTagonist
6092a7e8a6
matchy tooltips no linedowns
2015-08-30 12:16:50 -07:00
ProMcTagonist
328726a1cb
Compress string
2015-08-30 11:50:01 -07:00
ProMcTagonist
54e4c3c1f8
Fix confusing statement
...
it sounds like you can press enter to make a new selection
2015-08-30 11:37:21 -07:00
agilob
f8cc36fc94
Merge remote-tracking branch 'PKEv/fix_#2139'
...
spacebar to hide/show qtox window
2015-08-30 19:14:44 +01:00
PKEv
44f0ef2043
add Ability to unhide qTox window in screenshot mode
...
fix #2139
fix #2127
2015-08-30 20:44:33 +03:00
Zetok Zalbavar
9c8b3139d5
Merge pull request #2145 from tetraf:master
...
French translation update
2015-08-30 15:40:24 +01:00
agilob
d6b176d955
Merge remote-tracking branch 'TheSpirit/requests'
...
merge awaiting friend requests, fix formatting conflict
2015-08-30 14:25:46 +01:00
tetraf
edbd1e4fcc
French translation update
2015-08-30 15:16:05 +02:00
Zetok Zalbavar
0c6c28bfbb
Merge pull request #2137 from agilob:tox_core_version
...
better, more flexible about page, versions section
hide toxcore version
fix uri parsing and tox URI detection, closes #2118
fix uri detection, puts dots between toxcore versions
2015-08-29 23:47:29 +01:00
