Commit Graph

64 Commits (68939f6256c1305c19c523da47314172e0acf5d0)

Author SHA1 Message Date
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