-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/release-1.5'
* origin/release-1.5: (245 commits) Version adjusted Documentation updates Release notes: one more typo Corrected typo Added info to release notes Added tabcount and title for 2 tabs to index.html of sample plugin webif Documentation updates Documentation updates Sample Plugin Webif: added reload parameter Documentation updates: Changed documentation feedback page from github wiki to smarthomeNG.de Sample Plugin Webif: fixed example Documentation updates Images für TreeView now in global gstatic folder, CSS changed Documentation updates Documentation updates Documentation updates Documentation updates Documentation updates Documentation updates Documentation updates ... # Conflicts: # .gitmodules # bin/shngversion.py # doc/developer/source/release/1_4_1.rst # doc/user/Makefile # doc/user/source/conf.py # doc/user/source/konfiguration/plugins.rst # doc/user/source/release.rst # lib/network.py # plugins
- Loading branch information
Showing
8,693 changed files
with
427,804 additions
and
5,358 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| ####################################################################### | ||
| # Travis-CI script | ||
| # | ||
| # This script will checkout all required reqository to run the | ||
| # suite. | ||
| # | ||
| # The following configuration settings are available: | ||
| # * Environment settings: | ||
| # - REPOSITORY_ORIGIN: defines the current repos origin (e.g. | ||
| # "smarthome" or "plugins") | ||
| # * Script settings: | ||
| # - REPOSITORIES: List of repositories to checkout from smarthomeNG | ||
| # organization (e.g. "https://github.com/smarthomeNG/<repo-name>") | ||
| # - LINKS: Contains a list of links to create before running the | ||
| # suite (e.g. "<target-repo>/<target-dir>/<source-repo>") | ||
| # * Script variables: | ||
| # - REPOSITORY: The name of the current repository | ||
| # - REPOSITORY_ORIGIN: The origin repository from environment setting | ||
| # - REPOSITORY_BRANCH: The branch to use for checkouts | ||
|
|
||
| echo -e "travis_fold:start:Environment\nEnvironment dump" | ||
| set | ||
| export | ||
| echo "travis_fold:end:Environment" | ||
|
|
||
| ####################################################################### | ||
| # Declare some common variables | ||
|
|
||
| REPOSITORIES="smarthome plugins" | ||
| LINKS="smarthome/plugins/plugins" | ||
|
|
||
| # Get the current repository which is processed | ||
| REPOSITORY="$(basename $TRAVIS_REPO_SLUG)" | ||
| REPOSITORY_ORIGIN="$REPOSITORY_ORIGIN" | ||
|
|
||
| # Find out on which branch to work | ||
| if [ "$TRAVIS_BRANCH" = "master" ] ; then | ||
| REPOSITORY_BRANCH="master" | ||
| else | ||
| REPOSITORY_BRANCH="develop" | ||
| fi | ||
|
|
||
|
|
||
| ####################################################################### | ||
| # 1. Checkout all repositories | ||
|
|
||
| echo -e "travis_fold:start:Checkout\nChecking out repositories with $REPOSITORY_BRANCH branch" | ||
|
|
||
| # Change to root directory since script is started in checkout | ||
| cd $TRAVIS_BUILD_DIR/.. | ||
|
|
||
| # Check out other repositories with develop version | ||
| for REPO in $REPOSITORIES ; do | ||
| if [ "$REPO" != "$REPOSITORY_ORIGIN" ] ; then | ||
| echo "Checking out $REPO ..." | ||
| git clone https://github.com/smarthomeNG/$REPO.git $REPO | ||
| cd $REPO | ||
| git checkout $REPOSITORY_BRANCH | ||
| cd .. | ||
| fi | ||
| done | ||
|
|
||
| echo "travis_fold:end:Checkout" | ||
|
|
||
|
|
||
| ####################################################################### | ||
| # 2. Create symlinks in repositories | ||
|
|
||
| echo -e "travis_fold:start:Links\nCreating symlinks" | ||
|
|
||
| # Create symlinks in core repository | ||
| for LINK in $LINKS ; do | ||
| TARGET=$(dirname "$LINK") | ||
| TARGET_REPO=$(dirname "$TARGET") | ||
| TARGET_DIR=$(basename "$TARGET") | ||
| SOURCE_REPO=$(basename "$LINK") | ||
|
|
||
| echo "Create link from $SOURCE_REPO to $TARGET_REPO/$TARGET_DIR ..." | ||
| cd $TARGET_REPO | ||
| rm -rf $TARGET_DIR | ||
| ln -s ../$SOURCE_REPO $TARGET_DIR | ||
| cd .. | ||
| done | ||
|
|
||
| echo "travis_fold:end:Links" | ||
|
|
||
|
|
||
| ####################################################################### | ||
| # 3. Run | ||
|
|
||
| echo -e "travis_fold:start:Suite\nRunning suite" | ||
|
|
||
| cd smarthome | ||
| tox | ||
| cd .. | ||
|
|
||
| echo "travis_fold:end:Suite" | ||
|
|
||
|
|
||
| ####################################################################### | ||
| # 4. Docs | ||
|
|
||
| #echo -e "travis_fold:start:Docs\nBuilding documentation" | ||
|
|
||
| #cd smarthome/doc | ||
| #yes | bash build_doc.sh | ||
| #cd ../.. | ||
|
|
||
| #echo "travis_fold:end:Docs" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| sudo: false | ||
| language: python | ||
| python: | ||
| # - "3.2" | ||
| - "3.3" | ||
| - "3.4" | ||
| - "3.5" | ||
| - "3.6" | ||
|
|
||
| before_install: | ||
| - git submodule update --init --remote --recursive | ||
| env: | ||
| - REPOSITORY_ORIGIN=smarthome | ||
|
|
||
| install: | ||
| - pip install tox-travis "virtualenv<14.0.0" | ||
| - pip install sphinx sphinx_rtd_theme recommonmark ruamel.yaml | ||
|
|
||
| script: | ||
| - tox | ||
| - sh .travis.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| global_translations: | ||
| # Translations for the plugin specially for the web interface | ||
| 'Ja': {'de': '=', 'en': 'Yes', 'fr': 'Qui'} | ||
| 'Nein': {'de': '=', 'en': 'No', 'fr': 'Non'} | ||
| 'Aktualisieren': {'de': '=', 'en': 'Update', 'fr': 'Recharger'} | ||
| 'Schließen': {'de': '=', 'en': 'Close', 'fr': 'Fermer'} | ||
| 'Aktiv': {'de': '=', 'en': 'Active', 'fr': 'Actif'} | ||
| 'Gestoppt': {'de': '=', 'en': 'Stopped', 'fr': 'Arrêté'} | ||
| 'aktiviert': {'de': '=', 'en': 'enabled'} | ||
| 'deaktiviert': {'de': '=', 'en': 'disabled'} | ||
| 'Benutzer': {'de': '=', 'en': 'User', 'fr': 'Utilisateur'} | ||
| 'Passwort': {'de': '=', 'en': 'Password'} | ||
| 'Verbunden': {'de': '=', 'en': 'Connected'} | ||
| 'Laufzeit': {'de': '=', 'en': 'Uptime'} | ||
| 'Firmware': {'de': '=', 'en': '=', 'fr': 'Micrologiciel'} | ||
| 'Name': {'de': '=', 'en': '=', 'fr': 'Nom'} | ||
| 'Version': {'de': '=', 'en': '=', 'fr': '='} | ||
|
|
||
| 'Tag': {'de': '=', 'en': 'day', 'fr': 'jour'} | ||
| 'Stunde': {'de': '=', 'en': 'hour', 'fr': 'heure'} | ||
| 'Minute': {'de': '=', 'en': 'minute', 'fr': 'minute'} | ||
| 'Sekunde': {'de': '=', 'en': 'second', 'fr': 'seconde'} | ||
| 'Tage': {'de': '=', 'en': 'days', 'fr': 'jours'} | ||
| 'Stunden': {'de': '=', 'en': 'hours', 'fr': 'heures'} | ||
| 'Minuten': {'de': '=', 'en': 'minutes', 'fr': 'minutes'} | ||
| 'Sekunden': {'de': '=', 'en': 'seconds', 'fr': 'secondes'} | ||
|
|
||
| 'Host': {'de': '=', 'en': '=', 'fr': 'Hôte'} | ||
| 'Port': {'de': '=', 'en': '=', 'fr': '='} | ||
| 'IP': {'de': '=', 'en': '=', 'fr': '='} | ||
| 'Instanz': {'de': '=', 'en': 'Instance', 'fr': '='} | ||
| 'Protokoll': {'de': '=', 'en': 'Protocol', 'fr': 'Protocole'} | ||
| 'Kanal': {'de': '=', 'en': 'Channel', 'fr': 'Canal'} | ||
| 'Knoten': {'de': '=', 'en': 'Node', 'fr': 'noeud'} | ||
| 'Funktion': {'de': '=', 'en': 'Function', 'fr': 'Fonction'} | ||
| 'Browser': {'de': '=', 'en': '=', 'fr': 'Navigateur'} | ||
| 'Adresse': {'de': '=', 'en': 'Address', 'fr': 'Adresse'} | ||
| 'Gerät': {'de': '=', 'en': 'Device', 'fr': 'Appareil'} | ||
| 'Geräte': {'de': '=', 'en': 'Devices', 'fr': 'Appareils'} | ||
|
|
||
| 'Client': {'de': '=', 'en': '=', 'fr': ''} | ||
| 'Clients': {'de': '=', 'en': '=', 'fr': ''} | ||
| 'Status': {'de': '=', 'en': '=', 'fr': ''} | ||
|
|
||
| 'Typ': {'de': '=', 'en': 'Type', 'fr': 'Type'} | ||
| 'Wert': {'de': '=', 'en': 'Value', 'fr': 'Valeur'} | ||
|
|
||
| 'Pfad': {'de': '=', 'en': 'Path', 'fr': ''} | ||
|
|
||
| 'Dienst': {'de': '=', 'en': 'Service', 'fr': ''} | ||
| 'Dienste': {'de': '=', 'en': 'Services', 'fr': ''} | ||
| 'Item': {'de': '=', 'en': '=', 'fr': 'Objet'} | ||
| 'Items': {'de': '=', 'en': '=', 'fr': 'Objets'} | ||
| 'Logik': {'de': '=', 'en': 'Logic', 'fr': ''} | ||
| 'Logiken': {'de': '=', 'en': 'Logics', 'fr': ''} | ||
| 'Scheduler': {'de': '=', 'en': 'Scheduler', 'fr': ''} | ||
| 'Scheduler (plural)': {'de': 'Scheduler', 'en': 'Schedulers', 'fr': ''} | ||
| 'Plugin': {'de': '=', 'en': '=', 'fr': ''} | ||
| 'Plugins': {'de': '=', 'en': '=', 'fr': ''} | ||
| 'Szene': {'de': '=', 'en': 'Scene', 'fr': ''} | ||
| 'Szenen': {'de': '=', 'en': 'Scenes', 'fr': ''} | ||
| 'Thread': {'de': '=', 'en': '=', 'fr': ''} | ||
| 'Threads': {'de': '=', 'en': '=', 'fr': ''} | ||
| 'Logging': {'de': '=', 'en': '=', 'fr': ''} | ||
| 'Urheberrechtshinweise': {'de': '=', 'en': 'Disclosure', 'fr': ''} | ||
|
|
||
| 'Letztes Update': {'de': '=', 'en': 'Last Update', 'fr': ''} | ||
| 'Letzter Change': {'de': '=', 'en': 'Last Change', 'fr': ''} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.