Skip to content

Commit

Permalink
Updated version of Angular and other front-end frameworks (dtinit#1113)
Browse files Browse the repository at this point in the history
* updated versions of front-end frameworks

* marked package-lock as auto-generated

* added merging strategy for auto generated files

* minor gitattributes fix
  • Loading branch information
xokker committed Jul 19, 2022
1 parent b5a1f9e commit 41be88c
Show file tree
Hide file tree
Showing 6 changed files with 31,118 additions and 8,884 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@
# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary

package-lock.json -diff -merge
package-lock.json linguist-generated=true

2 changes: 1 addition & 1 deletion Documentation/Developer.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ From the top level data-transfer-project directory:
* Install Git: `sudo apt-get install git-all`
* Install Gradle: `sudo apt-get install gradle`
* Install NVM: `curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash`
* Install Node: [mac installer](https://nodejs.org/dist/v10.16.3/node-v10.16.3.pkg) or `nvm install v10.16.3`
* Install Node: [mac installer](https://nodejs.org/dist/v16.15.1/node-v16.15.1.pkg) or `nvm install v16.15.1`
* Install Angular: `npm install -g @angular/cli`
* [Install Docker](https://docs.docker.com/install/)
* Install the Angular CLI `./gradlew client-rest:installLocalAngularCli`
Expand Down
Loading

0 comments on commit 41be88c

Please sign in to comment.