-
Notifications
You must be signed in to change notification settings - Fork 78
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
bbannon
wants to merge
23
commits into
craigk5n:master
Choose a base branch
from
bbannon:cmpsr
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Cmpsr #438
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 8d56a56
add config
bbannon e6ee6aa
Merge branch 'cmpsr' of https://github.com/bbannon/webcalendar into c…
bbannon d0490be
composer.lock wouldn't commit
bbannon 402773d
Merge branch 'craigk5n:master' into cmpsr
bbannon 550aac6
Merge branch 'craigk5n:master' into cmpsr
bbannon 51ceb70
Merge branch 'craigk5n:master' into cmpsr
bbannon 3bea88f
Merge branch 'craigk5n:master' into cmpsr
bbannon 89a0ac4
Merge branch 'craigk5n:master' into cmpsr
bbannon edb5571
Merge branch 'master' into cmpsr
bbannon 61f22e1
Merge branch 'craigk5n:master' into cmpsr
bbannon b1ff8a6
Merge branch 'craigk5n:master' into cmpsr
bbannon d0c839d
Merge branch 'craigk5n:master' into cmpsr
bbannon 12da340
Merge branch 'craigk5n:master' into cmpsr
bbannon b1b024f
Merge branch 'craigk5n:master' into cmpsr
bbannon 8f04139
Merge branch 'craigk5n:master' into cmpsr
bbannon f3aa923
Merge branch 'craigk5n:master' into cmpsr
bbannon aef0060
Merge branch 'craigk5n:master' into cmpsr
bbannon d50f136
Merge branch 'craigk5n:master' into cmpsr
bbannon 5734e33
Merge branch 'craigk5n:master' into cmpsr
bbannon e1edeed
Update .gitignore
bbannon b1fc5fb
Merge branch 'craigk5n:master' into cmpsr
bbannon 8cd6cb3
revert format a bit
bbannon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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"