Skip to content
Verified Commit 094a027f authored by Helmo's avatar Helmo
Browse files

Squashed commit of the following: 6501-php-ssh-cron branch

commit 59ac3299
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Thu Apr 4 15:48:59 2024 +0200

    Remove unneeded tpl initiation in shelluser_jailkit_plugin.inc.php

commit 32e546f7
Merge: e7cab975 bf791d47
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Wed Apr 3 16:11:32 2024 +0200

    Merge remote-tracking branch 'helmo/6501-php-ssh-cron' into 6501-php-ssh-cron

commit bf791d47
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Apr 3 16:01:21 2024 +0200

    Move /etc/alternatives/php code to update_jailkit_chroot()

commit f1627daf
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Apr 3 15:54:28 2024 +0200

    Make sure we have a clean $options for each iteration

commit e7cab975
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Mar 31 15:31:59 2024 +0200

    Use the more appropriate is_array instead of !empty

commit 2f0e632a
Merge: 62afa4f3 b2e68414
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sat Mar 30 11:02:53 2024 +0100

    Resolve merge conflict

commit 62afa4f3
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Mar 13 16:25:11 2024 +0100

    Match on files, not dirs

commit c476308e
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Mar 10 16:43:32 2024 +0100

    Use  instead of

commit 1ac5be95
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Mar 10 15:06:35 2024 +0100

    Source .bashrc from the ~/.profile file

commit 5ceb256a
Merge: 32bbf9a3 e318f995
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Mar 10 12:13:58 2024 +0100

    Merge branch 'develop' into 6501-php-ssh-cron

commit 32bbf9a3
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Mar 6 15:52:57 2024 +0100

    Indents

commit 559320ed
Merge: d2b8a4ea 0d1297b6
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Mar 4 16:25:38 2024 +0100

    Resolved merge conflict

commit d2b8a4ea
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Mar 4 15:53:22 2024 +0100

    Update of branch:
    - Use alternatives for jailed shell accounts in Debian/Ubuntu systems instead of an alias
    - Made the file /etc/bash.bashrc obsolete
    - command_format updated so that the domain placeholder can be used for wget commands
    - Introduction of the .bashrc.d directory for shell users so that they can extend their Bash environment more flexibly and easily via resource files
    - Minor refactoring and other changes

commit b78a8eb5
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Feb 11 00:15:52 2024 +0100

    Revert div

commit 4f6eb2c2
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Feb 11 00:13:37 2024 +0100

    Transform the domain placeholder in command_format function

commit 50266744
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Thu Feb 8 00:17:14 2024 +0100

    Load tpl in _setup_jailkit_chroot
    Check prior creating symlinks in SFTP home directory if the symlinks already exists

commit 242f3c94
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 28 21:24:16 2024 +0100

    Update reloadCronPlaceholders()

commit 4058fa9c
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 28 16:50:20 2024 +0100

    Fix issue #6633
    Jailkit update on every cron change
    Patch by WHO

commit 3f1f82ce
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Tue Jan 23 16:32:01 2024 +0100

    Load and display a hint for the user if no web_domain has been created or assigned by the user

commit 8d58b896
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Jan 22 22:21:10 2024 +0100

    Select and load placeholder data of the first existing domain

commit fd9b8930
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Jan 22 15:17:18 2024 +0100

    Don't check permissions of the web when a user wants to create a new cronjob

commit 3315b7dc
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Jan 22 13:35:15 2024 +0100

    Removed unnecessary GET

commit 3d74e935
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Jan 22 13:32:58 2024 +0100

    Fixed jquery controlled chroot/full placeholders

commit cb23b734
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 21 16:51:28 2024 +0100

    Update the placeholders when changing domains
    However, detection of cron_type needs some work

commit 3ac0d7c0
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 14 12:09:37 2024 +0100

    Backported the patches:
    [PATCH] Add placeholder values, update command_hint_txt to match
    [PATCH] Handle chrooted sites

commit 86f21484
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 14 12:07:32 2024 +0100

    remove debug line

commit 8543fd1c
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sat Jan 13 11:45:27 2024 +0100

    clean up of php-ssh-cron branch

commit 1f1350c5
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Fri Dec 8 12:23:50 2023 +0100

    Clean up

commit eec29823
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Wed Nov 29 13:35:32 2023 +0100

    Revert changes

commit fc96c644
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Nov 19 20:47:05 2023 +0100

    Add current PHP enhancements (WiP)
parent de03ac3a
Loading
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment