Commit 5021553e authored by Philip Rinn's avatar Philip Rinn

New upstream version 1.1.6

parent eaa81e9e
......@@ -23,11 +23,11 @@ addons:
branch_pattern: coverity_scan
install:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew unlink node; brew install node; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew unlink node; brew install node; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq qt5 || brew install qt5; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=$PATH:/usr/local/opt/qt5/bin; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install pandoc; fi
#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt57base qt57tools qt57svg; fi
before_script:
......@@ -37,26 +37,26 @@ script:
- qmake -Wall qtpass.pro
- make -j$(nproc)
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt QtPass.app; fi
#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/FAQ\.md/https:\/\/qtpass.org\/docs\/md_FAQ.html/' < README.md > README.faq; fi
#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/CONTRIBUTING\.md/https:\/\/qtpass.org\/docs\/md_CONTRIBUTING.html/' < README.faq > README.contrib; fi
#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/\[\!.*//' < README.contrib > README.clean; fi
#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean; fi
#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION qtpass.pro | cut -d " " -f 6).dmg; fi
#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION qtpass.pro | cut -d " " -f 6); fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/FAQ\.md/https:\/\/qtpass.org\/docs\/md_FAQ.html/' < README.md > README.faq; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/CONTRIBUTING\.md/https:\/\/qtpass.org\/docs\/md_CONTRIBUTING.html/' < README.faq > README.contrib; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/\[\!.*//' < README.contrib > README.clean; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION qtpass.pro | cut -d " " -f 6).dmg; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION qtpass.pro | cut -d " " -f 6); fi
notifications:
irc:
channels:
- chat.freenode.net#IJhack
on_success: change
on_failure: always
#deploy:
# provider: releases
# api_key:
# secure: O6LAl2R5QIe/mgQwG5/pzbdC8gS58wtGVF2ebTVGgYsCgY0nRjLZ19H7BiQrYjbbXs8yw6cQjA+xbxNiVsIVs+Dx9j/fy2JOBeBTrGijlWLcJPT6/Ab65EjI2T96XvI8/YejRmbgjIdXFfuKtD/V4MM12LrvrvktwJp00G9l1Go=
# file: "qtpass-$VERSION.dmg"
# on:
# repo: IJHack/qtpass
# tags: true
# condition: $TRAVIS_OS_NAME = osx && $CC = clang
# skip_cleanup: true
deploy:
provider: releases
api_key:
secure: O6LAl2R5QIe/mgQwG5/pzbdC8gS58wtGVF2ebTVGgYsCgY0nRjLZ19H7BiQrYjbbXs8yw6cQjA+xbxNiVsIVs+Dx9j/fy2JOBeBTrGijlWLcJPT6/Ab65EjI2T96XvI8/YejRmbgjIdXFfuKtD/V4MM12LrvrvktwJp00G9l1Go=
file: "qtpass-$VERSION.dmg"
on:
repo: IJHack/qtpass
tags: true
condition: $TRAVIS_OS_NAME = osx && $CC = clang
skip_cleanup: true
......@@ -8,24 +8,16 @@
- I translated for Simplified Chinese. [\#208](https://github.com/IJHack/QtPass/issues/208)
- Short fullname hangs QtPass keypair generation process for infinite time [\#202](https://github.com/IJHack/QtPass/issues/202)
- More options for password generation [\#98](https://github.com/IJHack/QtPass/issues/98)
- Git hangs on windows [\#71](https://github.com/IJHack/QtPass/issues/71)
**Fixed bugs:**
- view box is trimming whitespace [\#210](https://github.com/IJHack/QtPass/issues/210)
- Short fullname hangs QtPass keypair generation process for infinite time [\#202](https://github.com/IJHack/QtPass/issues/202)
- QtPass starts by searching for -psn\_0\_12345 on macOS [\#213](https://github.com/IJHack/QtPass/issues/213)
**Closed issues:**
- PREFIX is now really a prefix [\#185](https://github.com/IJHack/QtPass/issues/185)
- QtPass, git and windows [\#173](https://github.com/IJHack/QtPass/issues/173)
**Fixed bugs:**
- Better seeder for qrand() as noted in [\#238](https://github.com/IJHack/QtPass/issues/238)
**Merged pull requests:**
- Allow ssh links [\#211](https://github.com/IJHack/QtPass/pull/211) ([cgonzalez](https://github.com/cgonzalez))
- Increase maximum password length to 255 [\#209](https://github.com/IJHack/QtPass/pull/209) ([vladimiroff](https://github.com/vladimiroff))
- Password templates [\#207](https://github.com/IJHack/QtPass/pull/207) ([jounathaen](https://github.com/jounathaen))
- Updated German Translation [\#206](https://github.com/IJHack/QtPass/pull/206) ([jounathaen](https://github.com/jounathaen))
- Italian translation [\#204](https://github.com/IJHack/QtPass/pull/204) ([dakk](https://github.com/dakk))
- keygendialog email and name validition \(issue 202\) [\#203](https://github.com/IJHack/QtPass/pull/203) ([dakk](https://github.com/dakk))
......@@ -400,4 +392,4 @@
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
\* *This Change Log was mostly automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
......@@ -21,3 +21,7 @@ Qt Linguist has very nice in-context translation options [for translators](https
## IRC
For questions or brainstorming about features please join #ijhack on freenode.
## Gitter
Or if you prefer to use [gitter](https://gitter.im/IJHack/qtpass)
......@@ -38,7 +38,7 @@ PROJECT_NAME = QtPass
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 1.1.5
PROJECT_NUMBER = 1.1.6
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
......
......@@ -44,10 +44,29 @@ fi
link `/usr/bin/pinentry` to your pinentry application of choice
eg: `ln -s /usr/bin/pinentry-qt5 /usr/bin/pinentry`
### I have an other issue with gpg
* Possibly you have you key only in gpg and not in gpg2
```
gpg --export [ID] > public.key
gpg --export-secret-key [ID] > private.key
gpg2 --import public.key
gpg2 --import private.key
rm public.key private.key
```
Where [ID] is your gpg key-id.
* It might be the case where it is the other way around, exchange gpg and gpg2 accordingly . .
### Git doesn't work on Windows
git for Windows comes with an `ssh-askpass` compatible command, git `gui--askpass` (located in `/mingw64/libexec/git-core/git-gui--askpass` on PortableGit version, presumably some place similar for the installed version).
### Git has issues with GPG SSH Authentication
This tutorial might resolve your issues.
https://github.com/git-for-windows/git/wiki/OpenSSH-Integration-with-Pageant
### Where is the configuration stored?
QtPass tries to use the native config choice for the OS it's running.
......
......@@ -16,6 +16,7 @@ Features
* Cross platform: Linux, BSD, OS X and Windows
* Per-folder user selection for multi recipient encryption
* Multiple profiles
* Easy onboarding
Logo based on [Heart-padlock by AnonMoos](https://commons.wikimedia.org/wiki/File:Heart-padlock.svg).
......@@ -117,7 +118,9 @@ Further reading
---------------
[FAQ](FAQ.md) and [CONTRIBUTING](CONTRIBUTING.md) documentation.
[CHANGELOG](CHANGELOG.md)
[Website](https://qtpass.org/)
[Source code](https://github.com/IJHack/qtpass)
[Issue queue](https://github.com/IJHack/qtpass/issues)
[Chat](https://gitter.im/IJHack/qtpass)
......@@ -5,8 +5,8 @@
"icon-size": 80,
"contents": [
{ "x": 64, "y": 64, "type": "file", "path": "QtPass.app" },
{ "x": 448, "y": 64, "type": "link", "path": "/Applications" },
{ "x": 428, "y": 64, "type": "link", "path": "/Applications" },
{ "x": 64, "y": 448, "type": "file", "path": "README.rtf" },
{ "x": 448, "y": 448, "type": "file", "path": "LICENSE" }
{ "x": 428, "y": 448, "type": "file", "path": "LICENSE" }
]
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -35,13 +35,15 @@
* @return
*/
int main(int argc, char *argv[]) {
// @todo(annejan) check for stupid apple psid or whatever flag
QString text = "";
for (int i = 1; i < argc; ++i) {
if (i > 1)
text += " ";
text += argv[i];
}
if (text.indexOf("-psn_") == 0) {
text.clear();
}
#if SINGLE_APP
QString name = qgetenv("USER");
if (name.isEmpty())
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "QtPass"
#define MyAppVersion "1.1.5"
#define MyAppVersion "1.1.6"
#define MyAppPublisher "IJhack"
#define MyAppURL "https://qtpass.org/"
#define MyAppExeName "qtpass.exe"
......
......@@ -7,7 +7,7 @@
# #
#---------------------------------------------------------#
VERSION = 1.1.5
VERSION = 1.1.6
TEMPLATE = app
QT += core gui
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment