Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity
785 Commits
25 Branches
0 Tags
22 MiB
master
flutter_upgrade_with_timesheet_changes
master-Api2.0_update3.29
mohem_flutter_upgrade
flutter_upgrade
master_eventActivity
master-Api2.0
mohemm_poc
faiz_disclosure
payment_worklist_CR_6939
development_sikander
development_aamir
sultan-dev
faiz_dev_marathon_text_fix
business_trip_settlement
development_haroon
development_haroon_merge_aamir
dev_faiz
development_aamir_testing23
development_faiz
mirza_hmg_wifi_phase_1
development_mirza
fatima
faiz_marathon_signalR_critical
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c9dd403b23'
${ noResults }
Commit Graph

145 Commits (c9dd403b238d8d5274d0d4a78eac70602ce95394)

Author SHA1 Message Date
devmirza121 0d0832277f Merge branch 'master' into development_mirza 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_fragments/detail_fragment.dart
#	lib/ui/work_list/worklist_fragments/info_fragments.dart
#	pubspec.yaml
 3 years ago
devmirza121 116175efaa Work list UI Change 3 years ago
Fatimah Alshammari 53dabdd853 Merge branch 'master' into fatima 3 years ago
Fatimah Alshammari be506fa059 fix issues 3 years ago
Sikander Saleem 95b60181b1 bug fixes 3 years ago
Sikander Saleem e090b9be0b Merge branch 'development_mirza' into 'master' 
Login with face and finger fixed

See merge request mirza.shafique/mohem_flutter_app!83
 3 years ago
devmirza121 8ce3a09375 Login with face and finger fixed 3 years ago
Fatimah Alshammari 07d4aadc4e added survey screen 3 years ago
Fatimah Alshammari 957c88f58f fix issues 3 years ago
Fatimah Alshammari 241172b7e7 fix issues 3 years ago
Fatimah Alshammari b7685295d9 fix design issues 3 years ago
Sikander Saleem cfe0460ea5 my team issues fixed 3 years ago
Sikander Saleem f3855c3883 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem cbcb3cdc00 item for sale improvement cont. 3 years ago
Fatimah Alshammari 6a1f655b1f Merge branch 'master' into Fatima 3 years ago
Fatimah Alshammari 3d11273738 fix design issues 3 years ago
Sikander Saleem 8e94d57dae performance evaluation improvements. 3 years ago
Sikander Saleem 2eedef7c2c Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 7eadd97869 item for sale ui improvements & translation added. 3 years ago
Sultan Khan 70a7108d9c Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
 3 years ago
Sultan Khan f3477fb5f3 perforamce page updates 3 years ago
Sikander Saleem b79edd701c code improvement & translation added. 3 years ago
Sikander Saleem 2ce3c535d2 Merge branch 'master' into development_sikander 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
 3 years ago
Sikander Saleem 6be8510b86 drawer menu ui changed. 3 years ago
Fatimah Alshammari 907b205d21 added subordinate leave 3 years ago
Sikander Saleem 9314ea0514 Merge branch 'master' into development_sikander 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
 3 years ago
Fatimah Alshammari 416a33b2fd fix design 3 years ago
Sikander Saleem 169a9bcc60 leave balance cont. 3 years ago
Sikander Saleem 1404715425 Vacation rule translation added. 3 years ago
Sikander Saleem 3750f2c904 Vacation rule added complete. 3 years ago
Sultan Khan 39b916bcc8 performance page added 3 years ago
Sultan Khan ff4a546e5f Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Fatimah Alshammari d52cc2d5cd Merge branch 'master' into Fatima 3 years ago
Fatimah Alshammari b502e038a5 fix issue 3 years ago
Sikander Saleem 0d812cf266 Vacation rule added. 3 years ago
Sikander Saleem 4ebba3900c dashboard improvements, monthly attendance & vacation rule added. 3 years ago
Sikander Saleem 68146ecd97 dynamic forms finalized & improvements 3 years ago
Fatimah Alshammari aca788ae26 fix translations 3 years ago
devmirza121 8fe51a654c Merge branch 'master' into development_mirza 
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/main.dart
#	lib/ui/landing/today_attendance_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
 3 years ago
Fatimah Alshammari 1604cba140 fix translation. 3 years ago
Fatimah Alshammari 57bf34a93a fix translation. 3 years ago
Fatimah Alshammari 1ef3783fb9 Merge branch 'master' into Fatima 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/profile_api_client.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
#	lib/ui/profile/delete_familyMember.dart
#	lib/ui/profile/family_members.dart
#	lib/ui/profile/phone_numbers.dart
#	lib/ui/screens/profile/profile_screen.dart
 3 years ago
Fatimah Alshammari 30ca1894db fix issues. 3 years ago
devmirza121 2ced8313da QR, Digital Card & Employee ID Implementation 3 years ago
Sultan Khan 06b14394bd Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan e6e150b9e3 address phone numbers 3 years ago
Sikander Saleem f1c36b5821 monthly pay slip added. 3 years ago
haroon amjad a55c98c5ba Not found svg added 3 years ago
Sikander Saleem 95e2e74fd0 Merge branch 'master' into development_sikander 
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/main.dart
#	lib/models/generic_response_model.dart
#	lib/ui/my_attendance/my_attendance_screen.dart
#	lib/ui/work_list/worklist_detail_screen.dart
 3 years ago
