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

3435 Commits

Author SHA1 Message Date
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
agilob
582db9cb5b
fix uri detection, puts dots between toxcore versions 2015-08-29 23:28:21 +01:00
agilob
d6a0910fc8
fix uri parsing and tox URI detection, closes #2118 2015-08-29 23:26:05 +01:00
agilob
126ca6337c
hide toxcore version 2015-08-29 22:51:01 +01:00
agilob
0a5d847cf5
better, more flexible about page, versions section 2015-08-29 22:50:21 +01:00
agilob
97f6186308
Merge remote-tracking branch 'zetok/bootstraps'
update list of nodes, a lot of DHT nodes were offline, makes qtox conntect faster
2015-08-29 15:37:30 +01:00
Zetok Zalbavar
dffeb7d6d6
Update list of bootstrap nodes 2015-08-29 15:33:08 +01:00
agilob
7b3ddff202
Merge remote-tracking branch 'zetok/settings' 2015-08-28 19:27:10 +01:00
agilob
bf9387a3fd
Merge remote-tracking branch 'Fak3/patch-1' 2015-08-28 18:49:33 +01:00
Evstifeev Roman
507c8b9a9d White text on white bg on login screen is invisible
When used dark Qt theme, text color should be set explicitly for explicitly white background.
2015-08-28 20:23:54 +03:00
Zetok Zalbavar
9561660104
Simplyfy advanced settings - DB setting
thanks to @AWeinb for idea, fixes #1514
2015-08-28 11:33:53 +01:00
Zetok Zalbavar
bae8a0d0c8
Merge pull request #2124 from ovalseven8:patch-3
Update generalsettings.ui
2015-08-27 14:34:38 +01:00
ovalseven8
67193c9d8a Update generalsettings.ui
to avoid misunderstandings
2015-08-27 13:11:13 +02:00
agilob
b02cf2dbc7
Merge remote-tracking branch 'PKEv/fix_#1977_no_link_if_no_GIT_VERSION'
no link if no GIT_VERSION
2015-08-26 19:53:11 +01:00
agilob
5438099359
Merge remote-tracking branch 'PKEv/exp_func_screenshot'
ability to hide the window during a screenshot (by pressing spacebar)
2015-08-26 19:50:40 +01:00
agilob
78f3044317
Merge remote-tracking branch 'zetok/profile'
Fix 2 minor issues introduced by #1989
2015-08-26 19:45:11 +01:00
agilob
ad22d6d123
Merge remote-tracking branch 'Impyy/add-toxme-io'
Added toxme.io to the pinned servers list
2015-08-26 19:42:54 +01:00
Zetok Zalbavar
f5c02def6d
INSTALL.md: remove unmaintained repo for debian-based distros
Also add links to generic static binaries for Linux.

Hopefully that's only a temporary measure.
2015-08-26 11:02:11 +01:00
Zetok Zalbavar
35671a9528
Merge pull request #2115 from kehugter:master
Spanish translation update
2015-08-25 20:15:45 +01:00
kehugter
0bc74f9c43 Spanish translation update 2015-08-25 19:39:01 +02:00
Impyy
4fdff0cfde Added toxme.io to the pinned servers list 2015-08-25 13:41:17 +02:00
Zetok Zalbavar
395aeb12b2
Add travis 2015-08-25 02:12:13 +01:00
Zetok Zalbavar
32f9cfccf2
Fix 2 minor issues introduced by #1989
* Add space between ":" and name of profile file
* Fix opening location of profile on UNIX-like
2015-08-24 18:21:37 +01:00
Zetok Zalbavar
39771f4720
INSTALL.md: rework instructions for Linux
* added missing info
* removed unneeded parts
* better index
2015-08-24 17:34:04 +01:00
agilob
030a72f561
Merge remote-tracking branch 'PKEv/del_chat_history'
add ability to delete chat history when disabling chat logging
2015-08-24 12:30:40 +01:00
agilob
796e1e04aa
Merge remote-tracking branch 'Impyy/tox3-fix'
fallback to _tox.name lookup
2015-08-24 12:14:03 +01:00
agilob
3b6d245f61 Merge remote-tracking branch 'PKEv/add_profileFileName_in_profilePage'
fix #1951
2015-08-24 12:13:05 +01:00
agilob
a4a52f9cc9
Merge remote-tracking branch 'rku/contact-removal-dialog' 2015-08-24 11:26:37 +01:00
PKEv
7f29940625 fix #2103
ability to hide the window during a screenshot
2015-08-24 01:10:31 +03:00
Zetok Zalbavar
aa311fb065
Merge pull request #2105 from PKEv:fix_#2089_Copy_QR_code_image
fix #2089 (copy QR image)
2015-08-23 18:41:07 +01:00
Zetok Zalbavar
2034bf9b6a
Merge pull request #2104 from blobgo:blobgo-patch-readme
Update README.md
Corrected line in Readme
2015-08-23 17:28:52 +01:00
PKEv
86610f3d7a fix #2089 (copy QR image) 2015-08-23 18:41:49 +03:00
blobgo
6db69bc4e3 Corrected line in Readme 2015-08-23 17:19:35 +02:00
blobgo
179b032ebd Update README.md 2015-08-23 14:24:48 +02:00
Nils Fenner
6d5b70ca3c
Merge pull request #2099 from ovalseven8/patch-2 2015-08-23 09:27:56 +02:00
ovalseven8
ba9e89f2ea Update generalsettings.ui
Remove useless HTML.
2015-08-22 17:59:08 +02:00
Zetok Zalbavar
709df1ed12
Merge pull request #2095 from mgmillani:master
Updated portuguese translation and added all missing translations.
2015-08-22 12:54:23 +01:00
Nils Fenner
7a74fcbd39 Merge pull request #2096 from ovalseven8/patch-1
Update de.ts
2015-08-22 12:35:27 +02:00
Nils Fenner
55bc668d7b Merge pull request #2097 from mvystrcil/master
Fix of indentation
2015-08-22 12:12:17 +02:00
ovalseven8
cc27bb7211 Update de.ts 2015-08-22 11:48:01 +02:00
ovalseven8
3843b73c7a Update de.ts
Update with some fixes
2015-08-22 11:39:42 +02:00
Martin Vystrčil
4f6a83767e Fix of indentation 2015-08-22 11:18:36 +02:00
rku
74d98fd0c2 This dialog solves all confusion that arose from current verification method and is accident-proof. Current method asks if
user also wants to remove chat history. However confused user may not carefully read message and click "no" because he does
not want to remve contact. However in this case contact is in fact removed but history is preserved. It is also open to
possiblity that key smashing deletes contact by accident. This is very inconvenient because tox ids are long and hard to
memorize. If someone removes contact by accident then he would need to find id of that contact in order to contact him/her.
Sometimes this may be difficult.

New contact removal confirmation dialog prompts use to enter "YES" in the text boxin order to enable "OK" button so removal
can be accepted. It also has checkbox for history removal. Dialog will work with translations. Russian user would need to
enter "Да" in order to accept removal.
2015-08-22 12:17:04 +03:00
ovalseven8
b691d06a56 Update de.ts
Additionally all obsolete translations were dropped.
2015-08-21 22:46:45 +02:00
PKEv
31f2a39efe Correct strings 2015-08-21 23:26:14 +03:00
Marcelo Garlet Millani
385d7b782c Merge branch 'master' of github.com:tux3/qTox 2015-08-21 15:41:19 -03:00
Marcelo Garlet Millani
27bffa37e9 Updated portuguese translation and added all missing translations. 2015-08-21 15:41:11 -03:00
TheSpiritXIII
d21a6d29de Fix request translations and make group button stay down 2015-08-21 12:36:59 -04:00