You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
sfh-mohemm/Mohem
umasoodch 42ec226d45 Merge branch 'MOHEMM-Q3-DEV-LATEST' into MOHEMM-PHASE-2-SFH
# Conflicts:
#	Mohem/resources/android/icon/drawable-hdpi-icon.png
#	Mohem/resources/android/icon/drawable-ldpi-icon.png
#	Mohem/resources/android/icon/drawable-mdpi-icon.png
#	Mohem/resources/android/icon/drawable-xhdpi-icon.png
#	Mohem/resources/android/icon/drawable-xxhdpi-icon.png
#	Mohem/resources/android/icon/drawable-xxxhdpi-icon.png
#	Mohem/resources/android/splash/drawable-land-hdpi-screen.png
#	Mohem/resources/android/splash/drawable-land-ldpi-screen.png
#	Mohem/resources/android/splash/drawable-land-mdpi-screen.png
#	Mohem/resources/android/splash/drawable-land-xhdpi-screen.png
#	Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png
#	Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-hdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-ldpi-screen.png
#	Mohem/resources/android/splash/drawable-port-mdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-xhdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png
#	Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png
#	Mohem/src/app/app-routing.module.ts
#	Mohem/src/app/app.component.html
#	Mohem/src/app/app.component.ts
#	Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
#	Mohem/src/app/hmg-common/services/common/common.service.ts
#	Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss
#	Mohem/src/app/home/home.page.ts
#	Mohem/src/app/my-team/details/details.component.ts
#	Mohem/src/app/notification/home/home.component.html
#	Mohem/src/app/notification/home/home.component.ts
#	Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss
#	Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
#	Mohem/src/app/notification/worklist-main/worklist-main.component.html
#	Mohem/src/app/notification/worklist-main/worklist-main.component.ts
#	Mohem/src/app/profile/home/home.component.ts
#	Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
4 years ago
..
CordovaHMSPlugin fixed package.json issue 4 years ago
e2e Mohem Ionic 4 project created 7 years ago
resources added new splash for mohemm sfh 4 years ago
src Merge branch 'MOHEMM-Q3-DEV-LATEST' into MOHEMM-PHASE-2-SFH 4 years ago
typings no message 5 years ago
.gitignore added package.json in gitignore 4 years ago
GoogleService-Info.plist fixed structural issues and deler unused files 6 years ago
SELF_SIGNED_CERT_IN_CHAIN clean projest &will start phase 2 6 years ago
angular.json fixed issues found during demo 5 years ago
config.xml added config.xml 4 years ago
google-services.json fixed google service file 5 years ago
install-plugins.bat deleted unused code 5 years ago
install-plugins.sh deleted unused code 5 years ago
ionic.config.json Attendance 7 years ago
key.jks fix notification & home 6 years ago
npm update on workList page 6 years ago
package.json fixed package.json 4 years ago
tsconfig.json fixed config files issue 5 years ago
tslint.json Mohem Ionic 4 project created 7 years ago
webpack.config.js Q3 changes 4 years ago