Commit Graph

1064 Commits (flutter_upgrade_with_timesheet_changes)

Author SHA1 Message Date
haroon amjad 4e7e5bc0e7 document type name updated in My Documents 2 years ago
haroon amjad 29643489d6 Added permissions for viewing files 2 years ago
haroon amjad 0728cc3dd4 Updated Mowadhafi Attachment Handling 2 years ago
haroon amjad fc3c1c057a Attachments handled in transactions list mowadhafi 2 years ago
Haroon6138 7faf1ca530 Merge pull request 'half day leave bug fixed' (#15) from sultan-dev into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/15
2 years ago
haroon amjad bd46589607 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app 2 years ago
haroon amjad a411b8e978 File picker permission issue fixed 2 years ago
Sultan khan 74bc09d5d6 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Sultan khan c86d9f4678 termination work-list fixed 2 years ago
Sikander Saleem 449c93649a multiple survey added. 2 years ago
Sikander Saleem d1e2d0f59b Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Faiz Hashmi 5723b64234 Join MarathonProviderFix 2 years ago
Sikander Saleem 610d4788c2 parameter added in survey. 2 years ago
Faiz Hashmi ada971c7e4 Merge branch 'master' into faiz_dev_marathon_text_fix
# Conflicts:
#	lib/classes/consts.dart
2 years ago
Faiz Hashmi 753d3de3c2 Join MarathonProviderFix 2 years ago
Sultan khan d4a795dda1 half day leave bug fixed 2 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 2 years ago
haroon amjad a2ed4e52f3 Marathon changes 2 years ago
Faiz Hashmi 684a200285 Join MarathonProviderFix 2 years ago
Faiz Hashmi 9a6d2d44e1 before staring participant fix. 2 years ago
haroon amjad 52d389b268 In App update implemented 2 years ago
haroon amjad 5fae260ffa Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app 2 years ago
haroon amjad ff908bd2a7 updates 2 years ago
Faiz Hashmi e585ab7a8c added the text intimation to join the marathon 2 years ago
Sultan khan 88be17249d Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
2 years ago
Sultan khan c9886be2d8 work list ITG str change 2 years ago
Sultan khan d7f45fa0b9 ITG change pushed. 2 years ago
Aamir Muhammad 6cf7340417 Business Card Design Update 2 years ago
Sultan khan 6d92a78843 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev 2 years ago
Sultan khan c56c9533b2 date format issue fixed. 2 years ago
devamirsaleemahmad 12ec0a25ee business trip settlement fix. 2 years ago
haroon amjad 74b12391d2 update to store for document upload CR 2 years ago
Sikander Saleem 7f6f240590 CR-6273 improvement. 2 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 2 years ago
haroon amjad 281f0bab78 updates 2 years ago
haroon amjad ed9705f18f fixes 2 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
2 years ago
haroon amjad a48d703642 ITG ADs update 2 years ago
Sultan khan 333dba3777 business mission issue fixed. 2 years ago
haroon amjad 5098aa7f90 my docs upload fix 2 years ago
haroon amjad 0fd1c8c96b Merge branch 'master' into development_haroon 2 years ago
haroon amjad e39526b5eb Updates & fixes 2 years ago
Sikander Saleem 23b4e81170 my documents added. 2 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 2 years ago
haroon amjad 59116b700a Location check added 2 years ago
haroon amjad 4aa35349e1 VersionID Update 2 years ago
haroon amjad 15c8e80799 ERM Video fixes 2 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
2 years ago
Sultan khan aca223c700 business trip fixed 2 years ago
Sultan khan 790103bdc9 chat changes 2 years ago
haroon amjad ab1aa33ff3 notifications update 2 years ago
haroon amjad 9030b9bc81 Notification details implemented 2 years ago
haroon amjad f8c207d33f updates 2 years ago
haroon amjad d7ab1c8dc2 PageView added to PR Info page 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
3 years ago
haroon amjad 45fdb4a466 updates 3 years ago
haroon amjad 1f369e9122 survey updates 3 years ago
haroon amjad 1dca3076d9 Survey dynamic questions 3 years ago
haroon amjad c0b728d8f4 Merge branch 'master' into development_haroon 3 years ago
Sikander Saleem 879e2aa561 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 571b8bd7af itg active directory password change added. 3 years ago
haroon amjad 6e35a6f9cc Confirm dialog in worklist fixed 3 years ago
haroon amjad b1e140fb75 PR Details implemented 3 years ago
Sultan khan 9cb71b525e group chat started 3 years ago
haroon amjad babe36232e Image slider fixed 3 years ago
haroon amjad 064be6d195 updates & fixes 3 years ago
Sikander Saleem dc458f126e Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem cd091b696a worklist pagination added. 3 years ago
Sikander Saleem 227855a6a5 dynamic text field improvement. 3 years ago
Sikander Saleem d971f4a651 po worklist forward & approve and forward RespondAttributeList payload improvement. 3 years ago
Faiz Hashmi 1dc6e1ae67 Reduced the option selection threshold from One to Zero 3 years ago
haroon amjad c34d8a2633 Location updates 3 years ago
haroon amjad 33294ee697 survey changes 3 years ago
haroon amjad 3c15f168d3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app 3 years ago
haroon amjad a9e9e51f86 Version ID changed 3 years ago
mirza.shafique 13d8aac22e ERM fixes 3 years ago
mirza.shafique 7d7acfa2df Merge branch 'master' into development_mirza
# Conflicts:
#	lib/main.dart
3 years ago
haroon amjad 204aeebe5f Item for sale updates 3 years ago
haroon amjad e2cb0a3dec Add attachment fix 3 years ago
Faiz Hashmi e59b315438 Reduced the option selection threshold from One to Zero 3 years ago
haroon amjad 724227fc12 Item for sale attachment updates 3 years ago
haroon amjad d49a030580 PR details from PO implemented 3 years ago
haroon amjad 1ebcbd1079 ERM Channel Audio playback implemented 3 years ago
haroon amjad 379015ca6c chat privilege added 3 years ago
haroon amjad 4bac19f9b8 Platform ID & Huawei fixes 3 years ago
haroon amjad 2911886803 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 72501fd0d9 ITG Ads fix 3 years ago
Faiz Hashmi 8f1c223469 removed google api availability 3 years ago
Faiz Hashmi 990b830bfa Added test Dialog for Huawei 3 years ago
Faiz Hashmi 601a0cdbfd Added test Dialog for Huawei 3 years ago
Faiz Hashmi 8439b58759 Added Huawei Checks 3 years ago
haroon amjad 13822c2534 Merge branch 'faiz_cs' into 'master'
QuickFix

See merge request Cloud_Solution/mohemm-flutter-app!170
3 years ago
Faiz Hashmi 7d0c5598a0 QuickFix 3 years ago
haroon amjad 8f83f89dc7 Item for sale improvements 3 years ago
haroon amjad 5e22bcc1da ERM Channel 3 years ago
haroon amjad ca369f2243 huawei attendance fixes 3 years ago
haroon amjad 736f9c70e9 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 88abc86e39 version id update 3 years ago
haroon amjad 20109cbe9e Attendance fixes 3 years ago
Faiz Hashmi f37f748d6f QuickFix 3 years ago
Faiz Hashmi 9469997d33 Updated 3 years ago
haroon amjad a142a5e8df Merge branch 'master' into development_haroon 3 years ago
haroon amjad 3b13701cec Android fixes 3 years ago
Faiz Hashmi dc864bcd05 Minor Fix 3 years ago
Faiz Hashmi 3c57f8fd80 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi 8671403385 Minor Fix 3 years ago
haroon amjad 851c70e60b Merge branch 'master' into development_haroon 3 years ago
haroon amjad 516f7ca301 Crashlytics implemented 3 years ago
Faiz Hashmi 14cb0b7e1f Added Marathon Specific Language Support 3 years ago
haroon amjad 053a64d5ed Merge branch 'master' into development_haroon 3 years ago
haroon amjad aacc7c6437 icon change 3 years ago
Faiz Hashmi 67af43df14 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi 8f33d48c23 Added Marathon Specific Language Support 3 years ago
haroon amjad d3c5fd1467 Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
3 years ago
haroon amjad 8949a8b11b attendance fix 3 years ago
haroon amjad 9a30ddcf44 Huawei fixes 3 years ago
haroon amjad 99c1f95e1f Attendance Progress screen fixes 3 years ago
Faiz Hashmi e940c7ad8f Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi e73b88c651 minor fix 3 years ago
haroon amjad 6436062642 HMG Mohemm Setup 3 years ago
haroon amjad b760dc44a5 Updates & fixes 3 years ago
haroon amjad e0d02554b1 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 182fa6774e Huawei push implementation 3 years ago
Sikander Saleem 2b35c3d8d6 Merge branch 'development_aamir' into 'master'
Chat  Fix & Web RTC -- Inprogress

See merge request Cloud_Solution/mohemm-flutter-app!154
3 years ago
Aamir Muhammad 2303daa1ad Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 3 years ago
mirza.shafique 2455e27595 hmg wifi implementation 3 years ago
Faiz Hashmi 33af55c28d some fixes while testing 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Aamir Muhammad a78b5b0a19 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
3 years ago
Aamir Muhammad c55c3d6a91 Notification 3 years ago
haroon amjad be32b9c4a2 attendance fixes 3 years ago
Sikander Saleem 1f04dfced2 Merge branch 'development_mirza' into 'master'
Development mirza

See merge request Cloud_Solution/mohemm-flutter-app!149
3 years ago
haroon amjad 06828cd711 Merge branch 'faiz_cs' into 'master'
Minor Fixes While Testing

See merge request Cloud_Solution/mohemm-flutter-app!148
3 years ago
Aamir Muhammad 4a431fb752 Notification Fix 3 years ago
mirza.shafique d458e8ac45 Merge branch 'master' into development_mirza 3 years ago
Faiz Hashmi f72f49c719 Merge branch 'master' into faiz_cs 3 years ago
Sikander Saleem 550e26dce1 Attendance loader fix 3 years ago
Faiz Hashmi 580c7d62f5 some fixes while testing 3 years ago
Sikander Saleem a59656184f session log out check change. 3 years ago
Sikander Saleem 0e329e8e2b ticket balance value display fixed & infant added in value. 3 years ago
haroon amjad 0c7771dab9 updates 3 years ago
haroon amjad 7257fa88cc Merge branch 'master' into development_haroon 3 years ago
haroon amjad 9a2a85f848 updates 3 years ago
haroon amjad 6749074479 Merge branch 'master' into development_haroon 3 years ago
Sultan khan b227f11c7b Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
haroon amjad 59885b29f6 Merge branch 'development_aamir' into 'master'
notification to chat navigate

See merge request Cloud_Solution/mohemm-flutter-app!142
3 years ago
haroon amjad a07563e7b1 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 9dd53ad3ab Push notification fixes 3 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
3 years ago