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

Cmpsr #438

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Cmpsr #438

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a0c5fa7
sort and remove dups
bbannon Nov 22, 2023
8d56a56
add config
bbannon Nov 22, 2023
e6ee6aa
Merge branch 'cmpsr' of https://github.com/bbannon/webcalendar into c…
bbannon Nov 22, 2023
d0490be
composer.lock wouldn't commit
bbannon Nov 22, 2023
402773d
Merge branch 'craigk5n:master' into cmpsr
bbannon Nov 25, 2023
550aac6
Merge branch 'craigk5n:master' into cmpsr
bbannon Nov 27, 2023
51ceb70
Merge branch 'craigk5n:master' into cmpsr
bbannon Nov 28, 2023
3bea88f
Merge branch 'craigk5n:master' into cmpsr
bbannon Nov 29, 2023
89a0ac4
Merge branch 'craigk5n:master' into cmpsr
bbannon Jan 3, 2024
edb5571
Merge branch 'master' into cmpsr
bbannon Jan 24, 2024
61f22e1
Merge branch 'craigk5n:master' into cmpsr
bbannon Feb 2, 2024
b1ff8a6
Merge branch 'craigk5n:master' into cmpsr
bbannon Apr 14, 2024
d0c839d
Merge branch 'craigk5n:master' into cmpsr
bbannon May 17, 2024
12da340
Merge branch 'craigk5n:master' into cmpsr
bbannon Jun 25, 2024
b1b024f
Merge branch 'craigk5n:master' into cmpsr
bbannon Jul 29, 2024
8f04139
Merge branch 'craigk5n:master' into cmpsr
bbannon Jul 31, 2024
f3aa923
Merge branch 'craigk5n:master' into cmpsr
bbannon Aug 31, 2024
aef0060
Merge branch 'craigk5n:master' into cmpsr
bbannon Aug 31, 2024
d50f136
Merge branch 'craigk5n:master' into cmpsr
bbannon Aug 31, 2024
5734e33
Merge branch 'craigk5n:master' into cmpsr
bbannon Aug 31, 2024
e1edeed
Update .gitignore
bbannon Aug 31, 2024
b1fc5fb
Merge branch 'craigk5n:master' into cmpsr
bbannon Sep 3, 2024
8cd6cb3
revert format a bit
bbannon Oct 9, 2024
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
16 changes: 7 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
*.class
__pycache__
.DS_Store
.htaccess
includes/htmlare*
includes/settings.php
*.jar
*.jar
java/
*.log
mysql-data
node_modules/
*.old
*.orig
pub/
__pycache__
*.save
*.sha
includes/htmlare*
includes/settings.php
java/
mysql-data
node_modules/
pub/
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want to ignore "pub" or "java"

sqlite-data
tests/.phpunit.result.cache
vendor/
Expand Down
28 changes: 16 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
{
"name": "k5n/webcalendar",
"type": "project",
"description": "Multi-user web-based calendar app",
"version": "1.9.12",
"homepage": "https://www.k5n.us/webcalendar/",
"authors": [
{
"name": "Craig Knudsen",
"email": "[email protected]",
"homepage": "https://www.k5n.us",
"homepage": "https://k5n.us",
"name": "Craig Knudsen",
"role": "Project Maintainer / Developer"
}
],
"config": {
"optimize-autoloader": true,
"sort-packages": true
},
"description": "Multi-user web-based calendar app",
"homepage": "https://k5n.us/webcalendar/",
"license": "GPL-2.0-only",
"name": "k5n/webcalendar",
"require": {
"phpmailer/phpmailer": "6.8.*",
"components/jquery": "3.5.*",
"ckeditor/ckeditor": "4.22.*",
"components/jquery": "3.5.*",
"phpmailer/phpmailer": "6.8.*",
"phpunit/phpunit": "9.6.*",
"twbs/bootstrap": "4.6.*",
"twbs/bootstrap-icons": "1.8.*",
"phpunit/phpunit": "9.6.*"
"twbs/bootstrap-icons": "1.8.*"
},
"license": "GPL-2.0-only"
"type": "project",
"version": "1.9.12"
}
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.