second try of merge from master #914
Merged
Conversation
This file contains hidden or 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
* fix: TTA-50 Error when editing an entry * fix: TTA-50 Error when editing an entry
* Innecesary env files deleted * New changes to env files * Add 1 git-crypt collaborator New collaborators: F295BDD1 Marco Aguirre <[email protected]> * Add 1 git-crypt collaborator New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> * Add 2 git-crypt collaborators New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> F295BDD1 Marco Aguirre <[email protected]> * New keys and env variables added * env files added & modified * Make run now uses .dev.env * Pipeline modified * is the .env needed? * using encrypted .stage.env * load secrets * adding env variables * scopes cannot be empty * use env * using env var * using env file * adding mask * using docker buildkit * only on tags * using buildkit directly * using dash source * docker buildkit * missing folders added * nginx fix * fixing secrets * problem with double qoutes * fixing quotes in .stage.env * fixing secrets * loading to env * quotes fixed * replacing \r * fixing trailing \n * one line expose * fixing endpoint url * removing unnecessary jobs * update creds * adding with space at the end of the file * primer commit * cambios en users list components * Se ajusta la variable isDevelopmentOrProd * revision tests * reportsUrl como variable global Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]>
…ject files (#906) * Set copy of package.json and npm install before copying all other project files * Fix error on COPY on Dockerfiles Co-authored-by: Gustavo Lozada <[email protected]>
Co-authored-by: Jimmy Jaramillo <[email protected]>
|
Kudos, SonarCloud Quality Gate passed!
|
reihtw
pushed a commit
that referenced
this pull request
Aug 12, 2022
* fix: TTA-83 improve admin validation * fix: TTA-83 improve admin validation * feat TTA-83: frontend admin validation * fix TTA-83: Returning to login functions to subscribe * fix TTA-83: Fixing login component tests * fix TTA-83: Sonarcloud fix * fix TTA-83: Adding legacy login * fix TTA-83: fixing tests * Tta 83 solving conflicts (#912) * Tta 50 error when editing an entry (#907) * fix: TTA-50 Error when editing an entry * fix: TTA-50 Error when editing an entry * Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903) * Innecesary env files deleted * New changes to env files * Add 1 git-crypt collaborator New collaborators: F295BDD1 Marco Aguirre <[email protected]> * Add 1 git-crypt collaborator New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> * Add 2 git-crypt collaborators New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> F295BDD1 Marco Aguirre <[email protected]> * New keys and env variables added * env files added & modified * Make run now uses .dev.env * Pipeline modified * is the .env needed? * using encrypted .stage.env * load secrets * adding env variables * scopes cannot be empty * use env * using env var * using env file * adding mask * using docker buildkit * only on tags * using buildkit directly * using dash source * docker buildkit * missing folders added * nginx fix * fixing secrets * problem with double qoutes * fixing quotes in .stage.env * fixing secrets * loading to env * quotes fixed * replacing \r * fixing trailing \n * one line expose * fixing endpoint url * removing unnecessary jobs * update creds * adding with space at the end of the file * primer commit * cambios en users list components * Se ajusta la variable isDevelopmentOrProd * revision tests * reportsUrl como variable global Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> * Set copy of package.json and npm install before copying all other project files (#906) * Set copy of package.json and npm install before copying all other project files * Fix error on COPY on Dockerfiles Co-authored-by: Gustavo Lozada <[email protected]> * feat: TTA-113 Set a new logo for TT - version 2 (#909) Co-authored-by: Jimmy Jaramillo <[email protected]> * chore(release): 1.74.0 [skip ci]nn Co-authored-by: wilc0519 <[email protected]> Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> Co-authored-by: GuLozada99 <[email protected]> Co-authored-by: Gustavo Lozada <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> * Update TTA 83 Branch (#913) * Tta 50 error when editing an entry (#907) * fix: TTA-50 Error when editing an entry * fix: TTA-50 Error when editing an entry * Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903) * Innecesary env files deleted * New changes to env files * Add 1 git-crypt collaborator New collaborators: F295BDD1 Marco Aguirre <[email protected]> * Add 1 git-crypt collaborator New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> * Add 2 git-crypt collaborators New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> F295BDD1 Marco Aguirre <[email protected]> * New keys and env variables added * env files added & modified * Make run now uses .dev.env * Pipeline modified * is the .env needed? * using encrypted .stage.env * load secrets * adding env variables * scopes cannot be empty * use env * using env var * using env file * adding mask * using docker buildkit * only on tags * using buildkit directly * using dash source * docker buildkit * missing folders added * nginx fix * fixing secrets * problem with double qoutes * fixing quotes in .stage.env * fixing secrets * loading to env * quotes fixed * replacing \r * fixing trailing \n * one line expose * fixing endpoint url * removing unnecessary jobs * update creds * adding with space at the end of the file * primer commit * cambios en users list components * Se ajusta la variable isDevelopmentOrProd * revision tests * reportsUrl como variable global Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> * Set copy of package.json and npm install before copying all other project files (#906) * Set copy of package.json and npm install before copying all other project files * Fix error on COPY on Dockerfiles Co-authored-by: Gustavo Lozada <[email protected]> * feat: TTA-113 Set a new logo for TT - version 2 (#909) Co-authored-by: Jimmy Jaramillo <[email protected]> * chore(release): 1.74.0 [skip ci]nn Co-authored-by: wilc0519 <[email protected]> Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> Co-authored-by: GuLozada99 <[email protected]> Co-authored-by: Gustavo Lozada <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> * second try of merge from master (#914) * Tta 50 error when editing an entry (#907) * fix: TTA-50 Error when editing an entry * fix: TTA-50 Error when editing an entry * Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903) * Innecesary env files deleted * New changes to env files * Add 1 git-crypt collaborator New collaborators: F295BDD1 Marco Aguirre <[email protected]> * Add 1 git-crypt collaborator New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> * Add 2 git-crypt collaborators New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> F295BDD1 Marco Aguirre <[email protected]> * New keys and env variables added * env files added & modified * Make run now uses .dev.env * Pipeline modified * is the .env needed? * using encrypted .stage.env * load secrets * adding env variables * scopes cannot be empty * use env * using env var * using env file * adding mask * using docker buildkit * only on tags * using buildkit directly * using dash source * docker buildkit * missing folders added * nginx fix * fixing secrets * problem with double qoutes * fixing quotes in .stage.env * fixing secrets * loading to env * quotes fixed * replacing \r * fixing trailing \n * one line expose * fixing endpoint url * removing unnecessary jobs * update creds * adding with space at the end of the file * primer commit * cambios en users list components * Se ajusta la variable isDevelopmentOrProd * revision tests * reportsUrl como variable global Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> * Set copy of package.json and npm install before copying all other project files (#906) * Set copy of package.json and npm install before copying all other project files * Fix error on COPY on Dockerfiles Co-authored-by: Gustavo Lozada <[email protected]> * feat: TTA-113 Set a new logo for TT - version 2 (#909) Co-authored-by: Jimmy Jaramillo <[email protected]> * chore(release): 1.74.0 [skip ci]nn Co-authored-by: wilc0519 <[email protected]> Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> Co-authored-by: GuLozada99 <[email protected]> Co-authored-by: Gustavo Lozada <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: wilc0519 <[email protected]> Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> Co-authored-by: GuLozada99 <[email protected]> Co-authored-by: Gustavo Lozada <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Rodolfo <[email protected]> Co-authored-by: = <=>
reihtw
pushed a commit
that referenced
this pull request
Aug 12, 2022
* fix: TTA-83 improve admin validation * fix: TTA-83 improve admin validation * feat TTA-83: frontend admin validation * fix TTA-83: Returning to login functions to subscribe * fix TTA-83: Fixing login component tests * fix TTA-83: Sonarcloud fix * fix TTA-83: Adding legacy login * fix TTA-83: fixing tests * Tta 83 solving conflicts (#912) * Tta 50 error when editing an entry (#907) * fix: TTA-50 Error when editing an entry * fix: TTA-50 Error when editing an entry * Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903) * Innecesary env files deleted * New changes to env files * Add 1 git-crypt collaborator New collaborators: F295BDD1 Marco Aguirre <[email protected]> * Add 1 git-crypt collaborator New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> * Add 2 git-crypt collaborators New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> F295BDD1 Marco Aguirre <[email protected]> * New keys and env variables added * env files added & modified * Make run now uses .dev.env * Pipeline modified * is the .env needed? * using encrypted .stage.env * load secrets * adding env variables * scopes cannot be empty * use env * using env var * using env file * adding mask * using docker buildkit * only on tags * using buildkit directly * using dash source * docker buildkit * missing folders added * nginx fix * fixing secrets * problem with double qoutes * fixing quotes in .stage.env * fixing secrets * loading to env * quotes fixed * replacing \r * fixing trailing \n * one line expose * fixing endpoint url * removing unnecessary jobs * update creds * adding with space at the end of the file * primer commit * cambios en users list components * Se ajusta la variable isDevelopmentOrProd * revision tests * reportsUrl como variable global Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> * Set copy of package.json and npm install before copying all other project files (#906) * Set copy of package.json and npm install before copying all other project files * Fix error on COPY on Dockerfiles Co-authored-by: Gustavo Lozada <[email protected]> * feat: TTA-113 Set a new logo for TT - version 2 (#909) Co-authored-by: Jimmy Jaramillo <[email protected]> * chore(release): 1.74.0 [skip ci]nn Co-authored-by: wilc0519 <[email protected]> Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> Co-authored-by: GuLozada99 <[email protected]> Co-authored-by: Gustavo Lozada <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> * Update TTA 83 Branch (#913) * Tta 50 error when editing an entry (#907) * fix: TTA-50 Error when editing an entry * fix: TTA-50 Error when editing an entry * Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903) * Innecesary env files deleted * New changes to env files * Add 1 git-crypt collaborator New collaborators: F295BDD1 Marco Aguirre <[email protected]> * Add 1 git-crypt collaborator New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> * Add 2 git-crypt collaborators New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> F295BDD1 Marco Aguirre <[email protected]> * New keys and env variables added * env files added & modified * Make run now uses .dev.env * Pipeline modified * is the .env needed? * using encrypted .stage.env * load secrets * adding env variables * scopes cannot be empty * use env * using env var * using env file * adding mask * using docker buildkit * only on tags * using buildkit directly * using dash source * docker buildkit * missing folders added * nginx fix * fixing secrets * problem with double qoutes * fixing quotes in .stage.env * fixing secrets * loading to env * quotes fixed * replacing \r * fixing trailing \n * one line expose * fixing endpoint url * removing unnecessary jobs * update creds * adding with space at the end of the file * primer commit * cambios en users list components * Se ajusta la variable isDevelopmentOrProd * revision tests * reportsUrl como variable global Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> * Set copy of package.json and npm install before copying all other project files (#906) * Set copy of package.json and npm install before copying all other project files * Fix error on COPY on Dockerfiles Co-authored-by: Gustavo Lozada <[email protected]> * feat: TTA-113 Set a new logo for TT - version 2 (#909) Co-authored-by: Jimmy Jaramillo <[email protected]> * chore(release): 1.74.0 [skip ci]nn Co-authored-by: wilc0519 <[email protected]> Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> Co-authored-by: GuLozada99 <[email protected]> Co-authored-by: Gustavo Lozada <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> * second try of merge from master (#914) * Tta 50 error when editing an entry (#907) * fix: TTA-50 Error when editing an entry * fix: TTA-50 Error when editing an entry * Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903) * Innecesary env files deleted * New changes to env files * Add 1 git-crypt collaborator New collaborators: F295BDD1 Marco Aguirre <[email protected]> * Add 1 git-crypt collaborator New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> * Add 2 git-crypt collaborators New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> F295BDD1 Marco Aguirre <[email protected]> * New keys and env variables added * env files added & modified * Make run now uses .dev.env * Pipeline modified * is the .env needed? * using encrypted .stage.env * load secrets * adding env variables * scopes cannot be empty * use env * using env var * using env file * adding mask * using docker buildkit * only on tags * using buildkit directly * using dash source * docker buildkit * missing folders added * nginx fix * fixing secrets * problem with double qoutes * fixing quotes in .stage.env * fixing secrets * loading to env * quotes fixed * replacing \r * fixing trailing \n * one line expose * fixing endpoint url * removing unnecessary jobs * update creds * adding with space at the end of the file * primer commit * cambios en users list components * Se ajusta la variable isDevelopmentOrProd * revision tests * reportsUrl como variable global Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> * Set copy of package.json and npm install before copying all other project files (#906) * Set copy of package.json and npm install before copying all other project files * Fix error on COPY on Dockerfiles Co-authored-by: Gustavo Lozada <[email protected]> * feat: TTA-113 Set a new logo for TT - version 2 (#909) Co-authored-by: Jimmy Jaramillo <[email protected]> * chore(release): 1.74.0 [skip ci]nn Co-authored-by: wilc0519 <[email protected]> Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> Co-authored-by: GuLozada99 <[email protected]> Co-authored-by: Gustavo Lozada <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: wilc0519 <[email protected]> Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> Co-authored-by: GuLozada99 <[email protected]> Co-authored-by: Gustavo Lozada <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Rodolfo <[email protected]> Co-authored-by: = <=>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
second try of merge from master