Merge pull request #35 from AppertaFoundation/fix/loginscreen_changes

added image assets

.github/workflows/merge-conflict.yml

@@ -0,0 +1,16 @@
+name: "Notify when merge conflict arises"
+on:
+  push:
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: check if prs are dirty
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: "PR: merge conflicts have arisen"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts, please resolve those."

.github/workflows/stale.yml

@@ -0,0 +1,25 @@
+name: Close stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+        stale-issue-label: 'stale'
+        stale-pr-message: 'This pr is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 10 days.'
+        stale-pr-label: 'stale'
+        close-issue-message: 'This issue was closed because it has been stalled for 5 days with no activity.'
+        close-pr-message: 'This pr was closed because it has been stalled for 10 days with no activity.'
+        days-before-issue-stale: 30
+        days-before-pr-stale: 30
+        days-before-issue-close: 5
+        days-before-pr-close: 10

.travis.yml

@@ -5,7 +5,7 @@ dist: bionic
 before_script:
     - export TZ=Europe/London
     - date
-    - sudo ntpdate ntp.ubuntu.com
+    # - sudo ntpdate ntp.ubuntu.com
     - '[ ! -z "$DOCKER_PASS" ] && { echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin; } || :'
 
 services:

composer.json

@@ -3,6 +3,7 @@
   "license": "AGPL-3.0-only",
   "description": "Electronic Patient Record system for use in Ophthalmology clinics",
   "require": {
+    "php": "^7.4",
     "yiisoft/yii": "1.1.22",
     "rlanvin/php-rrule": "2.2.0",
     "endroid/qr-code": "^1.7",