Skip to content

Commit

Permalink
Merge pull request #49 from UTCWeb/develop
Browse files Browse the repository at this point in the history
20231218-1551
  • Loading branch information
UTCGilligan authored Dec 19, 2023
2 parents ba294e0 + d334a48 commit d9830f5
Show file tree
Hide file tree
Showing 74 changed files with 17,032 additions and 170 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,18 @@
.htaccess
includes/vendor/*
!includes/vendor/.gitkeep

# environment-specific config
user/config.php

# frontend tooling
frontend/node_modules
frontend/package-lock.json

# backend tooling
user/plugins/sleeky-backend/node_modules
user/plugins/sleeky-backend/package-lock.json

# SQL
*.sql
*.sql.gz
Expand Down
7 changes: 6 additions & 1 deletion .lando.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
name: utctiny
recipe: lamp
config:
php: '8.1'
php: '8.2'
webroot: .
database: mariadb
xdebug: false
services:
appserver:
config:
server: config/httpd.conf
vhosts: config/default-ssl.conf
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# utctiny

URL Shortener with [YOURLS](https://yourls.org).

### Contributing
Expand All @@ -11,5 +12,7 @@ URL Shortener with [YOURLS](https://yourls.org).
- Create a new Pull Request

### Collaborators

- [UTCGilligan](https://github.com/UTCGilligan)
- [MajorS](https://github.com/majorschwartz)
- [DanielD](https://github.com/danielduggin2)
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"source": "https://github.com/YOURLS/YOURLS"
},
"require": {
"php": ">=7.4",
"php": ">=8.1",
"ext-dom": "*",
"ext-filter": "*",
"ext-hash": "*",
Expand All @@ -39,7 +39,7 @@
"config": {
"vendor-dir": "includes/vendor",
"platform": {
"php": "7.4.0"
"php": "8.1"
}
},
"autoload": {
Expand Down
Loading

0 comments on commit d9830f5

Please sign in to comment.