Merge branch 'develop' into api-licenses

.all-contributorsrc

@@ -2362,6 +2362,15 @@
  ]
  },
  {
+ "login": "Delta5",
+ "name": "Evan Taylor",
+ "avatar_url": "https://avatars.githubusercontent.com/u/1975640?v=4",
+ "profile": "https://github.com/Delta5",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
  "login": "PetriAsi",
  "name": "Petri Asikainen",
  "avatar_url": "https://avatars.githubusercontent.com/u/8735148?v=4",
@@ -2378,6 +2387,15 @@
  "contributions": [
  "code"
  ]
+ },
+ {
+ "login": "vapier",
+ "name": "Mike Frysinger",
+ "avatar_url": "https://avatars.githubusercontent.com/u/176950?v=4",
+ "profile": "https://wh0rd.org/",
+ "contributions": [
+ "code"
+ ]
  }
  ]
 }

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,129 @@
+name: Bug Report
+description: Create a report to help us improve
+body:
+ - type: checkboxes
+ attributes:
+ label: Debug mode
+ description: Please confirm you have done the following before posting your bug report
+ options:
+ - label: I have enabled debug mode
+ required: true
+ - label: I have read [checked the Common Issues page](https://snipe-it.readme.io/docs/common-issues)
+ required: true
+ - type: textarea
+ attributes:
+ label: Describe the bug
+ description: A clear and concise description of what the bug is.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Reproduction steps
+ description: Steps to reproduce the behavior.
+ value: |
+ 1.
+ 2.
+ 3.
+ ...
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Expected behavior
+ description: A clear and concise description of what you expected to happen.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Screenshots
+ description: 'If applicable, add screenshots to help explain your problem.'
+ - type: markdown
+ attributes:
+ value: "### Server"
+ - type: input
+ attributes:
+ label: Snipe-IT Version
+ validations:
+ required: true
+ - type: input
+ id: server_operatingSystem
+ attributes:
+ label: Operating System
+ description: 'e.g. Ubuntu, Windows'
+ validations:
+ required: true
+ - type: input
+ attributes:
+ label: Web Server
+ description: 'e.g. Apache, IIS'
+ validations:
+ required: true
+ - type: input
+ attributes:
+ label: PHP Version
+ validations:
+ required: true
+ - type: markdown
+ attributes:
+ value: "### Desktop"
+ - type: input
+ id: desktop_operatingSystem
+ attributes:
+ label: Operating System
+ description: 'e.g. Ubuntu, Windows'
+ - type: input
+ id: desktop_browser
+ attributes:
+ label: Browser
+ description: 'e.g. Google Chrome, Safari'
+ - type: input
+ id: desktop_version
+ attributes:
+ label: Version
+ description: 'e.g. 93'
+ - type: markdown
+ attributes:
+ value: "### Mobile"
+ - type: input
+ attributes:
+ label: Device
+ description: 'e.g. iPhone 6, Pixel 4a'
+ - type: input
+ id: mobile_operatingSystem
+ attributes:
+ label: Operating System
+ description: 'e.g. iOS 8.1, Android 9'
+ - type: input
+ id: mobile_browser
+ attributes:
+ label: Browser
+ description: 'e.g. Google Chrome, Safari'
+ - type: input
+ id: mobile_version
+ attributes:
+ label: Version
+ description: 'e.g. 93'
+ - type: textarea
+ attributes:
+ label: Error messages
+ description: |
+ WITH DEBUG TURNED ON, if you're getting an error in your browser, include that error
+ If a stacktrace is provided in the error, include that too.
+ Any errors that appear in your browser's error console.
+ Confirm whether the error is reproducible on the demo: https://snipeitapp.com/demo.
+ Include any additional information you can find in `storage/logs` and your webserver's logs.
+ Include the output from `php -m` (this should display what modules you have enabled.)
+ render: shell
+ - type: textarea
+ attributes:
+ label: Additional context
+ description: |
+ Is this a fresh install or an upgrade?
+ What OS and web server you're running Snipe-IT on
+ What method you used to install Snipe-IT (install.sh, manual installation, docker, etc)
+ Include what you've done so far in the installation, and if you got any error messages along the way.
+ Indicate whether or not you've manually edited any data directly in the database
+ Add any other context about the problem here.
+ - type: markdown
+ attributes:
+ value: Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,42 @@
+name: Feature Request
+description: Suggest an idea for this project
+body:
+ - type: input
+ attributes:
+ label: Snipe-IT Version
+ validations:
+ required: true
+ - type: input
+ id: server_operatingSystem
+ attributes:
+ label: Operating System
+ description: 'e.g. Ubuntu, Windows'
+ validations:
+ required: true
+ - type: input
+ attributes:
+ label: Web Server
+ description: 'e.g. Apache, IIS'
+ validations:
+ required: true
+ - type: input
+ attributes:
+ label: PHP Version
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Is your feature request related to a problem? Please describe. A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Describe the solution you'd like A clear and concise description of what you want to happen.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Describe alternatives you've considered A clear and concise description of any alternative solutions or features you've considered.
+ - type: textarea
+ attributes:
+ label: Additional context Add any other context or screenshots about the feature request here.

.gitignore

@@ -63,3 +63,5 @@ _ide_helper.php
 .phpstorm.meta.php
 _ide_helper_models.php
 /.phplint-cache
+storage/ldap_client_tls.cert
+storage/ldap_client_tls.key

.nvmrc

@@ -1 +1 @@
-v10.15.1
+v12.22.1

Dockerfile

@@ -1,5 +1,5 @@
-FROM ubuntu:bionic
-LABEL maintainer Brady Wetherington <uberbrady@gmail.com>
+FROM ubuntu:focal
+LABEL maintainer Brady Wetherington <bwetherington@grokability.com>
 
 # No need to add `apt-get clean` here, reference:
 # - https://github.com/snipe/snipe-it/pull/9201
@@ -14,15 +14,15 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
 apt-utils \
 apache2 \
 apache2-bin \
-libapache2-mod-php7.2 \
-php7.2-curl \
-php7.2-ldap \
-php7.2-mysql \
-php7.2-gd \
-php7.2-xml \
-php7.2-mbstring \
-php7.2-zip \
-php7.2-bcmath \
+libapache2-mod-php7.4 \
+php7.4-curl \
+php7.4-ldap \
+php7.4-mysql \
+php7.4-gd \
+php7.4-xml \
+php7.4-mbstring \
+php7.4-zip \
+php7.4-bcmath \
 patch \
 curl \
 wget \
@@ -38,7 +38,7 @@ autoconf \
 libc-dev \
 pkg-config \
 libmcrypt-dev \
-php7.2-dev \
+php7.4-dev \
 ca-certificates \
 unzip \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -47,16 +47,16 @@ unzip \
 RUN curl -L -O https://github.com/pear/pearweb_phars/raw/master/go-pear.phar
 RUN php go-pear.phar
 
-RUN pecl install mcrypt-1.0.2
+RUN pecl install mcrypt-1.0.3
 
-RUN bash -c "echo extension=/usr/lib/php/20170718/mcrypt.so > /etc/php/7.2/mods-available/mcrypt.ini"
+RUN bash -c "echo extension=/usr/lib/php/20190902/mcrypt.so > /etc/php/7.4/mods-available/mcrypt.ini"
 
 RUN phpenmod mcrypt
 RUN phpenmod gd
 RUN phpenmod bcmath
 
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.2/apache2/php.ini
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.2/cli/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.4/apache2/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.4/cli/php.ini
 
 RUN useradd -m --uid 1000 --gid 50 docker
 

Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3
 # Apache + PHP
 RUN apk add --no-cache \
  apache2 \
@@ -25,6 +25,8 @@ RUN apk add --no-cache \
  php7-session \
  php7-dom \
  php7-xmlwriter \
+ php7-xmlreader \
+ php7-sodium \
  curl \
  wget \
  vim \

Procfile

@@ -0,0 +1 @@
+web: php heroku/startup.php && heroku-php-apache2 public/