Commit Graph

16 Commits (185192e9a28e375efa3efbaaf84e49feab65793e)

Author SHA1 Message Date
Aamir Muhammad 28d977017e Sultan Merge 2 years ago
Aamir Muhammad 2f22519d86 Merge remote-tracking branch 'origin/sultan-dev' into development_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/api/chat/chat_api_client.dart
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated_plugin_registrant.dart
#	lib/main.dart
#	lib/provider/chat_provider_model.dart
#	lib/ui/chat/group_chat_detaied_screen.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	lib/widgets/image_picker.dart
#	pubspec.yaml
2 years ago
Sikander Saleem 3702bac7c2 voip merge conflicts resolve 2 years ago
Aamir Muhammad 23820e7e5e Ios Voip Kit 3 years ago
Aamir Muhammad 364d1292a0 OneSignal Api 3 years ago
Aamir Muhammad 8aa92d127c End Call 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
haroon amjad d66f841ca4 App security implemented, Offers & discounts fixes 3 years ago
haroon amjad c436908d25 updates & fixes 3 years ago
haroon amjad c2a4df89bb offers & discouts 3 years ago
haroon amjad 8b0bae0891 Worklist updates 3 years ago
haroon amjad 866bb8a29e Pull to refresh, Items for Sale & Offers n Discounts fixes 3 years ago
Sikander Saleem b79edd701c code improvement & translation added. 4 years ago
haroon amjad 50f203cd55 Updates & fixes 4 years ago
haroon amjad 028caf1379 Offers & Discounts implemented 4 years ago