Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity
1,587 Commits
36 Branches
0 Tags
44 MiB
master_merge
master
wala_plus_with_dialog_removal
login-type
wala_plus
flutter_upgrade_with_timesheet_changes
apilevel_raise
a5_chatbot
coc-into-ensat
Courses-CR#-7150
etqan_ovr_integration
greeting_card
worklist-change
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 '9aa368dbf7'
${ noResults }
Commit Graph

191 Commits (9aa368dbf76aa965d65b2868787a9c19b415853c)

Author SHA1 Message Date
haroon amjad 11881b0ba1 hotfix for payment request WL 2 years ago
Sultan khan ea7467502f updated changes for payment worklist. 2 years ago
Sultan khan 275c2a8aa7 Merge branch 'payment_worklist_CR_6939' 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_detail_screen.dart
 2 years ago
taha.alam adc26a2435 Merge branch 'payment_worklist_CR_6939' of http://34.17.75.184/Haroon6138/mohemm-flutter-app into mohem_flutter_upgrade 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_detail_screen.dart
 2 years ago
Sultan khan 423e8551f1 changes updated 2 years ago
Sikander Saleem 030887452d generate QR Api added. 2 years ago
Sikander Saleem 2cea45f0e1 Merge branch 'master' into development_sikander 
# Conflicts:
#	lib/app_state/app_state.dart
 3 years ago
haroon amjad 43e1e4df6b forgot password changes 3 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 3 years ago
Faiz Hashmi e585ab7a8c added the text intimation to join the marathon 3 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 3 years ago
haroon amjad ed9705f18f fixes 3 years ago
haroon amjad a58d4753e4 Merge branch 'sultan-dev' into development_haroon 
# Conflicts:
#	assets/langs/en-US.json
#	lib/classes/utils.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
 3 years ago
Sikander Saleem 23b4e81170 my documents added. 3 years ago
Sultan khan 608a8fcb97 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
 3 years ago
Sultan khan 790103bdc9 chat changes 3 years ago
Sultan khan fd6058e87d Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/locale_keys.g.dart
 4 years ago
Sikander Saleem 571b8bd7af itg active directory password change added. 4 years ago
Sultan khan 9cb71b525e group chat started 4 years ago
haroon amjad 33294ee697 survey changes 4 years ago
mirza.shafique 2455e27595 hmg wifi implementation 4 years ago
Sikander Saleem 0e329e8e2b ticket balance value display fixed & infant added in value. 4 years ago
Sultan khan 61904ca5f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
 4 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 4 years ago
Sikander Saleem 0f84f9ae65 app life cycle added. 
file attachment option added on dynamic form. & improvements
 4 years ago
Faiz Hashmi 10ef069a06 Merge branch 'master' into faiz_cs 4 years ago
Faiz Hashmi a72ac34122 Updated the text 4 years ago
Sikander Saleem a165ac2e91 Merge branch 'master' into development_aamir 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
 4 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 4 years ago
Aamir Muhammad 54961c875f Ios Stream Audio 4 years ago
Faiz Hashmi 24c118a66e Removed GapTime for last question and some minor bugs fixed! 4 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 4 years ago
haroon amjad 660fdb63dd Updates & fixes 4 years ago
Faiz Hashmi 86d25d3ecc Added Privileged logic for Marathon 4 years ago
Faiz Hashmi 8ae8f6d2fe Merge branch 'master' into faiz_cs 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
 4 years ago
Faiz Hashmi 8a3ca3135b Pushing after resolving multiple times API calling issue 4 years ago
Faiz Hashmi 810920a934 Pushing after resolving multiple times API calling issue 4 years ago
Fatimah Alshammari 29c9caddde Merge branch 'master' into fatima 
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/misc/request_submit_screen.dart
 4 years ago
