Commit Graph

54 Commits (d651b3438147fa4b3036d6b8538b141e99c9de81)

Author SHA1 Message Date
Aamir Muhammad d651b34381 Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade
# Conflicts:
#	android/app/build.gradle
#	android/build.gradle
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/widgets/mark_attendance_widget.dart
#	pubspec.yaml
3 months ago
Aamir Muhammad cd36d61640 logins apis 4 months ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 6 months ago
Aamir Muhammad 72c178382f time sheet changes 6 months ago
Sikander Saleem 6e3fc55fde event activity added - cont 9 months ago
Sikander Saleem c35074576a offer and discount, do not show if api have issue. 9 months ago
Sikander Saleem 58962ede03 CR-6273 implemented. 2 years ago
Sikander Saleem 23b4e81170 my documents added. 2 years ago
Sikander Saleem 571b8bd7af itg active directory password change added. 3 years ago
haroon amjad 99c1f95e1f Attendance Progress screen fixes 3 years ago
haroon amjad 182fa6774e Huawei push implementation 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Sikander Saleem 0e329e8e2b ticket balance value display fixed & infant added in value. 3 years ago
haroon amjad 0d2052346e updates 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
haroon amjad 78f6ebf622 bug fixes 3 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 3 years ago
Aamir Muhammad 8d5cc7ed23 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 0f13ab65d6 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad f6f801f9cf Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 0538a3c313 Chat Fixes & Chat Media Preview Api Implementation 3 years ago
Aamir Muhammad 68ebecf98a Chat Updates & Stability 3 years ago
Aamir Muhammad eb7e5a4837 Chat Updates & Stability 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 ba588cd3a3 Merge branch 'faiz_cs' into 'master'
Added Answer Selection Status in Marathon

See merge request Cloud_Solution/mohemm-flutter-app!38
3 years ago
haroon amjad d77f9a3362 Worklist fixes 3 years ago
FaizHashmiCS22 710ec44293 Merge branch 'master' into development_faiz
# Conflicts:
#	lib/ui/login/login_screen.dart
#	lib/ui/marathon/marathon_screen.dart
3 years ago
FaizHashmiCS22 db174035ca Icons updated 3 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and font settings 3 years ago
FaizHashmiCS22 f0129399e6 Resolved issue in Release mode 3 years ago
FaizHashmiCS22 5ed9991428 Added new Intimmation Screens with Lottie 3 years ago
Sultan khan 398880c4ad bug fixes 3 years ago
Sultan khan 8d9561b570 COC changes 3 years ago
haroon amjad 866bb8a29e Pull to refresh, Items for Sale & Offers n Discounts fixes 3 years ago
Sikander Saleem a45b6aece2 improvements 3 years ago
Sikander Saleem ea2a9c541c change password screen added. 3 years ago
Sikander Saleem 4b935f1dc5 leave balance dashboard 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
Sikander Saleem b79edd701c code improvement & translation added. 3 years ago
Sikander Saleem 3cd3aaa6d3 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/ui/landing/widget/app_drawer.dart
3 years ago
Sikander Saleem 6be8510b86 drawer menu ui changed. 3 years ago
haroon amjad 52438ce711 offers & discounts implemented 3 years ago
haroon amjad 028caf1379 Offers & Discounts implemented 3 years ago
Sikander Saleem 4ebba3900c dashboard improvements, monthly attendance & vacation rule added. 3 years ago
Sikander Saleem 0786a1fa03 lint rules added. 3 years ago
Sikander Saleem 9b5147b565 merge improvements 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 a431913bb6 purchase order & move order, item history & quotation analysis added. 4 years ago