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

4503 Commits

Author SHA1 Message Date
sudden6
87c881edde
Merge pull request #3101
Jason Papakostas (2):
      feat: install icons with make install on unix
      fix(Widget::updateIcons): fix the way systray icons are loaded
2016-04-11 19:00:21 +02:00
sudden6
9e4adf77b6
Merge pull request #3115
Diadlo (1):
      fix(title): Change title on initial startup on "Add friend"
2016-04-11 13:05:03 +02:00
sudden6
1c991842f8
Merge pull request #3121
Diadlo (1):
      fix(addfriendform): Removed extra connect return press
2016-04-11 12:56:55 +02:00
sudden6
8e8334e64c
Merge pull request #3105
ovalseven8 (1):
      Update for the German translation file
2016-04-11 12:51:45 +02:00
Diadlo
66bcfdae3c fix(addfriendform): Removed extra connect return press
Fixed #3081.
2016-04-11 00:49:01 +03:00
Diadlo
47d940455d fix(title): Change title on initial startup on "Add friend"
Fixes #3100.
2016-04-10 14:08:09 +03:00
Zetok Zalbavar
d58922c667
Merge pull request #3110
kehugter (2):
      style: enhance and reformat issue template
      style: edit issue template, move it to .github dir
2016-04-08 20:41:39 +01:00
kehugter
f432a6f70f style: edit issue template, move it to .github dir
Reduce the titles size in the issue template.
Move the issue template file to GitHub's custom `.github` directory.
2016-04-08 21:31:57 +02:00
Zetok Zalbavar
477ac5b5db
docs(README.md): remove obsolete links to portable builds for windows 2016-04-08 18:44:31 +01:00
kehugter
da58b65059 style: enhance and reformat issue template
Add missing required information for new issues
Redo Markdown format for a cleaner raw display
Standarise requirements/terms with CONTRIBUTING.md
2016-04-08 10:23:11 +02:00
Zetok Zalbavar
93d69a0009
Merge pull request #3093
kehugter (1):
      docs: edit and reorganize Git Commit Guidelines
2016-04-07 00:14:36 +01:00
kehugter
f5c099175c docs: edit and reorganize Git Commit Guidelines
Reorganize the Git Commit Guidelines title hierarchy.
Various content edits in the Git Commit Guidelines section:
- Remove the footer section and merge its contents with the body
- Add revert to the list of possible header types
- Change the maximum line length for header and body
- Add instructions about the body's elements order
2016-04-06 22:56:50 +02:00
ovalseven8
53d6ee610a Update for the German translation file 2016-04-06 19:21:28 +02:00
Zetok Zalbavar
983c4ff688
chore: remove not needed binary blobs and script from tools/
Other things in `tools/` are, or might be still needed.

Closes #3103.
2016-04-05 23:07:30 +01:00
sudden6
db8bee381e
Merge pull request #3102
initramfs (1):
      refactor(video): simplifies retrieval of primary screen
2016-04-05 23:50:10 +02:00
Jason Papakostas
90874a478f fix(Widget::updateIcons): fix the way systray icons are loaded
the system tray should no longer use a static icon when the xdg
application icons are named qtox.{png,svg}

this means the workaround https://bugs.archlinux.org/task/47910 done
downstream at arch linux shouldn't be necessary anymore.
related discussion in #2903
2016-04-05 09:54:59 -05:00
Jason Papakostas
218228b696 feat: install icons with make install on unix
qmake doesn't have a straightforward way to change filenames when installing
files so I moved them into subfolders.

issue #2903
2016-04-05 09:54:59 -05:00
initramfs
00947bc7ad
refactor(video): simplifies retrieval of primary screen
This commit reduces primary screen retrieval to a single static field
access as opposed to obtaining a runtime instance of the QApplication
object
2016-04-04 23:02:54 -04:00
sudden6
20a61e4cc3
Merge pull request #3096
initramfs (1):
      fix(video): usage of invalid file descriptors on error
2016-04-04 23:49:25 +02:00
sudden6
03a1f826cb
Merge pull request #3095
Zetok Zalbavar (1):
      fix(chatform): regression in detecting `tox:` type IDs
2016-04-04 23:41:41 +02:00
sudden6
8e6bfdac99
Merge pull request #3091
initramfs (2):
      fix(video): incorrect desktop video resolution when using HiDPI
      fix(video): uses explicit default screen from QGuiApplication
