Skip to content

Commit

Permalink
Merge branch 'release/v1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
plfiorini committed Mar 24, 2018
2 parents d222bd1 + 7ecceb9 commit 25a6f0b
Show file tree
Hide file tree
Showing 1,230 changed files with 10,161 additions and 4,062 deletions.
2 changes: 2 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Contributors to this repository agree to be bound by the [Code of Conduct](https://liri.io/community/code-of-conduct/)
as made available on our web site.
39 changes: 39 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
Your issue may already be reported!
Please search on the [issue track](../) before creating one.

## Expected Behavior

Tell us what should happen.

## Current Behavior

Tell us what happens instead of the expected behavior.

## Possible Solution

Not obligatory, but suggest a fix/reason for the bug,
or ideas on how to implement the addition or change.

## Steps to Reproduce (for bugs only)

Provide a link to a live example, or an unambiguous set of steps to
reproduce this bug. Include code to reproduce, if relevant.

1.
2.
3.
4.

## Context

How has this issue affected you? What are you trying to accomplish?
Providing context helps us come up with a solution that is most useful in the real world.

## Environment

Include as many relevant details about the environment you experienced the bug in.

* Version used:
* Operating system and version:
* Device (phone, tablet, laptop, desktop, ...):
* CPU, RAM, screen resolution:
23 changes: 23 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
### Pull Request check-list

_Please make sure to review and check all of these items:_

- [ ] Does the code keep building with this change?
- [ ] Do the unit tests pass with this change?
- [ ] Is the commit message formatted according to CONTRIBUTING.MD?
- [ ] If this change fixes a bug (or a performance problem), is a regression
test (or a benchmark) included?
- [ ] Is a documentation update included (if this change modifies
existing APIs, or introduces new ones)

_NOTE: these things are not required to open a PR and can be done
afterwards / while the PR is open._

### Affected core subsystem(s)

Please provide affected core subsystem(s).

### Description of change

Please provide a description of the change here.
Add a screenshot or a screencast if necessary.
3 changes: 3 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ Pier Luigi Fiorini <[email protected]> <[email protected]
Pier Luigi Fiorini <[email protected]> <[email protected]>
Pier Luigi Fiorini <[email protected]> <[email protected]>
Magnus Groß <[email protected]> <[email protected]>
Lukas Oberhoeller <[email protected]> <[email protected]>
Lukas Oberhoeller <[email protected]> <[email protected]>
Rajesh Kumar Mallah <[email protected]> <[email protected]>
32 changes: 7 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,10 @@ services:

env:
global:
# FTP_USER
- secure: "0ye9KRdOWOvKtXHZwAyxwgTkGrz5nmThQXxGMbLV1HzfmnJTsm/A38HuIaUlZt4bNVC20oDX2XJ7xZNZsj20eH3K7jREAJV8wCGp35OLEdDhMaDFt21PnsruhZAGdvGVT6m0vCBxJ6WF4m08Y/nY9pG74u2xm9gcEwg74zykV705rvS+HVOssf9n0B8nFCF0HdKnNmAK41qxKKaGxZ2x06kobyQTtmAZpu+sEzRdjQsXx2oyDyYISybUiqc3KqLjrzfRa0oNGxXvZbQqk/1BdihVTkC55jl6zPUnmSpMRDmvt+vX6Wi7qr2JucguxokSDBCAsC7rJqYOrga4Wb1m58r+OkhVfjGs8rWHqBpdQb2WEjpxsHfjN5ofn320/non9moJspMon5PkSd6UnJB5NymUjYKubBti370K3k/24YXYVoSg5/29Ol6GUzXpoV8QeNe97At8wsSXwJNKhSN6OqPWVUZpnF4yHxJsYIVIKqkXzKV/xgPQgyaw3+88gfljoxgWgnRxO3CTftrgNsLovwfRvz+ae3VfphXAVa0NDbiotyJPF8eUaLA8JqToF42nhAvMB4VE4UmnAfUXtN0qLL2cCXyvFCuj9c3XfRXXxAk2pVgNAuc62RnOBAUpoSz6DMozYzwCfdU4JlR5kNX2ugYYdhpku8BixLlk1+zgqcA="
# FTP_PASSWORD
- secure: "pyQugd8ZXVTSLPuLAnLhFRz9A5JODhLQfWMHqeGPElgisEMSXcwjh1QEYQbwqk/9o1y33L5nM1Q3LzSEdMG2T+jeXKnDq9+Oyl/gt8Y9F9wMuHX3VJsWm07j420ogIzJnoZipYGuhh0i7mZNHHoS13DJC7UiGLvtspbRhR+fX9KcZgpxhYqaJxjZxzFzV9Nj2vRn0VgOaphdctRy0bIMJBBuZ4+uG3roeme2Uz7NDdlP1Fr0S9/7pKF/93NvEYHAioaXOTlPMrjVspT2WIkujbCNK08kJbPNphK20X78e3VL5YufTlALxVY4c+vpOVNyaKl4+/0QdsZ8dy+orT/CSyCJiSdpYAmJEMlZHQQaa44pI8m1sN1LR1Cvv6MbhXtXme2zZKUP7doLyt9A5tbtdnl+SXlN6V8++J83sgIB7O4v/UXYLpmd1IL7G+cgH6g8ckjcLqQWPWfhJEix1hNwzPR6GFjo39KyftnBM4jp00bjzIFkIdOD9cW461NqIjCeiyCiBF/bmNtZ3Y3M9i8MG/KvxBKtcTmam1m+HRvUKkDslEahDjhHzYr/h952UIllhy2CJvviG+h5/WbxxnKKUtd+xaFhYgZZrv6K7gA9tAUwW02v27oHzOjBvaLHaoKHv2lTAgchIgxPn+YjScAUQv3qkD9Wk9oF6xEIPLe8c0w="
# FTP_URL
- secure: "Kh/Gq5WiAfED6+2+xjni1jnEPWbpDpHTiTMDkUF1RLnTUBmyTKiC1Nvmf6nUNFb3YsH3FeoDvxHsoznKxBrQVOBhfpedGqum465wkt0KBn+5crty0tYfSf2VZ86tN3oYMP7bJy1MKcFL2rq7cXUnWp98bv/GNlITu7yuIUTOXoOybxSUTFPgRLivzl8Apy1lmgcpFB7Cw0N1p6C/eWyJFix5MFpoF2ejO/ozKQGVptKXgTJMAEgQbcpn71E3Dh95ui3oxv1K9FzonqtPn4cag0msBZdJIvX9UdBEGpWcpADP2Q7g+Vdv5c5UF4zgFUYugeUtmQkIKK66/G4JtZ0+iYTA8Z7NBjkP0ToYpgXKAujuZf0CZf6Buj/3W/HBnsbxTYoUpUwtGHWIoYYeN/LFmT/JgW+B6M4KJLuyWQkmc7uysLScPuJ35FVvEaVdrxJ3myjEa45uoTAKAfI4Hk5J6ocbX9MvBR/76OKwukHZT9LjKwY+fGmi5Cc4hVhkJ7qpsBCnyBZ9ZN/jiwrAywXmTYYHyVEjulRrOUTrOcrI+zeydm866KPnzVU4bcLFPIWYzUGL0ksK14t9iR8gGmAJd2bi0koMh9Fb5bZUjGFKceLR4RWOfeNL6ViDSepvj8xWEEwlu5//Z9Y7mPpZHOpIiyr7+XdRDUVdQcpE9CdDfn4="
# DEPLOY_USER
- secure: "nLSB2P40AmeFf6LThfbSvLX9hEjW/ppM9ukRusx4xnXOSHBcBJERoPZguF3B7f37JNp7WV2hWloAF+8x1jIOHyPq4P+1wZaZuUCrtpKVvCPMKHwJ2YqZ3vOT7CP165C0SowbdTXnHT0SOn18xKBD+GBSKQmWpziygUTxta1Vcb55xUhAXgDXLkDmsVGpRIBJTbhAH4im85isTUORLKHcCJgLyCMxwfFimsOGLyyXM/69v3qPAhcIN0AryVE2IY4hJTTcCE3YWk7ffDbdTeSegjdX6l6IdbBI8JaVpCPuvonybogpEsI9BIlgx+MC7kba57usMwBnxKaLUsPrOWTkn1HVlQ5DcBRv46up9lo+Jap9zzlNgQBGh/aDDSbBY7RSL46xZkXKXZ10PYlgkhhzQqroJ/qMSb/gYcoxseRmrdM6itjCwt3oQ6KdxhUcQ3nrgUDisejRBVYAudV2JC8rBauYAAWxFr4DOED6nOWsSo3G2Yv1Ngcj5U9bErBASh2WIefu6cdLC86NPvotDUf+B4o7ZzAhfXY63z64a8FMFtjLiTljNzcEPaNTm7YjSaCfB+mTsn5VJHYmQxkZP8H8hhFpyq/ihfeJMmuYb0j5MZduJCvf20vAZg6U3LNsJEVMKlo3f2oSkUXxTrg4+/vyZoATyY1eVJhwZ2qSL7scCjk="
- secure: "G8DS21df95TDm9NReqj5Eeh8V69qN8VF02YMfzKnq1lb13PbN5eV4sFjGK3ndaUGF+oK9rGSLo+HkNpaYdSFVEpLjFBTbYf9bjgpu012EsU4UBpMFKYEc3vGh4bqO2IWB4JKdILLBpKSC1fHaMkTuZjRXnl1uim0jajQuNNkTrUW3WcXxJ3ObN2NuYB9MMhmSXtFAU1++NnxNURChHprdkQcE/8FUnrt1L6z5EERplgOg4WjSITxYCaSOjZLhV/bav/T7x7Tci+rhO7xd0rrfHcCpmVaQzsBXNgZWEMOYIAhVcJTGMQObPtbOEYOysGQHMON9uMkT1cnagYLYCUW+mYjnbeaow3qvlI4HVThAkcpS3q2simp8BPFuH0cEa5E+s0XtUAJmSzPpX/s/6pqz2RqMMpHZ4wV+4fDbKJE1ng2up9yy3UF54aLpMjotTvd9Bl8zLtpVkld1EIVMf8KsC2QwKG++U6Z7TOFIqpLVBc8Zu6U89pv99Y1WBxgjy8JM4oeR4PrsDGDIMR4vsB38Kc5aVJs1A3QSMHRLFPLcpK1Qhy09hgTUrqElVxF2te8hLMgLoP00WWkPDYqyPl3f/HTH/ZYthkbRbcw9a8LN8IR218SbFfNQsVSxKDHLOFPu8xr6pGykw2YmYwHaXE8aZVoqdjXFUYbGxbwGVcjWHk="
# DEPLOY_HOST
- secure: "EM5nZeBDPU5vJd1MYtbVhOMZxfBLf2/VSH/U9ozqeGOH7IcrSOlppK9y0LrgM9pHqnd9rL2mWz/UmiknDy74f9IwrR43LhkWjWghQs2sbmVs1Z5iPAJXGJw2MIxHOZmmuHWtHf0q8hDXirHnq0vh1RidKNvwOZjUE0x/NoDC4cNwik6bElz0GkGrzUFnImEd9rPJKwnD6ohhO+CrBTTca/EWB2CQOUz4ie5vcgxdZ5bnTycvodGUE/dj1Afl3tWCmn8Ej82OuSDbhrmHxCg0/aKlJA0k01FX+elXGFBe76UPTTydmKWE6/Vzs8+OjmBKuGDYMA5ne8rk+G0vAu6PWRFUo6gZT7M1kRycqQe6zOIwTm7u1ExHDVp40Q5ZRsvVc9/eZYsG9MREjPN4HYCBfNCgnpYqdRJ4wnwQRfEkF1UURdIaXnpTuz9XKt80ia9ajepFaFYD/gGOTkuQOzkS3GsAmsX6vs6Jz6TtxCQJwPiXUcf0D0nyRds4JPU41odLVuWvjkeZVznvSo6wArGTuiO5m5FSwEgPsNzoMb38qy7pHA/Hom0Ar7/RqFOW941Ix7o4LU+t4x/MFWE6eKQhIoSU+HdB+ooTUtGEOF3+C+jqRmobwqfbB7yBDpeJTrXCb6cAaP8wIym7LkDXajQXcJNMA74xCdB8GYjOonKXpoc="
- secure: "0L8BKnozSiwI5VMRAL6QAQ6gwVIrnBhoYq6NkACbIOchkQShZlQH9p/4/2A9/6Wu4pTrB7eTeR1JQahmjwAqUFoMfpZm+LCBZGnQpHnZd6ZgT1rcgd1MAWR4PBhoeHGbTBly00Ez9BlE5nwUxwV7XszVxbEab5tzP52JThetf+tOoL1FjUyYb3/YpPOZzlQ2gh1BeBGi8PE29i06Sa5vlGdTtJXBZmHqn2IZ2bDCNFaetI9yr6HwkxvmuhQew/vv4bsSuUidfgdZrwPodJMo0aO78INWcIl8qleHaaKvVw5sRpdk3qNPqSW517/FHMG4jDHimDnX4s2aWaq+iaVuRc4VmeQ4Ebp5Zjlf9qVuhkOCUbCy0ojrEROsqYy/oVfAH99O9lvUDBl8Q6taFJeBwhZAdDMUttqQdRSaDEspFjOk7zDoeCLN4DFzOElW1DT1XYUXUvE+WIZci5zTyhNRp6WSIKHJKHjltTqa6KscKlmWUYvroKh80SdUrjNxibM/PVl5PlFRSeXAxq3s9bC/8oNUj0CbhZBqzIP9JMbCTrjX5KnO4BPULKo94pi4LBzGtzQNs6qQ/K1srH4FsB1M9RxrD3Uqr3VcU4XbLCRLGB5rZR6Jph0IOYiRUKgQkxHnsS6mXqIizCCxDuVR6MdSvnyDcy5PuEcAEG3tC//JFnw="

arch:
packages:
Expand All @@ -39,36 +33,24 @@ arch:
- qbs-setup-toolchains --detect
- qbs-setup-qt /usr/bin/qmake-qt5 qt5
- qbs config profiles.qt5.baseProfile ${CC}
- eval `dbus-launch --sh-syntax` && xvfb-run -a -s "-screen 0 800x600x24" qbs build -d build -j $(nproc) --all-products profile:qt5 qbs.installRoot:/ qbs.installPrefix:usr projects.Fluid.autotestEnabled:true projects.Fluid.deploymentEnabled:true
- eval `dbus-launch --sh-syntax` && xvfb-run -a -s "-screen 0 800x600x24" qbs build -d build -j $(nproc) --all-products profile:qt5 modules.qbs.installRoot:/ modules.lirideployment.prefix:/usr modules.lirideployment.qmlDir:/usr/lib/qt/qml projects.Fluid.useSystemQbsShared:false projects.Fluid.autotestEnabled:true projects.Fluid.deploymentEnabled:true

script:
- "curl -s https://raw.githubusercontent.com/lirios/repotools/develop/travis/docker-travis.sh | bash"

deploy:
- provider: script
script: curl --ftp-create-dirs -T build/default/fluid-artifacts.tar.gz -u $FTP_USER:$FTP_PASSWORD $FTP_URL/artifacts/master/fluid-artifacts.tar.gz
script: .travis/deploy.sh build/default/fluid-artifacts.tar.gz
skip_cleanup: true
on:
branch: master
condition: "$CC = gcc"
condition: "$CC = gcc) && ($TRAVIS_PULL_REQUEST = false"
- provider: script
script: curl --ftp-create-dirs -T build/default/fluid-artifacts.tar.gz -u $FTP_USER:$FTP_PASSWORD $FTP_URL/artifacts/develop/fluid-artifacts.tar.gz
script: .travis/deploy.sh build/default/fluid-artifacts.tar.gz
skip_cleanup: true
on:
branch: develop
condition: "$CC = gcc"
- provider: script
script: .travis/deploy.sh
skip_cleanup: true
on:
branch: master
condition: "$CC = gcc"
- provider: script
script: .travis/deploy.sh
skip_cleanup: true
on:
branch: develop
condition: "$CC = gcc"
condition: "$CC = gcc) && ($TRAVIS_PULL_REQUEST = false"

notifications:
email: false
Expand Down
68 changes: 37 additions & 31 deletions .travis/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,46 @@
#
# This file is part of Liri.
#
# Copyright (C) 2017 Pier Luigi Fiorini <[email protected]>
#
# $BEGIN_LICENSE:BSD$
#
# You may use this file under the terms of the BSD license as follows:
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of the Hawaii Project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL Pier Luigi Fiorini BE LIABLE FOR ANY
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Copyright (C) 2018 Pier Luigi Fiorini <[email protected]>
#
# $BEGIN_LICENSE:MIT$
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
# $END_LICENSE$
#

# Deployment procedure as seen in https://oncletom.io/2016/travis-ssh-deploy/

filename=$1

if [ -z "$filename" ]; then
echo "Usage: $0 [filename]"
exit 1
fi

destfilename=$(basename $filename)

ssh-keyscan $DEPLOY_HOST 2>&1 | tee -a $HOME/.ssh/known_hosts
openssl aes-256-cbc -K $encrypted_a841ddf051d0_key -iv $encrypted_a841ddf051d0_iv -in .travis/github_deploy_key_fluid.enc -out /tmp/github_deploy_key_fluid -d
openssl aes-256-cbc -K $encrypted_a841ddf051d0_key -iv $encrypted_a841ddf051d0_iv -in .travis/github_deploy_key_liri_ci.enc -out /tmp/github_deploy_key_liri_ci -d
chmod 600 /tmp/github_deploy_key_liri_ci
eval "$(ssh-agent -s)"
chmod 600 /tmp/github_deploy_key_fluid
ssh-add /tmp/github_deploy_key_fluid
rsync -crvz --rsh="ssh" --delete-after --delete-excluded build/default/fluid-doc.*/qdoc_html/ $DEPLOY_USER@$DEPLOY_HOST:$TRAVIS_BRANCH
ssh-add /tmp/github_deploy_key_liri_ci
rsync -crvz --rsh="ssh" --delete-after --delete-excluded build/default/fluid-online-doc.*/qdoc_html/ $DEPLOY_USER@$DEPLOY_HOST:$TRAVIS_BRANCH
scp $filename $DEPLOY_USER@$DEPLOY_HOST:$TRAVIS_BRANCH/$destfilename
Binary file removed .travis/github_deploy_key_fluid.enc
Binary file not shown.
Binary file added .travis/github_deploy_key_liri_ci.enc
Binary file not shown.
24 changes: 5 additions & 19 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
Fluid
=====

# Maintainers
# Core Developers

* Pier Luigi Fiorini <[email protected]>
* Pier Luigi Fiorini

This is the list of contributors to this code base.
# Contributors

Names are sorted by number of commits at the time of this writing.
Commit data has been generated with:
You can see the list of contributors to this code base,
and the number of their commits with:

```sh
git shortlog -s -e -n
```

Commit counts have been removed, since they change pretty frequently.

Remember to update this file before any release is made, also make sure
a .mailmap file is maintained if committer names and email addresses
change over time.

* Pier Luigi Fiorini <[email protected]>
* Michael Spencer <[email protected]>
* Rajesh Kumar Mallah <[email protected]>
* Magnus Groß <[email protected]>
* oKcerG <[email protected]>
* SushiTee <[email protected]>
* Tim Süberkrüb <[email protected]>
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ All code follows the following coding style and conventions, please read:

* [Qt C++ Coding Conventions](https://wiki.qt.io/Coding_Conventions)
* [Qt C++ Coding Style](https://wiki.qt.io/Qt_Coding_Style)
* [QML Coding Conventions](https://github.com/lirios/lirios/wiki/QML-Coding-Conventions)
* [QML Coding Conventions](https://liri-dev.readthedocs.io/en/latest/contributing/coding-conventions/qml-conventions/)

## Additional Notes

Expand Down Expand Up @@ -217,4 +217,4 @@ labels are missing on some repositories, then please open an issue on that repos
[search-fluid-repo-label-idea]: https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+repo%3Alirios%2Ffluid+label%3Aidea
[search-lirios-org-label-idea]: https://github.com/issues?utf8=✓&q=is%3Aopen+is%3Aissue+user%3Alirios+label%3Aidea
[search-fluid-repo-label-task]: https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+repo%3Alirios%2Ffluid+label%3Atask
[search-lirios-org-label-task]: https://github.com/issues?utf8=✓&q=is%3Aopen+is%3Aissue+user%3Alirios+label%3Atask
[search-lirios-org-label-task]: https://github.com/issues?utf8=✓&q=is%3Aopen+is%3Aissue+user%3Alirios+label%3Atask
Loading

0 comments on commit 25a6f0b

Please sign in to comment.