Commit Graph

131 Commits (b96c460d6b268a9a138a298ef2fab63bfa0f2c78)

Author SHA1 Message Date
Faiz Hashmi 7f02dff689 Added the Sequence Number in Question Options and Removed isCorrectOption 3 years ago
Sikander Saleem 3083a0e9da improvement. 3 years ago
Sikander Saleem 83820a8a20 worklist detail remove type lists when become empty. 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 fe02776a69 leave balance issues fixed. 3 years ago
Aamir Muhammad e40cd2c5c8 Chat Error Handling & Voice 3 years ago
Faiz Hashmi 2caf5b6caa Pushing for testing 3 years ago
haroon amjad 4a513c08d9 fixes 3 years ago
Faiz Hashmi 8ae8f6d2fe Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 years ago
Faiz Hashmi 810920a934 Pushing after resolving multiple times API calling issue 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 d25e608565 bug fixes 3 years ago
haroon amjad 6efc07fcab Jira fixes 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
Faiz Hashmi f31db58a76 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Faiz Hashmi 603ff1b19f Committing after API replacement from SignalR => InProgress 3 years ago
haroon amjad f3ffdc0088 marathon URL update 3 years ago
haroon amjad 8133542ae0 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
haroon amjad f63e0e1e7c Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/work_list/worklist_detail_screen.dart
3 years ago
Faiz Hashmi 96e52abbb9 Committing before reverting from SignalR to Apis 3 years ago
mirza.shafique ef5136ebfa worklist animation & loader 3 years ago
Aamir Muhammad f6f801f9cf Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad cecb2d59e9 Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image 3 years ago
Faiz Hashmi 49b57cae08 Code Reformatting and Added Logics 3 years ago
Sikander Saleem 741259505d marathon api const added. 3 years ago
Faiz Hashmi 2f825151a0 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/marathon/marathon_intro_screen.dart
#	lib/ui/marathon/marathon_provider.dart
#	lib/ui/marathon/marathon_screen.dart
#	lib/ui/marathon/marathon_winner_selection.dart
#	lib/ui/marathon/widgets/question_card.dart
#	pubspec.yaml
3 years ago
Sikander Saleem 91a0be7974 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Sikander Saleem 7d651c247a marathon improvements. 3 years ago
Faiz Hashmi 59ad00ca2a Fetched Questoins and Added Answer Interactivity 3 years ago
Aamir Muhammad 0538a3c313 Chat Fixes & Chat Media Preview Api Implementation 3 years ago
Faiz Hashmi 904e4df424 Questions Fetching process in Progress 3 years ago
Aamir Muhammad 545c33ee4a Chat Fixes 3 years ago
Sikander Saleem ccb89584e2 chat structure issues. 3 years ago
Aamir Muhammad db3e1427c5 Advertisement Image/ Video Module 3 years ago
Faiz Hashmi cbe251829f Added HubConnection Code 3 years ago
Faiz Hashmi 790cb727e9 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
3 years ago
Faiz Hashmi 35a4b780a7 Added initial APIs for Marathon 3 years ago
Aamir Muhammad 2e88275285 Chat Updates & Counter Event Modifications 3 years ago
haroon amjad 03c488c663 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
#	lib/widgets/app_bar_widget.dart
3 years ago
Aamir Muhammad 2546fb52a9 Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Sikander Saleem 3cac5eebbc Chat Fixes 3 years ago
Aamir Muhammad 00dee97bca Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
haroon amjad dd0d4b82a3 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad ab6f265ef4 Chat Favorite Screen & Fixes 3 years ago
Sikander Saleem 55187f4e36 Chat Fixes 3 years ago
haroon amjad 80e18911b7 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad b18ebf7a54 Chat Favorite Screen & Fixes 3 years ago
Sikander Saleem 29626ea408 Chat Fixes 3 years ago
Sikander Saleem 93e7f7c862 Chat Fixes 3 years ago
haroon amjad cffe185cda ITG Count fixes 3 years ago
mirza.shafique ea8fd42abd Otp clear & resend fixed 3 years ago
Aamir Muhammad 67f4fdef28 Chat Fixes & Favorite Api Implementation 3 years ago
Aamir Muhammad 8ba3dcf43b Chat Fixes & Favorite Api Implementation 3 years ago
Aamir Muhammad 96e1be7823 Chat Delivered&Seen Event Added. 3 years ago
Aamir Muhammad 7408e24245 Chat Delivered&Seen Event Added. 3 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
3 years ago
Sikander Saleem 91abaa8475 improvements. 3 years ago
Aamir Muhammad b190a248bf Chat Implementation Version 1 3 years ago
Sultan khan 398880c4ad bug fixes 3 years ago
Sultan khan 8d9561b570 COC changes 3 years ago
Sikander Saleem 95b60181b1 bug fixes 3 years ago
haroon amjad dd26452663 Fixes & updates 3 years ago
haroon amjad c14bfd22db Mohemm Android build given to QA 3 years ago
haroon amjad e6405b2251 NFC fixes 3 years ago
haroon amjad a855e535cd Item for sale implemented 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
devmirza121 42510259bc Worklist & Wifi attendance 3 years ago
devmirza121 a03eb8b11a Worklist (ITG sikp, Delegats and HR multiple requests) 3 years ago
Sultan Khan b5a5399b95 profile 3 years ago
Sikander Saleem f2b378e33a dynamic forms cont. 3 years ago
devmirza121 ec845756be Login Issue Fix's 3 years ago
devmirza121 68729ddbb9 NFC Attendance implement 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 baa7182655 Dashboard API's 1.0 4 years ago
Sikander Saleem f1beefbc46 login apis, models & forgot password screen added. 4 years ago
Sikander Saleem bf08417bfa login apis and models added. 4 years ago
Sikander Saleem 311ebd9c13 confirm login screen added & structure improvement. 4 years ago