Changeset dba4ca9

Timestamp:

07/17/20 18:45:06 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

0c48bbb, ec6ac45

Parents:

7737a15 (diff), 30a465f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/farmatiko

Files:

• .gitignore (added)
• Farmatiko.sln (added)
• Farmatiko/.gitignore (added)
• Farmatiko/ClientApp/.editorconfig (added)
• Farmatiko/ClientApp/.gitignore (added)
• Farmatiko/ClientApp/README.md (added)
• Farmatiko/ClientApp/angular.json (added)
• Farmatiko/ClientApp/browserslist (added)
• Farmatiko/ClientApp/e2e/protractor.conf.js (added)
• Farmatiko/ClientApp/e2e/src/app.e2e-spec.ts (added)
• Farmatiko/ClientApp/e2e/src/app.po.ts (added)
• Farmatiko/ClientApp/e2e/tsconfig.e2e.json (added)
• Farmatiko/ClientApp/package-lock.json (added)
• Farmatiko/ClientApp/package.json (added)
• Farmatiko/ClientApp/src/app/app.component.html (added)
• Farmatiko/ClientApp/src/app/app.component.ts (added)
• Farmatiko/ClientApp/src/app/app.module.ts (added)
• Farmatiko/ClientApp/src/app/app.server.module.ts (added)
• Farmatiko/ClientApp/src/app/counter/counter.component.html (added)
• Farmatiko/ClientApp/src/app/counter/counter.component.spec.ts (added)
• Farmatiko/ClientApp/src/app/counter/counter.component.ts (added)
• Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.html (added)
• Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.ts (added)
• Farmatiko/ClientApp/src/app/home/home.component.html (added)
• Farmatiko/ClientApp/src/app/home/home.component.ts (added)
• Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css (added)
• Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html (added)
• Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.ts (added)
• Farmatiko/ClientApp/src/assets/.gitkeep (added)
• Farmatiko/ClientApp/src/environments/environment.prod.ts (added)
• Farmatiko/ClientApp/src/environments/environment.ts (added)
• Farmatiko/ClientApp/src/index.html (added)
• Farmatiko/ClientApp/src/karma.conf.js (added)
• Farmatiko/ClientApp/src/main.ts (added)
• Farmatiko/ClientApp/src/polyfills.ts (added)
• Farmatiko/ClientApp/src/styles.css (added)
• Farmatiko/ClientApp/src/test.ts (added)
• Farmatiko/ClientApp/src/tsconfig.app.json (added)
• Farmatiko/ClientApp/src/tsconfig.server.json (added)
• Farmatiko/ClientApp/src/tsconfig.spec.json (added)
• Farmatiko/ClientApp/src/tslint.json (added)
• Farmatiko/ClientApp/tsconfig.json (added)
• Farmatiko/ClientApp/tslint.json (added)
• Farmatiko/Controllers/WeatherForecastController.cs (added)
• Farmatiko/Farmatiko.csproj (added)
• Farmatiko/Pages/Error.cshtml (added)
• Farmatiko/Pages/Error.cshtml.cs (added)
• Farmatiko/Pages/_ViewImports.cshtml (added)
• Farmatiko/Program.cs (added)
• Farmatiko/Properties/launchSettings.json (added)
• Farmatiko/Startup.cs (added)
• Farmatiko/WeatherForecast.cs (added)
• Farmatiko/appsettings.Development.json (added)
• Farmatiko/appsettings.json (added)
• Farmatiko/wwwroot/favicon.ico (added)
• FarmatikoData/.gitignore (added)
• FarmatikoData/FarmatikoData.csproj (added)
• FarmatikoData/FarmatikoDataContext.cs (added)
• FarmatikoData/Models/HealthFacilities.cs (added)
• FarmatikoData/Models/HealthcareWorkers.cs (added)
• FarmatikoData/Models/Medicine.cs (added)
• FarmatikoData/Models/MedicineList.cs (added)
• FarmatikoData/Models/Pandemic.cs (added)
• FarmatikoData/Models/Pharmacy.cs (added)
• FarmatikoData/Models/PharmacyHead.cs (added)