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.

Sign up for GitHub

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

Jump to bottom

Merge Develop #504

Merged
36 commits merged into from
Nov 29, 2023
Merged

Merge Develop #504

36 commits merged into from
Nov 29, 2023

Conversation

ghost
Copy link

@ghost ghost commented Nov 29, 2023

  • Update DF logo
  • Add integration for the new UI and release DF v6

anas-srikou and others added 30 commits October 30, 2023 15:31
Update splash controller to return index file
044c6ac
Update installer scripts to install the new UI
3620fca
Update composer files
90e9eda
Update the version
70bc9d2
Remove unnecessary dependencies
9de1ec8
Add options to install DF UI or upgrade DF version
3005de8
Implement logic for installing UI and upgrade version
8617ea7
Add missing arg
c4f78c5
Update the branch we need to clone
81493e5
Update repo owner to dreamfactorysoftware and use pre release tag
5aa8033
Build new version of dfsetup.run
440abd9
Remove filemanager app dependency
9bdf294
Add apidoc dependency
1a25689
Update scripts for each OS type
969b9a1
Move the options 8,9 to after we read the OS script file to avoid com…
88d291c 
…mands not found
Rebuild dfsetup.run file
668d907
@thekevinm
Update README.md
2ff3baf
@thekevinm
Delete readme/mark-gold.png
1d4bccb
@thekevinm
Delete readme/vertical-logo-fullcolor.png
b7bf46c
@thekevinm
updated images
ea93f35
@thekevinm
Update README.md
7d503ff
@thekevinm
Add files via upload
09d6cb7
@thekevinm
Add files via upload
741796c
@thekevinm
Merge pull request #503 from dreamfactorysoftware/dev-readme
642386f 
Dev readme
@thekevinm
Update README.md
b7b1c68
@thekevinm
Delete readme/mark-gold.png
3e65016
@thekevinm
Delete readme/vertical-logo-fullcolor.png
d2be0e6
@thekevinm
updated images
aed1f76
@thekevinm
Update README.md
1a8586a
@thekevinm
Add files via upload
523aa24
@ghost ghost self-assigned this Nov 29, 2023
@private-packagist Private Packagist
Copy link

private-packagist bot commented Nov 29, 2023 •
edited
Loading

composer.lock

Package changes

Package Operation From To About
aws/aws-crt-php upgrade v1.2.3 v1.2.4 diff
aws/aws-sdk-php upgrade 3.286.3 3.291.0 diff
doctrine/dbal upgrade 3.7.1 3.7.2 diff
league/flysystem upgrade 3.19.0 3.21.0 diff
league/flysystem-ftp upgrade 3.19.0 3.21.0 diff
league/flysystem-local upgrade 3.19.0 3.21.0 diff
php-http/cache-plugin upgrade 1.8.0 1.8.1 diff
phpseclib/phpseclib upgrade 3.0.33 ⚠️ 3.0.34 ✅ diff
sabre/dav upgrade 4.5.0 4.5.1 diff
dreamfactory/df-admin-app remove 5.0.3 - -
dreamfactory/df-api-docs-ui remove 3.0.2 - -
dreamfactory/df-filemanager-app remove 0.3.2 - -
dreamfactory/installer remove 1.0.1 - -

Dev Package changes

Package Operation From To About
phpstan/phpdoc-parser upgrade 1.24.2 1.24.4 diff
theseer/tokenizer upgrade 1.2.1 1.2.2 diff

Settings · Docs · Powered by Private Packagist

@ghost ghost requested review from thekevinm and nicdavidson November 29, 2023 01:09
@private-packagist Private Packagist
Copy link

The composer.lock diff comment has been updated to reflect new changes in this PR.

@ghost ghost merged commit 8e99982 into master Nov 29, 2023
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thekevinm thekevinm Awaiting requested review from thekevinm

@nicdavidson nicdavidson Awaiting requested review from nicdavidson

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@thekevinm