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
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
