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

Materia v5.0.0: Ifrit #1204

Merged
merged 159 commits into from
Jun 4, 2019
Merged

Materia v5.0.0: Ifrit #1204

merged 159 commits into from
Jun 4, 2019

Conversation

clpetersonucf
Copy link
Member

@clpetersonucf clpetersonucf commented Feb 25, 2019

Pull request is WIP.
Includes the following fixes and features:

Note this PR should be implemented along side Client-Assets' 1.3.0 branch: ucfopen/Materia-Server-Client-Assets#50

nathaned and others added 30 commits December 20, 2018 15:07
adds a new docker script run_build_release_package.sh
creates a packaged zip file with the minimum required deps
creates a build-info.yml file contianing hashes and build info
adds release option to travis to upload the zips to the github releases when tagged
Materia server's urls to the guide pages should be standardized
EG: id-clean_name/players-guidem, id-clean_name/creators-guide
So this chagne simplifies those urls.

The result is no angular controller is needed to display the guide pages.
The server knows exactly what each guide page url is going to display

There's an issue where widgets without guide pages break, fixed here.

relocated/styled the links a bit - still needs some more

changed routes so it doesn't match urls that'll never be used (only players-guide and creators-guide)

started changing 'player guide' and 'creator guide' to player's guide, etc (still more to do)
@iturgeon iturgeon changed the title Materia v5.0: Ifrit Materia v5.0.0: Ifrit May 28, 2019
@clpetersonucf clpetersonucf marked this pull request as ready for review May 30, 2019 16:55
* adds a .env file for docker to pull vars from
* consolidates db connection env vars
* adds a tag env to docker compose to allow docker images to be versioned w repo
* adds docker-compose.build.yml for building releases inside a container
* updates lots of docker convenience scripts
* removes scripts for building containers now that docker-compose build can do the same
* Added run_create_me.sh to easily create a default user based on you
* updated output in some admin and widget tasks
* added ability to set a user's password via tasks
* bumped docker-compose files to v 3.5 to gain network and container names
* general polish on docker scripts
…-and-environ-for-deploys

polish docker scripts and clean up release builds
@iturgeon iturgeon added this to the Ifrit (~5) milestone Jun 3, 2019
Copy link
Contributor

@FrenjaminBanklin FrenjaminBanklin left a comment

Choose a reason for hiding this comment

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

Buttons don't seem to follow the same rules throughout the entire application but that can be resolved later.

All of the changes appear to be functioning properly.

@clpetersonucf clpetersonucf merged commit 49686df into master Jun 4, 2019
@iturgeon iturgeon deleted the dev/5-ifirit branch July 9, 2019 15:18
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.

5 participants