|
|
14654bac11
|
Merge commit '0e54dfce6c9bdc05a1ceae38294797e3ba12100c' into rel_1.x
# Conflicts:
# docs/daux/changelog/010_Changelog.md
# docs/daux/installation/020_Neuinstallation/005_Vorbereitung.md
# docs/daux/installation/060_Deinstallation/050_Datenbank_bereinigen.md
|
2019-07-29 08:51:36 +02:00 |
|
|
|
125602a2b5
|
Merge remote-tracking branch 'remotes/origin/dev_1.x' into rel_1.x
|
2019-07-29 08:23:54 +02:00 |
|
|
|
a42121b4bc
|
move backup codes to separate db table, clear backup code if used or new codes are generated
|
2019-07-28 23:00:30 +02:00 |
|
|
|
28ad88b734
|
add backup code generation
|
2019-07-27 00:02:31 +02:00 |
|
|
|
895b122b13
|
Merge commit 'dc434f4d423f861798ea9b91b12c8d10191f16ae' into dev_1.x
# Conflicts:
# docs/daux/changelog/010_Changelog.md
# docs/daux/installation/010_Anforderungen/050_Vorbereitungen.md
# docs/daux/installation/020_Neuinstallation/005_Vorbereitung.md
# docs/daux/installation/020_Neuinstallation/080_Lizenz_eintragen.md
# docs/daux/installation/020_Neuinstallation/090_Cronjob_einrichten.md
# docs/daux/installation/030_Update/050_Shopanpassungen_installieren.md
# docs/daux/installation/030_Update/070_Lizenzschluessel_aktualisieren.md
# docs/daux/installation/040_Installationspruefung.md
# docs/daux/installation/050_Schnellstart.md
|
2019-02-19 09:20:20 +01:00 |
|
|
|
20a4e0deeb
|
add module specific contents to documentation
|
2019-02-19 09:16:16 +01:00 |
|
|
|
ed9082e9df
|
Merge commit 'eb157813e53e87a698529363722f4bfc461d3399' as 'docs/daux'
|
2019-02-19 09:10:12 +01:00 |
|
|
|
a350c1e012
|
remove d3 satis instructions, update documentation
|
2018-12-21 11:17:14 +01:00 |
|
|
|
bebb6efa31
|
remove versionselector from documentation
|
2018-10-24 15:52:55 +02:00 |
|
|
|
75b5561f1b
|
add documentation
|
2018-10-24 15:35:54 +02:00 |
|
