Commit Graph

140 Commits (cca95cee6a65146e2021d327e9a3b6e90ce5f6dd)

Author SHA1 Message Date
Aamir Muhammad 4e96108207 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 0db4a5a7cd Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad fb97319164 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad f6f801f9cf Chat Fixes & User Chat Counter 3 years ago
Sikander Saleem 3438b9c174 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem b718f96c3a counter direction issue fix. 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 545c33ee4a Chat Fixes 3 years ago
Aamir Muhammad fa36cd7ddf Advertisement Image/ Video Module 3 years ago
Aamir Muhammad fa7e08c215 Advertisement Image/ Video Module 3 years ago
Aamir Muhammad db3e1427c5 Advertisement Image/ Video Module 3 years ago
Aamir Muhammad ed15ce92b6 Chat Updates & Stability 3 years ago
Aamir Muhammad 68ebecf98a Chat Updates & Stability 3 years ago
Aamir Muhammad eb7e5a4837 Chat Updates & Stability 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
haroon amjad 1ec45c35aa Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
3 years ago
haroon amjad 4f88f30368 updates 3 years ago
Aamir Muhammad 5708c93ae5 Chat Updates 3 years ago
Aamir Muhammad a64ae80a4a Chat Updates 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 00dee97bca Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
haroon amjad c22556d9b6 fixes 3 years ago
haroon amjad d77f9a3362 Worklist fixes 3 years ago
haroon amjad c87a00df6a Jira fixes 3 years ago
haroon amjad e1030d73b2 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app 3 years ago
haroon amjad 09d2d9936b Jira Fixes 3 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and font settings 3 years ago
FaizHashmiCS22 3457136cdc Updated the Banner calling 3 years ago
FaizHashmiCS22 ab59821428 Merge conflicts resolved 3 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
3 years ago
FaizHashmiCS22 38c7d78db3 Added UI Components for Marathon Module.. WIP 3 years ago
Sikander Saleem 0ad9d4dd9e Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem defa8a8adb redirection added on worklist detail when approve or reject. 3 years ago
haroon amjad aabc86290a Language change option added in app drawer 3 years ago
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 3 years ago
haroon amjad 4024e5fd3f updates & fixes 3 years ago
haroon amjad 8f9fb5eb1d image fixes 3 years ago
haroon amjad c8d25c997b Revert "updates"
This reverts commit 981fc9f8d207334488189c9051042d3792452592.
3 years ago
haroon amjad da7929bf3e updates 3 years ago
haroon amjad 847b9df6fc date fix in dashboard 3 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 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
Aamir Muhammad 963dcce941 adding chat option on dashboard 3 years ago
Sikander Saleem d26b7e0753 worklist improvements 3 years ago
Sultan khan 398880c4ad bug fixes 3 years ago
haroon amjad 866bb8a29e Pull to refresh, Items for Sale & Offers n Discounts fixes 3 years ago
Sikander Saleem 9ce042e7d3 bussiness card improvement. 3 years ago
haroon amjad eb29553d26 NFC Fixes 3 years ago
Sikander Saleem 97bd497866 Merge branch 'master' into development_sikander 3 years ago
Fatimah Alshammari 8fa4670392 fix issues 3 years ago
Sikander Saleem 4b935f1dc5 leave balance dashboard added. 3 years ago
Sikander Saleem 7eadd97869 item for sale ui improvements & translation added. 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 a05d037211 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/colors.dart
#	lib/extensions/string_extensions.dart
#	lib/ui/screens/announcements/announcement_details.dart
#	lib/ui/screens/announcements/announcements.dart
#	lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
#	lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
3 years ago
haroon amjad 52438ce711 offers & discounts implemented 3 years ago
haroon amjad 028caf1379 Offers & Discounts implemented 3 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 3 years ago
haroon amjad a855e535cd Item for sale implemented 3 years ago
Sikander Saleem 9b50c2cf31 mark attendance improvement. 3 years ago
Sikander Saleem 3fcbd9946a configs for ios. 3 years ago
Sikander Saleem 04520250a5 badge on work list in bottom navigation bar. 3 years ago
Sikander Saleem 68146ecd97 dynamic forms finalized & improvements 3 years ago
Fatimah Alshammari aca788ae26 fix translations 3 years ago
devmirza121 8fe51a654c Merge branch 'master' into development_mirza
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/main.dart
#	lib/ui/landing/today_attendance_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
3 years ago
Fatimah Alshammari 57bf34a93a fix translation. 3 years ago
devmirza121 2ced8313da QR, Digital Card & Employee ID Implementation 3 years ago
Sikander Saleem f1c36b5821 monthly pay slip added. 3 years ago
haroon amjad e045374703 Not found svg added, Pending transactions, Announcements. 3 years ago
Sultan Khan 6e86c0ba38 profile details 3 years ago
Sultan Khan 82570b9ba6 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Sikander Saleem 25d020441c my attendance working cont-1 4 years ago
Sultan Khan 2f395f29df Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Sultan Khan ff17adfd09 Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Sikander Saleem 9b5147b565 merge improvements 4 years ago
Sultan Khan 06b3726d4a Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 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
devmirza121 68729ddbb9 NFC Attendance implement 4 years ago
Sultan Khan da6b935c0b subpages changes 4 years ago
devmirza121 681fe7fb38 Merge branch 'master' into development_mirza
# Conflicts:
#	lib/ui/login/login_screen.dart
4 years ago
Sikander Saleem 4b5ab2cd7f wokrlist api's added & improvements 4 years ago
devmirza121 c4b7046a90 Dashboard API's 1.3 4 years ago
devmirza121 b6670289b1 Dashboard API's 1.2 4 years ago
devmirza121 fb8d6c7b20 Dashboard API's 1.1 4 years ago