Fatimah Alshammari c51af6522c fix issues 4 years ago
Faiz Hashmi 603ff1b19f Committing after API replacement from SignalR => InProgress 4 years ago
Faiz Hashmi 96e52abbb9 Committing before reverting from SignalR to Apis 4 years ago
Faiz Hashmi 49b57cae08 Code Reformatting and Added Logics 4 years ago
Faiz Hashmi c57f6e5be3 Added QuestionsAnswer Statuses Handling 4 years ago
Sikander Saleem 1fb585a438 Chat Fixes 4 years ago
Aamir Muhammad 670a5fbc03 Chat Favorite Screen & Fixes 4 years ago
Aamir Muhammad 83aabd0555 Chat Favorite Screen & Fixes 4 years ago
Aamir Muhammad 55ff08c3f3 Chat Favorite Screen & Fixes 4 years ago
haroon amjad 221bf28ddd Merge branch 'master' into development_haroon 4 years ago
haroon amjad 7cc110b9a1 JIRA fixes 4 years ago
mirza.shafique 5880e22771 merge fix 4 years ago
devmirza121 f06238a93f OTP dialog new design 4 years ago
Fatimah Alshammari 79774416b4 Merge branch 'master' into fatima 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
 4 years ago
Fatimah Alshammari 69ded3dc43 fix my request 4 years ago
Sikander Saleem 1cd7cd4d76 issues fixed. 4 years ago
FaizHashmiCS22 5ed9991428 Added new Intimmation Screens with Lottie 4 years ago
FaizHashmiCS22 3d7b80b8a0 Merge branch 'master' into faiz_cs 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
 4 years ago
FaizHashmiCS22 60e7b5a2a0 Adjusted the font settings 4 years ago
FaizHashmiCS22 ab59821428 Merge conflicts resolved 4 years ago
FaizHashmiCS22 3c6e4a725f Merge branch 'master' into faiz_cs 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	pubspec.yaml
 4 years ago
Fatimah Alshammari f515c0b39a Merge branch 'master' into fatima 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
 4 years ago
Fatimah Alshammari 7b4fe5bcbc fix issues 4 years ago
FaizHashmiCS22 38c7d78db3 Added UI Components for Marathon Module.. WIP 4 years ago
Sikander Saleem defa8a8adb redirection added on worklist detail when approve or reject. 4 years ago
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 4 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 4 years ago
Sikander Saleem 200b56a992 improvements 4 years ago
Sikander Saleem d200624ac2 Merge branch 'master' into development_sikander 
# Conflicts:
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
 4 years ago
Aamir Muhammad 57ebe40b5d Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
 4 years ago
Sikander Saleem 91abaa8475 improvements. 4 years ago
Sikander Saleem d61315a5fe Merge branch 'master' into development_sikander 4 years ago
Sikander Saleem f0ec4843b4 end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed. 4 years ago
Aamir Muhammad b190a248bf Chat Implementation Version 1 4 years ago
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
 4 years ago
devmirza121 116175efaa Work list UI Change 4 years ago
Fatimah Alshammari 53dabdd853 Merge branch 'master' into fatima 4 years ago
Fatimah Alshammari be506fa059 fix issues 4 years ago
Sikander Saleem 95b60181b1 bug fixes 4 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
 4 years ago
devmirza121 8ce3a09375 Login with face and finger fixed 4 years ago
Fatimah Alshammari 07d4aadc4e added survey screen 4 years ago
Fatimah Alshammari 957c88f58f fix issues 4 years ago
Fatimah Alshammari 241172b7e7 fix issues 4 years ago
Fatimah Alshammari b7685295d9 fix design issues 4 years ago
Sikander Saleem 8e94d57dae performance evaluation improvements. 4 years ago
Sikander Saleem 2eedef7c2c Merge branch 'master' into development_sikander 4 years ago
Sikander Saleem 7eadd97869 item for sale ui improvements & translation added. 4 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
 4 years ago
Sultan Khan f3477fb5f3 perforamce page updates 4 years ago
Sikander Saleem b79edd701c code improvement & translation added. 4 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
 4 years ago
Sikander Saleem 6be8510b86 drawer menu ui changed. 4 years ago
Fatimah Alshammari 907b205d21 added subordinate leave 4 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
 4 years ago
Fatimah Alshammari 416a33b2fd fix design 4 years ago
Sikander Saleem 169a9bcc60 leave balance cont. 4 years ago
Sikander Saleem 1404715425 Vacation rule translation added. 4 years ago
Sikander Saleem 3750f2c904 Vacation rule added complete. 4 years ago
Sultan Khan 39b916bcc8 performance page added 4 years ago
Sultan Khan ff4a546e5f Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Fatimah Alshammari d52cc2d5cd Merge branch 'master' into Fatima 4 years ago