Commit Graph

15 Commits (8120a69fd3c7ff3de0428b337b5137c682248c39)

Author SHA1 Message Date
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
2 years ago
Sikander Saleem b79edd701c code improvement & translation added. 2 years ago
Sikander Saleem 3cd3aaa6d3 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/ui/landing/widget/app_drawer.dart
2 years ago
Sikander Saleem 6be8510b86 drawer menu ui changed. 2 years ago
haroon amjad 52438ce711 offers & discounts implemented 2 years ago
haroon amjad 028caf1379 Offers & Discounts implemented 2 years ago
Sikander Saleem 4ebba3900c dashboard improvements, monthly attendance & vacation rule added. 2 years ago
Sikander Saleem 0786a1fa03 lint rules added. 2 years ago
Sikander Saleem 9b5147b565 merge improvements 3 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
3 years ago
Sikander Saleem a431913bb6 purchase order & move order, item history & quotation analysis added. 3 years ago
devmirza121 68729ddbb9 NFC Attendance implement 3 years ago
Sikander Saleem 4b5ab2cd7f wokrlist api's added & improvements 3 years ago
devmirza121 b6670289b1 Dashboard API's 1.2 3 years ago
devmirza121 fb8d6c7b20 Dashboard API's 1.1 3 years ago