Fatimah Alshammari 4ddd967177 Merge branch 'master' into Fatima 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
#	pubspec.yaml
 3 years ago
devmirza121 2010e9d6a0 Merge branch 'master' into development_mirza 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/colors.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/attendance/monthly_attendance.dart
#	lib/ui/landing/dashboard.dart
#	lib/widgets/radio/show_radio.dart
#	pubspec.yaml
 3 years ago
Fatimah Alshammari 60db9041a1 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima 
 Conflicts:
	assets/langs/en-US.json
	lib/ui/profile/contact_details.dart
	lib/ui/profile/personal_info.dart
	pubspec.yaml
 3 years ago
Fatimah Alshammari d2a6ed8de7 fix monthly attendance 3 years ago
devmirza121 a03eb8b11a Worklist (ITG sikp, Delegats and HR multiple requests) 3 years ago
Sikander Saleem ae0a788728 Merge branch 'master' into development_sikander 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
 3 years ago
Sikander Saleem 3e6fdd2cb5 missing swipe added. 3 years ago
Sikander Saleem 1e9a26e3df missing swipe cont 3 years ago
Sultan Khan b5a5399b95 profile 3 years ago
Fatimah Alshammari 1305e895a1 fix arabic translation 3 years ago
Sultan Khan fad58931f3 profile 3 years ago
Sultan Khan 74c06203db Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan 6e86c0ba38 profile details 3 years ago
devmirza121 3fce58b379 Merge branch 'master' into development_mirza 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
 4 years ago
devmirza121 2887894330 Merge branch 'master' into development_mirza 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/ui/login/login_screen.dart
 4 years ago
devmirza121 ec845756be Login Issue Fix's 4 years ago
Fatimah Alshammari b281efe14c fix monthly attendance 4 years ago
Sikander Saleem 25d020441c my attendance working cont-1 4 years ago
Fatimah Alshammari 0e560558dc Merge branch 'master' into Fatima 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/extensions/widget_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard.dart
#	pubspec.lock
#	pubspec.yaml
 4 years ago
Fatimah Alshammari 339b343c4c fix calendar 4 years ago
Sikander Saleem 4817781fe1 Merge branch 'development_mirza' into development_sikander 
# Conflicts:
#	lib/provider/dashboard_provider_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
 4 years ago
Sikander Saleem 807d4b4046 item creation added. 4 years ago
Sikander Saleem a431913bb6 purchase order & move order, item history & quotation analysis added. 4 years ago
devmirza121 b898481cf7 Merge branch 'Fatima' into development_mirza 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/extensions/widget_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/landing/dashboard.dart
#	pubspec.lock
#	pubspec.yaml
 4 years ago
Sikander Saleem 384aa8d9b4 wokrlist api's added & improvements 4 years ago
Fatimah Alshammari 0cd37ce0fa fix calendar 4 years ago
devmirza121 68729ddbb9 NFC Attendance implement 4 years ago
devmirza121 681fe7fb38 Merge branch 'master' into development_mirza 
# Conflicts:
#	lib/ui/login/login_screen.dart
 4 years ago
Sikander Saleem 4b5ab2cd7f wokrlist api's added & improvements 4 years ago
devmirza121 a4465a8c23 Merge branch 'master' into development_mirza 
# Conflicts:
#	lib/ui/login/login_screen.dart
 4 years ago
devmirza121 c4b7046a90 Dashboard API's 1.3 4 years ago
Sikander Saleem e7a67cc58d Merge branch 'master' into development_sikander 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/locale_keys.g.dart
#	lib/main.dart
#	lib/models/generic_response_model.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	pubspec.yaml
 4 years ago
Sikander Saleem 6b9ea200ad login flow added. 4 years ago
devmirza121 fb8d6c7b20 Dashboard API's 1.1 4 years ago
Sikander Saleem e3d331a223 loading icon added 4 years ago
Sikander Saleem f1beefbc46 login apis, models & forgot password screen added. 4 years ago
Sikander Saleem c6ac45fc3d Merge branch 'master' into development_sikander 
# Conflicts:
#	lib/classes/colors.dart
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/landing/dashboard.dart
 4 years ago
Sikander Saleem f48e09b2d1 forgot password screen added. 4 years ago
Sikander Saleem c6cb3bbe0e forgot password screen added. 4 years ago
tall3at bf8dce2afd Work List screen 4 years ago
Sikander Saleem f16b3c5c79 dashboard ui added. 4 years ago
Sikander Saleem 78ca9e2c70 icons added & dashboard ui 4 years ago
Sikander Saleem 311ebd9c13 confirm login screen added & structure improvement. 4 years ago
Sikander Saleem 761b5abbab model improvements 4 years ago
Sikander Saleem 8470495332 Gradle updated, fonts added & structure improvements 4 years ago
tall3at 89f6df8c77 basic structure 4 years ago