Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20231218-1551 #49

Merged
merged 81 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from 63 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
b7f88b8
Routine Composer update.
UTCGilligan Jun 29, 2023
8c22cf1
Merge branch 'develop' of github.com:UTCWeb/utctiny into develop
UTCGilligan Jun 29, 2023
5230154
Routine composer update.
UTCGilligan Jun 29, 2023
cdbce02
UTCT-1-Adding myself
danielduggin2 Oct 19, 2023
e3ded9a
Merge pull request #22 from danielduggin2/feature/UTCT-1-danielduggin
danielduggin2 Oct 19, 2023
568d24b
UTCT-11: Added Sleeky Frontend and Backend Assets.
danielduggin2 Nov 9, 2023
0fa89ac
Merge pull request #23 from danielduggin2/feature/UTCT-11-sleeky-fron…
UTCGilligan Nov 9, 2023
dda3fac
UTCT-27: Correct Admin link in Sleeky config.
UTCGilligan Nov 10, 2023
9470c55
UTCT-27: Fix Sleeky Backend plugin "hide admin links for non-auth'd u…
UTCGilligan Nov 10, 2023
094ac4d
UTCT-26: Add ReCaptcha site key.
UTCGilligan Nov 11, 2023
1c45829
UTCT-31: Change PHP version in Lando to 8.2.
UTCGilligan Nov 11, 2023
c85be34
Merge branch 'feature/UTCT-26-ReCAPTCHA' into feature/UTCT-31-PHP-82
UTCGilligan Nov 12, 2023
d0fb696
UTCT-31: Remove the ReCaptcha config; that's for other PR.
UTCGilligan Nov 13, 2023
3387b87
UTCT-36: Add Browsersync for frontend dev and update ignores.
UTCGilligan Nov 13, 2023
31bc9b3
UTCT-36: Restore SCSS changed during browsersync test.
UTCGilligan Nov 13, 2023
2699208
UTCT-36: Restore SCSS changed while testing Browsersync.
UTCGilligan Nov 13, 2023
5cd3581
UTCT-36: Restore default config settings.
UTCGilligan Nov 13, 2023
f73906c
UTCT-36: Restore default frontend styles.
UTCGilligan Nov 13, 2023
bf6cf6e
Merge pull request #34 from UTCGilligan/feature/UTCT-31-PHP-82
danielduggin2 Nov 14, 2023
e58cd28
Merge pull request #28 from UTCGilligan/bugfix/UTCT-27-admin-link
UTCGilligan Nov 14, 2023
95ae54d
Merge pull request #37 from UTCGilligan/feature/UTCT-36-frontend-tool…
UTCGilligan Nov 14, 2023
11881a3
UTCT-26: correct frontend ReCaptcha config.
UTCGilligan Nov 14, 2023
aa1549a
Merge pull request #39 from UTCGilligan/develop
UTCGilligan Nov 14, 2023
cda43b8
UTCT-21: Auth Mgr Plus plugin and minor fixes.
UTCGilligan Nov 17, 2023
5499d4a
UTCT-21: Add plugin readme.
UTCGilligan Nov 17, 2023
5c8c192
UTCT-21: Fix bracing around if-clause.
UTCGilligan Nov 17, 2023
60f2b2c
UTCT-21: Routine Composer udpate.
UTCGilligan Nov 17, 2023
988724d
UTCT-21: Make frontend page require login so anonymous users can't ac…
UTCGilligan Nov 17, 2023
568002e
UTCT-21: Require PHPCAS package.
UTCGilligan Nov 20, 2023
1c6d4b5
UTCT-21: Add CAS plugin.
UTCGilligan Nov 20, 2023
595db51
UTCT-21: CAS config and cert bundle.
UTCGilligan Nov 20, 2023
07a4057
UTCT-21: Better cert chain path for testing.
UTCGilligan Nov 20, 2023
2f664a4
UTCT-21: Remove temp cert and use the CA bundle supplied via Composer.
UTCGilligan Nov 21, 2023
94a126a
UTCT-21: Add SAML plugin, config and deps. Remove CAS plugin.
UTCGilligan Dec 7, 2023
06ff4a1
UTCT-38: Optimized SCSS imports and recompiled styles
danielduggin2 Dec 8, 2023
ff177e5
Merge pull request #41 from danielduggin2/bootstrap-import
UTCGilligan Dec 8, 2023
871ba10
Merge branch 'develop' of github.com:UTCWeb/utctiny into feature/UTCT…
UTCGilligan Dec 8, 2023
0e75d7d
UTCT-21: SAML IDP config.
UTCGilligan Dec 9, 2023
be937f6
UTCT-21: Apache conf for SAML authentication in hosted environments.
UTCGilligan Dec 9, 2023
fee31b3
UTCT-21: HTTPD config for test hosted environment.
UTCGilligan Dec 9, 2023
43903a8
UTCT-38: Fix Bootstrap imports; needed variables-dark.
UTCGilligan Dec 11, 2023
b2e98b3
UTCT-21: Turn off auth on public home page.
UTCGilligan Dec 11, 2023
870cae1
UTCT-21: Fix paths for SAML httpd conf includes.
UTCGilligan Dec 11, 2023
affcad7
UTCT-21: Better comment in conf file, enable auth on index.
UTCGilligan Dec 11, 2023
c5b1940
Merge pull request #42 from UTCGilligan/feature/UTCT-38-optimize-SCSS…
UTCGilligan Dec 11, 2023
8cd5fa0
Merge pull request #40 from UTCGilligan/feature/UTCT-21-Roles-Auth
UTCGilligan Dec 11, 2023
c80946d
UTCT-24: Power C frontend logo; frontend text config.
UTCGilligan Dec 13, 2023
8976905
UTCT-24: Darkend background of frontend.
UTCGilligan Dec 13, 2023
c891e82
UTCT-24: Additional front and backend styling and text.
UTCGilligan Dec 14, 2023
8a1c6af
UTCT-24: Favicon and additional frontend config.
UTCGilligan Dec 15, 2023
0c3c01a
UTCT-24: Update svg path for frontend gulpfile.
UTCGilligan Dec 15, 2023
b706032
UTCT-24: Update Favicon with a 48x48 correct file.
UTCGilligan Dec 15, 2023
9108af3
UTCT-24: Additional favicon frontend config.
UTCGilligan Dec 15, 2023
e78644d
UTCT-24: Restore frontend header, look for better favicon scheme.
UTCGilligan Dec 15, 2023
cf1b7ea
UTCT-24: Fix a header meta.
UTCGilligan Dec 18, 2023
61533c7
UTCT-24: Fix gap below mobile menu.
UTCGilligan Dec 18, 2023
e9c2c17
UTCT-24: Swap in Raleway for Roboto font.
UTCGilligan Dec 18, 2023
0b8b5d8
UTCT-24: Fix theme-color meta for mobile background.
UTCGilligan Dec 18, 2023
af452d1
UTCT-24: More favicon color specs.
UTCGilligan Dec 18, 2023
198c840
UTCT-24: Make mobile backend menu color same as header/logo.
UTCGilligan Dec 18, 2023
12c2af3
UTCT-24: Replace logo/wordmark with revised.
UTCGilligan Dec 18, 2023
ac0bf1f
UTCT-24: Fix padding around backend logo/wordmark area.
UTCGilligan Dec 18, 2023
554e332
Merge pull request #44 from UTCGilligan/feature/UTCT-24-UTC-logos
UTCGilligan Dec 18, 2023
cac76aa
UTCT-24: Fix alert close button styling.
UTCGilligan Dec 19, 2023
b7f9fb7
Merge branch 'develop' of github.com:UTCWeb/utctiny into feature/UTCT…
UTCGilligan Dec 19, 2023
726a745
Merge pull request #50 from UTCGilligan/feature/UTCT-24-UTC-logos
UTCGilligan Dec 19, 2023
89487cd
UTCT-24: Tweak the img.logo padding.
UTCGilligan Dec 19, 2023
33c6a08
Merge branch 'develop' of github.com:UTCWeb/utctiny into feature/UTCT…
UTCGilligan Dec 19, 2023
901f0ef
Merge pull request #51 from UTCGilligan/feature/UTCT-24-UTC-logos
UTCGilligan Dec 19, 2023
1966646
UTCT-24: Additional favicon flavors.
UTCGilligan Dec 19, 2023
bdd2173
Merge branch 'develop' of github.com:UTCWeb/utctiny into feature/UTCT…
UTCGilligan Dec 19, 2023
a2e612c
Merge pull request #52 from UTCGilligan/feature/UTCT-24-UTC-logos
UTCGilligan Dec 19, 2023
ae7a488
UTCT-24: Fix path of new favicons.
UTCGilligan Dec 19, 2023
cc8187e
Merge branch 'develop' of github.com:UTCWeb/utctiny into feature/UTCT…
UTCGilligan Dec 19, 2023
5d23a23
Merge pull request #53 from UTCGilligan/feature/UTCT-24-UTC-logos
UTCGilligan Dec 19, 2023
81f7db6
UTCT-24: Even more favicon overrides.
UTCGilligan Dec 19, 2023
4c23fef
Merge branch 'develop' of github.com:UTCWeb/utctiny into feature/UTCT…
UTCGilligan Dec 19, 2023
953fa6b
UTCT-24: More favicon changes.
UTCGilligan Dec 19, 2023
be53aec
Merge pull request #54 from UTCGilligan/feature/UTCT-24-UTC-logos
UTCGilligan Dec 19, 2023
d133769
UTCT-24: Remove JS favicon and viewport overrides. Maddening.
UTCGilligan Dec 19, 2023
d334a48
Merge pull request #55 from UTCGilligan/feature/UTCT-24-UTC-logos
UTCGilligan Dec 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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