Skip to content

Commit

Permalink
Merge pull request #17 from UTCWeb/develop
Browse files Browse the repository at this point in the history
20230509-1149
  • Loading branch information
UTCGilligan authored May 9, 2023
2 parents 1113daf + c0c7a97 commit 0668e0d
Show file tree
Hide file tree
Showing 243 changed files with 190 additions and 53,896 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: PHP Composer

on:
push:
branches: [ "develop" ]
pull_request:
branches: [ "develop" ]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Validate composer.json and composer.lock
run: composer validate --strict

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Install dependencies
run: composer install --prefer-dist --no-progress

# Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
# Docs: https://getcomposer.org/doc/articles/scripts.md

# - name: Run test suite
# run: composer run-script test
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
.DS_Store
.htaccess
includes/vendor/*
!includes/vendor/.gitkeep
user/config.php

# SQL
*.sql
*.sql.gz
*.tar.gz
pvirtualmin/

#IDE
.idea/
12 changes: 12 additions & 0 deletions .htaccess-example
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@


# BEGIN YOURLS
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteBase /
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^.*$ /yourls-loader.php [L]
</IfModule>
# END YOURLS

7 changes: 7 additions & 0 deletions .lando.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: utctiny
recipe: lamp
config:
php: '8.1'
webroot: .
database: mariadb
xdebug: false
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# utctiny
URL Shortener with [YOURLS](https://yourls.org).

### Contributing

- Fork it (https://github.com/UTCWeb/utctiny/fork)
- Clone it (git clone https://github.com/utctiny/utctiny)
- Create your feature branch (git checkout -b feature/UTCT-1-your-branch-name)
- Commit your changes (git commit -m 'UTCT-1-Description of a commit')
- Push to the branch (git push origin feature/UTCT-1-your-branch-name)
- Create a new Pull Request

### Collaborators
- [UTCGilligan](https://github.com/UTCGilligan)
- [MajorS](https://github.com/majorschwartz)
100 changes: 0 additions & 100 deletions includes/vendor/aura/sql/README.md

This file was deleted.

Loading

0 comments on commit 0668e0d

Please sign in to comment.