Skip to content

Feature chunk: Enhanced Readme, Contribution Guide, Adapable title, New ToS, Easier config/settings loading, Fix bash script

username-removed-723805 requested to merge pixelbrackets/Jirafeau:20170118_feature-chunk---readme-contribution-title-tos-config-settings-license-bash-script into master

Hey @mojo42

Altough I know that it is no good practice to add lots of commits to one merge request I thought this might be easier to merge/pull/rebase in this case.

This merge request includes:

  • Bash Script: Enhance help, add version to script (to know which version of Jirafeau generated the script and if an update might be necessary), return link to web view as well
  • Bash Script Generation: Fix content type
  • Contribution: Rename Contribution Guide and add instructions
  • License: Rename license file
  • ToS: Enable admin to simply overwrite the ToS, without changing existing source code
    • Note: This is a breaking change, since admins were instructed until now, to change the source code of the tos.php file → a git update will overwrite these changes
  • Readme: Revise headlines, add features, revise update instructions, add screenshot, add link to license, add link to contribution guide, add instructions how to obey to AGPL
  • Install script: Remove redundant code, simplifiy generation of local config
  • Config: Reduce includes (only load settings.php, which will load all necessary configuration) and merge original/default and local config settings
  • Title: Enable overwriting the title
  • Footer: Pretty up the links

Please send me a note if I should change something in this merge request. 😃

Merge request reports