2016-04-04 23:36:03 +02:00
initramfs
d2189f3891
fix(video): uses explicit default screen from QGuiApplication
This commit changes the method used to obtain the active screen from
simply selecting the first screen in the list to using the explicit
default screen from QGuiApplication::primaryScreen() function
2016-04-04 09:06:16 -04:00
initramfs
556a8750a1
fix(video): usage of invalid file descriptors on error
Fixes code for getDeviceModes() under vfl2 namespace where error
numbers were being treated as valid file descriptors
2016-04-03 14:16:45 -04:00
initramfs
75b40d0a6f
fix(video): incorrect desktop video resolution when using HiDPI
Fixes desktop sharing region being clipped when DPI scaling is being
used.
2016-04-03 10:17:25 -04:00
Zetok Zalbavar
48f3fb7dcb
fix(chatform): regression in detecting tox: type IDs
Introduced in d343408749 / #3044.
2016-04-03 13:28:21 +01:00
Zetok Zalbavar
dde56c99ec
Merge pull request #3077
Closes #3075.

Andrew Morgan (1):
      Prevent regex capture from extended past line boundaries.
2016-04-03 13:24:51 +01:00
sudden6
b592438426
Merge pull request #3079
anoadragon453 (1):
      fix(login screen): Change text on login tooltip
2016-04-01 19:26:19 +02:00
anoadragon453
4e065f1395 fix(login screen): Change text on login tooltip 2016-03-31 08:18:20 -04:00
Zetok Zalbavar
32ed2ac0ef
docs(README.md): remove not needed link to the overlay for Gentoo
Since qTox is available in main Gentoo repo, it makes using overlay
not needed.
2016-03-31 02:22:42 +01:00
Zetok Zalbavar
af698d8537
Merge pull request #3074
PKEv (1):
      Correction Russian translation
2016-03-30 13:50:57 +01:00
Zetok Zalbavar
375c9657ce
Merge pull request #3025
Action messages are now italicized.

Pro (1):
      style action messages centered and italicized
2016-03-30 08:56:22 +01:00
Pro
993232765e style action messages centered and italicized
no more centering

remove extra spaces

squash
2016-03-29 16:35:00 -07:00
sudden6
750409ae76
Merge pull request #3071
ProMcTagonist (3):
      change picture
      more features
      small border fix
2016-03-30 00:09:03 +02:00
sudden6
3a5a7b6757
Merge pull request #3073
Zetok Zalbavar (1):
      chore(merge-script): add check for number and a useful failure message
2016-03-29 23:44:57 +02:00
ProMcTagonist
ea8d31d3d5 small border fix 2016-03-29 13:32:35 -07:00
ProMcTagonist
46e8464d4f more features 2016-03-29 12:03:11 -07:00
Andrew Morgan
2a8071da29 Prevent regex capture from extended past line boundaries. 2016-03-29 14:11:35 -04:00
PKEv
5fdbe03327 Correction Russian translation 2016-03-29 11:22:19 +03:00
Zetok Zalbavar
b9abea636e
chore(merge-script): add check for number and a useful failure message
Message appears only if merge was unsuccessful and makes deleting
as quick as copypasting.

Check makes sure that supplied argument is actually an number, which
helps avoid waiting for git to eror out on "no remote branch".

Additionally, renamed `original` upstream to `upstream`, according to
@sudden6's suggestion.
2016-03-29 01:24:01 +01:00
sudden6
791d871737
Merge pull request #3070
Zetok Zalbavar (1):
      docs(CONTRIBUTING.md): add section about commit message format
2016-03-29 01:23:15 +02:00
Zetok Zalbavar
99bf6aeec6
docs(CONTRIBUTING.md): add section about commit message format
With a proper, (not yet) enforced commit message format qTox would get
both clean commit messages and automatically generated changelog.

In regard to #2887.

Content of the commit taken from `CONTRIBUTING.md` @
96e2cec95a
and adjusted for qTox needs.
2016-03-29 00:20:22 +01:00
Zetok Zalbavar
8df7fbe63f
Merge pull request #3067
kehugter (1):
      Update Spanish translation
2016-03-28 19:37:30 +01:00
ProMcTagonist
084f6962d2 change picture
#3020
2016-03-28 10:35:11 -07:00
kehugter
4bc95c8c7c Update Spanish translation 2016-03-27 21:53:17 +02:00
sudden6
d28c371786
style: fix indentation of simple_make.sh 2016-03-27 17:12:49 +02:00
sudden6
5e0c0704cc
Merge pull request #3060
Flemming Richter (2):
      added missing dependency to libsqlcipher-dev in simple_make.sh
      added missing dependency to sqlcipher-devel in simple_make.sh
2016-03-27 17:09:26 +02:00
sudden6
c5ad132b02
Merge pull request #3059
ovalseven8 (1):
      Update for the German translation file
2016-03-27 17:03:04 +02:00
Flemming Richter
3804ceb9f7 added missing dependency to sqlcipher-devel in simple_make.sh 2016-03-26 19:33:38 +01:00
ovalseven8
e07d81e7c7 Update for the German translation file 2016-03-26 14:03:41 +01:00
sudden6
de4878909d
fix: Close logfile only after the disabling logging to file
This fixes a segfault when closing qTox, because the logfile was closed
before the last message was written.
2016-03-26 13:49:51 +01:00