Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Herbert Reiter
|
562d3662da | ||
|
Herbert Reiter
|
c97656a5d0 | ||
|
Herbert Reiter
|
1b5f7918ce | ||
|
Herbert Reiter
|
49e575e462 | ||
|
Herbert Reiter
|
ddc5cea6bd | ||
|
Herbert Reiter
|
52ecbeb7d7 | ||
|
Herbert Reiter
|
d021267fcd | ||
|
Herbert Reiter
|
6cb3e218c4 | ||
|
Herbert Reiter
|
7b3aa69732 | ||
|
Herbert Reiter
|
9f2c84d673 | ||
|
Herbert Reiter
|
0ba9bfda35 | ||
|
Herbert Reiter
|
dcbfc23070 | ||
|
Herbert Reiter
|
42d01a9abe |
@@ -0,0 +1,4 @@
|
||||
*.sh text eol=lf
|
||||
|
||||
# Files with CRLF line endings
|
||||
gradlew.bat text eol=crlf
|
||||
@@ -1,5 +1,23 @@
|
||||
# Changelog
|
||||
|
||||
## 3.9.3.0 (versionCode 46, 2025-01-05)
|
||||
|
||||
- Update to moasdawiki-server 3.9.3
|
||||
- Upgrade to Gradle 8.12
|
||||
- Upgrade library dependencies
|
||||
- Update copyright year
|
||||
|
||||
## 3.9.1.1 (versionCode 45, 2024-11-02)
|
||||
|
||||
- Update App sync description
|
||||
- Upgrade library dependencies
|
||||
|
||||
## 3.9.1.0 (versionCode 44, 2024-10-04)
|
||||
|
||||
- Update to moasdawiki-server 3.9.1
|
||||
- Upgrade to Gradle 8.10.2
|
||||
- Upgrade library dependencies
|
||||
|
||||
## 3.7.1.1 (versionCode 43, 2024-05-10)
|
||||
|
||||
- Upgrade to Gradle 8.7
|
||||
|
||||
@@ -12,6 +12,7 @@ For MoasdaWiki documentation see https://moasdawiki.net/.
|
||||
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
|
||||
alt="Get it on F-Droid"
|
||||
height="80">](https://f-droid.org/packages/net.moasdawiki.app)
|
||||
or [Google Play](https://play.google.com/store/apps/details?id=net.moasdawiki.app)
|
||||
|
||||
## Features
|
||||
|
||||
@@ -33,15 +34,15 @@ For MoasdaWiki documentation see https://moasdawiki.net/.
|
||||
|
||||
1. Download MoasdaWiki Server from https://gitlab.com/moasdawiki/moasdawiki-server.
|
||||
2. Set up a MoasdaWiki Server instance in your LAN.
|
||||
3. Install the MoasdaWiki App.
|
||||
4. In the app you can see a hint that it has to be configured first. Press on that hint.
|
||||
5. Press on "Host name" and enter the host name or IP address of the server instance, e.g. `192.168.1.101`. Press OK.
|
||||
6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
|
||||
7. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
|
||||
8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
|
||||
9. Back in the app press the back button (←) on the upper left corner to get back to the main dialog.
|
||||
Now you can see a hint that the app has to be synchronized. Press on that hint.
|
||||
10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
|
||||
3. Enable LAN access to the server: Edit the repository file `config.txt` and change the setting `authentication.onlylocalhost = false`. Restart the server afterwards.
|
||||
4. Install the MoasdaWiki App.
|
||||
5. In the app you can see a hint that it has to be configured first. Press on that hint.
|
||||
6. Press on "Host name" and enter the host name or IP address of the server instance, e.g. `192.168.1.101`. Press OK.
|
||||
7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
|
||||
8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
|
||||
9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
|
||||
10. Back in the app press the back button (←) on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
|
||||
11. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
|
||||
|
||||
## Support
|
||||
|
||||
|
||||
+4
-4
@@ -7,8 +7,8 @@ android {
|
||||
applicationId "net.moasdawiki.app"
|
||||
minSdk 28 // 28 = Android 9
|
||||
targetSdk 34 // should be same as compileSdk
|
||||
versionCode 43
|
||||
versionName "3.7.1.1"
|
||||
versionCode 46
|
||||
versionName "3.9.3.0"
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_11
|
||||
@@ -27,12 +27,12 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api 'net.moasdawiki:moasdawiki-server:3.7.1'
|
||||
api 'net.moasdawiki:moasdawiki-server:3.9.3'
|
||||
api ('androidx.appcompat:appcompat:1.6.1') {
|
||||
exclude group: 'org.jetbrains', module: 'annotations'
|
||||
}
|
||||
api ('androidx.preference:preference:1.2.1') {
|
||||
exclude group: 'org.jetbrains', module: 'annotations'
|
||||
}
|
||||
compileOnly 'org.jetbrains:annotations:24.1.0'
|
||||
compileOnly 'org.jetbrains:annotations:26.0.1'
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* MoasdaWiki App
|
||||
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net)
|
||||
* Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 3 as published
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ buildscript {
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.4.0'
|
||||
classpath 'com.android.tools.build:gradle:8.7.3'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
- Auf moasdawiki-server 3.9.1 aktualisieren
|
||||
- Gradle-Upgrade auf 8.10.2
|
||||
- Bibliotheks-Abhängigkeiten aktualisieren
|
||||
@@ -0,0 +1,2 @@
|
||||
- Anleitung für App-Synchronisierung ergänzen
|
||||
- Bibliotheks-Abhängigkeiten aktualisieren
|
||||
@@ -0,0 +1,4 @@
|
||||
- Auf moasdawiki-server 3.9.3 aktualisieren
|
||||
- Gradle-Upgrade auf 8.12
|
||||
- Bibliotheks-Abhängigkeiten aktualisieren
|
||||
- Copyright-Jahr aktualisieren
|
||||
@@ -11,13 +11,14 @@ MoasdaWiki App ist eine datenschutzfreundliche Oberfläche der MoasdaWiki-Server
|
||||
|
||||
1. Lade MoasdaWiki-Server von https://moasdawiki.net/ herunter.
|
||||
2. Setze eine MoasdaWiki-Server-Instance in deinem LAN auf.
|
||||
3. Installiere die MoasdaWiki-App.
|
||||
4. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis.
|
||||
5. Drücke auf "Hostname" und gib den Hostnamen oder IP-Adresse der Server-Instanz ein, z.B. 192.168.1.101. Drücke OK.
|
||||
6. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
|
||||
7. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
|
||||
8. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
|
||||
9. Zurück in der App drücke den Zurück-Button in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis.
|
||||
10. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
|
||||
3. Erlaube LAN-Zugriff auf den Server: Editiere die Datei config.txt im Repository und ändere die Einstellung authentication.onlylocalhost = false. Anschließend den Server neu starten.
|
||||
4. Installiere die MoasdaWiki-App.
|
||||
5. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis.
|
||||
6. Drücke auf "Hostname" und gib den Hostnamen oder IP-Adresse der Server-Instanz ein, z.B. 192.168.1.101. Drücke OK.
|
||||
7. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
|
||||
8. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
|
||||
9. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
|
||||
10. Zurück in der App drücke den Zurück-Button in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis.
|
||||
11. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
|
||||
|
||||
Hinweis: Der Wikiinhalt kann nicht in der App modifiziert werden, da es keinen Spaß macht Wiki-Syntax auf dem Mobilgerät zu tippen. Änderungen müssen über den MoasdaWiki-Server erfolgen.
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
- Update to moasdawiki-server 3.9.1
|
||||
- Upgrade to Gradle 8.10.2
|
||||
- Upgrade library dependencies
|
||||
@@ -0,0 +1,2 @@
|
||||
- Update App sync description
|
||||
- Upgrade library dependencies
|
||||
@@ -0,0 +1,4 @@
|
||||
- Update to moasdawiki-server 3.9.3
|
||||
- Upgrade to Gradle 8.12
|
||||
- Upgrade library dependencies
|
||||
- Update copyright year
|
||||
@@ -12,13 +12,14 @@ knowledge management tool. It mirrors the Wiki content on your mobile device.
|
||||
|
||||
1. Download MoasdaWiki Server from https://moasdawiki.net/.
|
||||
2. Set up a MoasdaWiki Server instance in your LAN.
|
||||
3. Install the MoasdaWiki App.
|
||||
4. In the app you can see a hint that it has to be configured first. Press on that hint.
|
||||
5. Press on "Host name" and enter the host name or IP address of the server instance, e.g. 192.168.1.101. Press OK.
|
||||
6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
|
||||
7. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
|
||||
8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
|
||||
9. Back in the app press the back button on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
|
||||
10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
|
||||
3. Enable LAN access to the server: Edit the repository file config.txt and change the setting authentication.onlylocalhost = false. Restart the server afterwards.
|
||||
4. Install the MoasdaWiki App.
|
||||
5. In the app you can see a hint that it has to be configured first. Press on that hint.
|
||||
6. Press on "Host name" and enter the host name or IP address of the server instance, e.g. 192.168.1.101. Press OK.
|
||||
7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
|
||||
8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
|
||||
9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
|
||||
10. Back in the app press the back button on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
|
||||
11. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
|
||||
|
||||
Hint: Content cannot be modified within the app as it is no fun to type Wiki syntax on the mobile device, changes have to be done via the MoasdaWiki Server.
|
||||
|
||||
Vendored
BIN
Binary file not shown.
+2
-2
@@ -1,7 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@@ -84,7 +86,8 @@ done
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
Vendored
+12
-10
@@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
|
||||
Reference in New Issue
Block a user