Skip to content

Commit

Permalink
Feat/a13 upgrade minds#2937
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 55ea269
Author: Ben Hayward <[email protected]>
Date:   Tue Feb 22 11:50:09 2022 +0000

    Package update

commit de40418
Author: Ben Hayward <[email protected]>
Date:   Mon Feb 21 13:46:55 2022 +0000

    Update web3 modal package

commit 70e0293
Merge: a353076 19f1a75
Author: Ben Hayward <[email protected]>
Date:   Fri Feb 18 15:49:17 2022 +0000

    Merge branch 'master' of gitlab.com:minds/front into feat/a13-upgrade-ben

commit a353076
Merge: e38671f ccbb250
Author: Ben Hayward <[email protected]>
Date:   Mon Feb 14 17:32:32 2022 +0000

    Merge branch 'master' of gitlab.com:minds/front into feat/a13-upgrade-ben

commit e38671f
Author: Ben Hayward <[email protected]>
Date:   Mon Feb 14 15:31:12 2022 +0000

    Make serve message more verbose

commit a67d7b8
Author: Ben Hayward <[email protected]>
Date:   Mon Feb 14 14:36:53 2022 +0000

    remove testing comments

commit 6c6f8f9
Author: Ben Hayward <[email protected]>
Date:   Mon Feb 14 14:27:54 2022 +0000

    Remove test todo

commit 4bc2bdb
Author: Ben Hayward <[email protected]>
Date:   Fri Feb 11 14:38:19 2022 +0000

    Update to ignore cache files

commit 4994039
Author: Ben Hayward <[email protected]>
Date:   Fri Feb 11 14:16:30 2022 +0000

    Fix test randomly crashing out

commit 192d1cf
Author: Ben Hayward <[email protected]>
Date:   Fri Feb 11 13:31:39 2022 +0000

    Missing build

commit 0d0419b
Author: Ben Hayward <[email protected]>
Date:   Fri Feb 11 13:25:21 2022 +0000

    Update package lock for conflict

commit 45b3bcd
Merge: 16808c5 546681c
Author: Ben Hayward <[email protected]>
Date:   Fri Feb 11 13:12:24 2022 +0000

    Merge branch 'master' of gitlab.com:minds/front into feat/a13-upgrade-ben

commit 16808c5
Author: Ben Hayward <[email protected]>
Date:   Fri Feb 11 12:58:53 2022 +0000

    Fix css issue with old sidebar nav "& >" -> ">"

commit 9a533c8
Author: Ben Hayward <[email protected]>
Date:   Fri Feb 11 12:58:28 2022 +0000

    Add raw-loader as a module

commit ffeec84
Author: Ben Hayward <[email protected]>
Date:   Fri Feb 11 11:34:05 2022 +0000

    Fix invalid weight property (font-weight)

commit 4d91eca
Author: Ben Hayward <[email protected]>
Date:   Thu Feb 10 19:17:49 2022 +0000

    Fix failing spec tests

commit 754865b
Author: Ben Hayward <[email protected]>
Date:   Wed Feb 9 16:14:09 2022 +0000

    We have npm install working without forcing

commit 71773ff
Author: Ben Hayward <[email protected]>
Date:   Mon Feb 7 11:52:02 2022 +0000

    Set deployUrl

commit fc60fab
Author: Ben Hayward <[email protected]>
Date:   Mon Feb 7 11:43:35 2022 +0000

    A13 upgrade building

commit b6169a0
Author: Ben Hayward <[email protected]>
Date:   Mon Feb 7 11:01:35 2022 +0000

    Package lock update

commit 04eee65
Author: Ben Hayward <[email protected]>
Date:   Mon Feb 7 11:00:00 2022 +0000

    Gitignore update
  • Loading branch information
markharding committed Mar 7, 2022
1 parent 6a3137f commit c893d7e
Show file tree
Hide file tree
Showing 21 changed files with 23,778 additions and 30,464 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/.angular/cache
cache
cache_directory
# Ignore front end plugins
#app/src/plugins
#app/templates/plugins
Expand Down Expand Up @@ -43,4 +46,5 @@ cypress/videos
!.gitattributes
!.gitkeep
!/.nvmrc
!/.husky
!/.husky
cypress-tests
23 changes: 8 additions & 15 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.hmr.ts"
}
]
],
"deployUrl": "http://localhost:4200/"
}
},
"defaultConfiguration": ""
Expand All @@ -157,6 +158,12 @@
"production": {
"browserTarget": "minds:build:production"
},
"dev": {
"browserTarget": "minds:build:dev",
"servePath": "/",
"sourceMap": true,
"deployUrl": "http://localhost:4200/"
},
"hmr": {
"hmr": true,
"browserTarget": "minds:build:hmr"
Expand Down Expand Up @@ -201,13 +208,6 @@
"preserveSymlinks": true
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
"exclude": ["**/node_modules/**"]
}
},
"server": {
"builder": "@angular-devkit/build-angular:server",
"options": {
Expand Down Expand Up @@ -335,13 +335,6 @@
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "minds:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**"]
}
}
}
}
Expand Down
Loading

0 comments on commit c893d7e

Please sign in to comment.