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

Feat/mixed changes #502

Merged
merged 5 commits into from
Feb 24, 2021
Merged

Conversation

ccdd13
Copy link
Contributor

@ccdd13 ccdd13 commented Feb 24, 2021

git log

* 434675d (origin/feat/mixed-changes) no guest user by default
* bdc8249 put $auth_users & $readonly_users together
* 9caee73 added .gitignore
* 3330a76 replace doc url for $datetime_format from function.date.php to datetime.format.php
* fa2b846 safe include config.php with __DIR__
* 4e163af remove trailing whitespace
* a19ff20 (upstream/master) Update vendor CDN versions

ccdd13 and others added 3 commits February 23, 2021 13:32
Signed-off-by: ccdd13 <78702084+ccdd13@users.noreply.github.com>
…me.format.php

Signed-off-by: ccdd13 <ccdd13@users.noreply.github.com>
.gitignore Outdated Show resolved Hide resolved
config.php Show resolved Hide resolved
Signed-off-by: ccdd13 <ccdd13@users.noreply.github.com>
Signed-off-by: ccdd13 <ccdd13@users.noreply.github.com>
@ccdd13 ccdd13 force-pushed the feat/mixed-changes branch from 434675d to 6a37c37 Compare February 24, 2021 06:29
@ccdd13
Copy link
Contributor Author

ccdd13 commented Feb 24, 2021

git log

* 6a37c37 (HEAD -> feat/mixed-changes, origin/feat/mixed-changes) update $datetime_format
* 304f257 put $auth_users & $readonly_users together
* 3330a76 replace doc url for $datetime_format from function.date.php to datetime.format.php
* fa2b846 safe include config.php with __DIR__
* 4e163af remove trailing whitespace
* a19ff20 (upstream/master) Update vendor CDN versions

config.php Show resolved Hide resolved
@ccdd13 ccdd13 requested a review from prasathmani February 24, 2021 06:48
@prasathmani prasathmani merged commit dd9d7c0 into prasathmani:master Feb 24, 2021
@ccdd13 ccdd13 deleted the feat/mixed-changes branch February 24, 2021 07:08
ner00 pushed a commit to ner00/tinyfilemanager that referenced this pull request May 7, 2023
* remove trailing whitespace

Signed-off-by: ccdd13 <78702084+ccdd13@users.noreply.github.com>

* safe include config.php with __DIR__

* replace doc url for $datetime_format from function.date.php to datetime.format.php

Signed-off-by: ccdd13 <ccdd13@users.noreply.github.com>

* put $auth_users & $readonly_users together

Signed-off-by: ccdd13 <ccdd13@users.noreply.github.com>

* update $datetime_format

Signed-off-by: ccdd13 <ccdd13@users.noreply.github.com>

Co-authored-by: ammm ccdd12 <mamok43076@dashseat.com>
Co-authored-by: ccdd13 <ccdd13@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants