Commit Graph

1064 Commits (flutter_upgrade_with_timesheet_changes)

Author SHA1 Message Date
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
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
Sikander Saleem 787d6d7ab2 Merge branch 'development_mirza' into 'master'
Development mirza

See merge request Cloud_Solution/mohemm-flutter-app!140
3 years ago
mirza.shafique aa511f02ac Merge branch 'master' into development_mirza
# Conflicts:
#	lib/classes/consts.dart
#	pubspec.yaml
3 years ago
Aamir Muhammad 948689b67a Notification To Specific Screen 3 years ago
Faiz Hashmi 7e235c9d8c Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi 70861807c5 Resolved VideoPlayer Bug on IOS 3 years ago
mirza.shafique be58dfdee1 isAuthentication fixed in API Client 3 years ago
Aamir Muhammad 75eab961ce Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
3 years ago
Aamir Muhammad ffd894ca28 Notification To Specific Screen 3 years ago
Sikander Saleem dd6627f216 firebase notification token issue fix. 3 years ago
Sikander Saleem 84a07df310 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 0f84f9ae65 app life cycle added.
file attachment option added on dynamic form. & improvements
3 years ago
Aamir Muhammad 698aee3482 Notification 3 years ago
Aamir Muhammad 81a060012e Chat Fix 3 years ago
Aamir Muhammad 1eca46600d Merge branch 'master' into development_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner/Info.plist
#	lib/api/chat/chat_api_client.dart
#	lib/ui/login/login_screen.dart
3 years ago
Sikander Saleem 33da1a103d mark attendance session expire fixed 3 years ago
Sikander Saleem f8ae5b0987 mark attendance session expire fixed 3 years ago
Sikander Saleem e10ea6b023 mark attendance session expire fixed 3 years ago
Aamir Muhammad 03ae216b69 Chat fix 3 years ago
Aamir Muhammad 7152b0d57b Chat Fix 3 years ago
mirza.shafique 5f525f16a0 local network test 3 years ago
haroon amjad 311b27cf2b Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/marathon/widgets/marathon_details_card.dart
3 years ago
haroon amjad a9bf383164 Updates & fixes 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
Faiz Hashmi 7f02dff689 Added the Sequence Number in Question Options and Removed isCorrectOption 3 years ago
haroon amjad bd10bb4f1d Push notifications handler implemented 3 years ago
Faiz Hashmi 10ef069a06 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi c337b82676 Pushing before removing the isCorrectOption 3 years ago
Aamir Muhammad b152f8a6d6 Permission Issue 3 years ago
Aamir Muhammad 1f69ee262d Permission Issue 3 years ago
Faiz Hashmi a72ac34122 Updated the text 3 years ago
haroon amjad f933539395 dialog added to app settings 3 years ago
haroon amjad c763e16f41 Merge branch 'master' into development_haroon 3 years ago
haroon amjad e685cf188c updates 3 years ago
Aamir Muhammad 538fd133aa Title Fix On AppBar 3 years ago
Aamir Muhammad dbb13515fc Audio Fix 3 years ago
Sikander Saleem 377fd48693 Ios Fix 3 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
3 years ago
haroon amjad 47a274b1d3 Merge branch 'master' into development_haroon 3 years ago
Aamir Muhammad 83b8691a31 Ios Stream Audio 3 years ago
Faiz Hashmi a13a972083 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 3 years ago
Sikander Saleem 16ea3b7c66 Ios Fix 3 years ago
haroon amjad 1da23d874a Merge branch 'master' into development_haroon 3 years ago
haroon amjad 0d2052346e updates 3 years ago
Sikander Saleem 088fd6f318 Ios Fix 3 years ago
Aamir Muhammad 54961c875f Ios Stream Audio 3 years ago
Sikander Saleem 3083a0e9da improvement. 3 years ago
Faiz Hashmi ddaffe3af8 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi 24c118a66e Removed GapTime for last question and some minor bugs fixed! 3 years ago
Aamir Muhammad 5028a3b860 App Bar online / Offline & Fixes 3 years ago
Aamir Muhammad ebe353928f Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad a746b607df Fixes 3 years ago
Sikander Saleem a383a504aa improvement. 3 years ago
Sikander Saleem f21d75c24c Merge branch 'master' into development_sikander
# Conflicts:
#	lib/ui/profile/add_update_family_member.dart
3 years ago
Sikander Saleem 83820a8a20 worklist detail remove type lists when become empty. 3 years ago
Fatimah Alshammari 1c750a4084 Merge branch 'master' into fatima 3 years ago
Fatimah Alshammari b34225501c fix family member 3 years ago
Aamir Muhammad 407899a602 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/provider/chat_provider_model.dart
#	lib/ui/chat/my_team_screen.dart
3 years ago
Aamir Muhammad d096559a2f Fixes 3 years ago
Aamir Muhammad 3871d3f1e3 Fixes 3 years ago
haroon amjad 3e1fb6c6bc Merge branch 'development_haroon' into 'master'
Development haroon

See merge request Cloud_Solution/mohemm-flutter-app!123
3 years ago
haroon amjad 2ab39e0d7b updates 3 years ago
Sikander Saleem e4ab7e96d1 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
3 years ago
Sikander Saleem 1e478c9900 approve & reject button added on PO/PR & after request submission,loading issue fixed on worklist. 3 years ago
Aamir Muhammad 4f780ad0aa Fixes 3 years ago
Faiz Hashmi cdf016fc9b Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi e5310eff4e Removed Unnecessary API call 3 years ago
Aamir Muhammad 35f814b74a Merge branch 'master' into development_aamir 3 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 3 years ago
Aamir Muhammad 4635c7f3bc Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 8c3745b747 Voice Chat Fixes & Audio Player Implementation 3 years ago
Faiz Hashmi 5bb998a8d2 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/utils.dart
#	lib/ui/marathon/widgets/marathon_banner.dart
3 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 3 years ago
Sikander Saleem f39a5dec71 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/provider/chat_provider_model.dart
3 years ago
Sikander Saleem 5261f3e416 marathon placement change, worklist type list improvement. 3 years ago
haroon amjad 78f6ebf622 bug fixes 3 years ago
Aamir Muhammad 773a99e8d9 Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 09c401a157 Voice Chat Fixes & Audio Player Implementation 3 years ago
Sikander Saleem 49e9b35eff worklist setting ui improvements. 3 years ago
Sikander Saleem 642fee7331 worklist setting update data payload issue fixed. 3 years ago
Aamir Muhammad fb3b3e8e46 Voice Chat Fixes & Audio Player Implementation 3 years ago
Sikander Saleem 7131706998 password requirement check improvement. 3 years ago
Sikander Saleem dd8da2cdfe upper case check removed from forgot & change password. 3 years ago
Sikander Saleem 45a5fdad02 ios nfc mark attendance confirmation dialog issue fix. 3 years ago
Sikander Saleem 705adbc17e code format monthly attendance 3 years ago
Sikander Saleem 47b712d132 monthly attendance & ticket balance chart fix. 3 years ago
Sikander Saleem 47732d67cb drawer item align issue fixed on arabic. 3 years ago
Aamir Muhammad dd6b0c0902 Scroll to Message 3 years ago
Aamir Muhammad 5eec9dc07b chat voice message implementation 3 years ago
Aamir Muhammad 97dd82aff7 chat voice message implementation 3 years ago
haroon amjad 8a393c1e73 App update screen implemented 3 years ago
Sikander Saleem 091abc68bf IOS Fixes 3 years ago
Sultan khan e65d876223 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan 2ab1c5afdc dropdown clear issue fixed 3 years ago
Aamir Muhammad 47a697f352 chat voice message implementation 3 years ago
Faiz Hashmi 02fdfc746c Pushing stable (acc to me :p) marathon 3 years ago
haroon amjad b3782f6342 updates & fixes 3 years ago
Aamir Muhammad 12defa65ac Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 5d93451c13 chat voice message implementation 3 years ago
haroon amjad bcf67895b9 Dynamic forms & my team fixes 3 years ago
haroon amjad 374417b6bd Merge branch 'master' into development_haroon 3 years ago
Aamir Muhammad abd1fa9375 chat voice message implementation 3 years ago
Sikander Saleem 3a6d1c3273 leave balance issues fixed-2. 3 years ago
Sikander Saleem fe02776a69 leave balance issues fixed. 3 years ago
Faiz Hashmi 4cb7bbee5d Pushing while testing! 3 years ago
haroon amjad 696a6881c4 date fixes & Items of sale updates 3 years ago
Aamir Muhammad f60394cc38 chat voice message implementation 3 years ago
Aamir Muhammad ddba673970 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/generated_plugin_registrant.dart
3 years ago
Aamir Muhammad 4021eccd9f Chat Error Handling 3 years ago
haroon amjad 9c867c3041 Merge branch 'development_aamir' into 'master'
Chat Fixes & Audio Implementation -- In Progress

See merge request Cloud_Solution/mohemm-flutter-app!113
3 years ago
Aamir Muhammad e40cd2c5c8 Chat Error Handling & Voice 3 years ago
Sikander Saleem 91052f12bd Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 0077a876d9 improvements 3 years ago
haroon amjad 5be9adca31 fixes 3 years ago
Faiz Hashmi 3f7e1cd0be Pushing before updating API Structure 3 years ago
Sikander Saleem 7fc8fd9123 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Sikander Saleem 9602e95fe7 improvements 3 years ago
haroon amjad ece6a68a95 fixes 3 years ago
Aamir Muhammad f62253374d Chat Error Handling 3 years ago
Faiz Hashmi 885a1aa377 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi 58fb7a7894 Pushing for testing 3 years ago
haroon amjad 2174512d79 updates & fixes 3 years ago
haroon amjad b522aab685 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
haroon amjad dafa075e4c Merge branch 'development_aamir' into 'master'
Multiple Chat Issue

See merge request Cloud_Solution/mohemm-flutter-app!108
3 years ago
haroon amjad 660fdb63dd Updates & fixes 3 years ago
Sikander Saleem 86d6b57cbc dynamic list screen items grid view improvements 3 years ago
Aamir Muhammad 08e0af8f64 Chat Bug's Fix 3 years ago
Aamir Muhammad 3d4d5403a9 Multiple Chat Issue 3 years ago
haroon amjad 3b6f3f5c4f Address info issue fixed 3 years ago
haroon amjad 881b351505 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 631752cffa fixes 3 years ago
Aamir Muhammad cb4b95ddb4 Read Issue On Sub Page 3 years ago
Aamir Muhammad 2266ace39a Chat Fixes & Call Button Disabled 3 years ago
Aamir Muhammad 28d055c449 Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 9f91f1e83c Chat Fixes 3 years ago
haroon amjad 5f062d123a Merge branch 'master' into development_haroon 3 years ago
Sultan khan 5384d0e59c Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan 7b6e2547d7 comp-off issue fixed 3 years ago
Faiz Hashmi c1be522331 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi 2caf5b6caa Pushing for testing 3 years ago
haroon amjad a39e6808d7 fixes & updates 3 years ago
haroon amjad ff3c7be11f Merge branch 'master' into development_haroon 3 years ago
haroon amjad 243da0c775 fixes 3 years ago
Aamir Muhammad feff454e65 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
3 years ago
Aamir Muhammad 1144664d64 Images Fixes 3 years ago
Aamir Muhammad 76239d0077 Fixes 3 years ago
Faiz Hashmi 26ff2bf372 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi 86d25d3ecc Added Privileged logic for Marathon 3 years ago
haroon amjad 67c4970897 fixes 3 years ago
haroon amjad b22ecaff3a Merge branch 'master' into development_haroon 3 years ago
haroon amjad 4a513c08d9 fixes 3 years ago
Aamir Muhammad 45b4adc252 Fav Users Images Fix 3 years ago
Aamir Muhammad 2a39ee9ddc Fav Users Images Fix 3 years ago
Aamir Muhammad feb5c5071c Fav Users Images Fix 3 years ago
Aamir Muhammad ef347f1078 Sort Fix 3 years ago
haroon amjad 65e1540f97 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 43fb34c218 fixes 3 years ago
Aamir Muhammad ae559df29f Chat Fixes & Counter Updated on Signal R 3 years ago
Aamir Muhammad 668efb8412 Chat Fixes & Counter Updated on Signal R 3 years ago
Aamir Muhammad ff3592a120 Chat Fixes & Counter Updated on Signal R 3 years ago
Aamir Muhammad 30c7f5738d Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 3 years ago
haroon amjad 0502d79fc1 Merge branch 'master' into development_haroon 3 years ago
Faiz Hashmi 8ae8f6d2fe Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 years ago
Faiz Hashmi 8a3ca3135b Pushing after resolving multiple times API calling issue 3 years ago
haroon amjad 1e7ff09f14 loader uncommented 3 years ago
haroon amjad 4c53fcfdb6 updates & fixes 3 years ago
Faiz Hashmi 810920a934 Pushing after resolving multiple times API calling issue 3 years ago
haroon amjad af2cbd8c50 Merge branch 'master' into development_haroon 3 years ago
haroon amjad ecaede0deb Updates & fixes 3 years ago
Sultan khan f1b7b897cc leave balance page updated 3 years ago
Fatimah Alshammari dde200fd7a Merge branch 'master' into fatima 3 years ago
Fatimah Alshammari cd813a163f fix issues 3 years ago
haroon amjad 59b1cbec38 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 2790d18c1d fixes 3 years ago
Sultan khan a212963ad7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Sultan khan 0f38825314 bug fix 3 years ago
Sultan khan d25e608565 bug fixes 3 years ago
haroon amjad d66f841ca4 App security implemented, Offers & discounts fixes 3 years ago
haroon amjad 1a3bf90b89 Merge branch 'master' into development_haroon 3 years ago
Aamir Muhammad 8433d594a2 Chat Sort On Messages, Scroll Fix, Search Improved 3 years ago
haroon amjad 25f4bd93bc Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Sikander Saleem ae64001e63 Chat Fixes 3 years ago
Sikander Saleem fb0dff48bc Chat Fixes 3 years ago
Sikander Saleem 80c97b0a65 Chat Fixes 3 years ago
Sikander Saleem 6d026a37ba Chat Fixes 3 years ago
Aamir Muhammad 616e35f2d3 Fixes 3 years ago
Aamir Muhammad 0f7afa911a Fixes 3 years ago
Fatimah Alshammari 29c9caddde Merge branch 'master' into fatima
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/misc/request_submit_screen.dart
3 years ago
Fatimah Alshammari c51af6522c fix issues 3 years ago
Aamir Muhammad 70ffb8afd8 Fixes 3 years ago
haroon amjad 6efc07fcab Jira fixes 3 years ago
Aamir Muhammad 6a7a24349f Chat Tune Added 3 years ago
Aamir Muhammad 34c15e7026 Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad fe6e63dadb Chat Tune Added 3 years ago
Aamir Muhammad 7f043e6048 Chat Tune Added 3 years ago
Faiz Hashmi 4e4e393f3d updated endpoints 3 years ago
Faiz Hashmi ead2dcb631 Committing after API replacement from SignalR => InProgress 3 years ago
Faiz Hashmi 677a0ca275 Committing after API replacement from SignalR => InProgress 3 years ago