Commit Graph

1737 Commits (ea25ce56a5a72f59cd346013d9f100e896ba19cb)
 

Author SHA1 Message Date
FaizHashmi 52821bf662 Merge remote-tracking branch 'origin/wala_plus' into wala_plus 3 weeks ago
FaizHashmi 2bcad27712 Fixes 3 weeks ago
Sultan khan 55727fe98b Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Fixes
3 weeks ago
Sultan khan 84ff0798fa no message 3 weeks ago
FaizHashmi de57bfd9eb Fixes 3 weeks ago
Sultan khan 6295fcc55c Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  km away fixed.
3 weeks ago
FaizHashmi a165bf695d Merge remote-tracking branch 'origin/wala_plus' into wala_plus 3 weeks ago
FaizHashmi a94613f693 km away fixed. 3 weeks ago
Sultan khan 42b2844dbd Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  km away fixed.
3 weeks ago
Sultan khan 92db054635 no message 3 weeks ago
Sultan khan c42c30658f no message 3 weeks ago
FaizHashmi 51ac2d8051 Merge remote-tracking branch 'origin/wala_plus' into wala_plus 3 weeks ago
FaizHashmi f079b84614 km away fixed. 3 weeks ago
Sultan khan d411df32c6 Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  km away fixed.
3 weeks ago
FaizHashmi f05aafbd52 km away fixed. 3 weeks ago
Sultan khan c3afbdc55b Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  filter api added
  tested in release mode the QR Fix
  Added business card API
3 weeks ago
FaizHashmi 74bb37593a filter api added 3 weeks ago
FaizHashmi 703f10349e tested in release mode the QR Fix 3 weeks ago
FaizHashmi 3e4f97a4c1 Added business card API 3 weeks ago
Sultan khan d48ddd3e4e Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  pushed
  text changes
3 weeks ago
FaizHashmi 51dd63badf pushed 3 weeks ago
FaizHashmi 7cd0b94f15 Merge remote-tracking branch 'origin/wala_plus' into wala_plus 3 weeks ago
FaizHashmi ae2970eed1 text changes 3 weeks ago
Sultan khan 5b29b5d42e no message 3 weeks ago
Sultan khan 94ad9bff62 Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  changes
3 weeks ago
Sultan khan 330b317164 no message 3 weeks ago
FaizHashmi 858fa7edb7 changes 3 weeks ago
Sultan khan 4541bfb1db no message 3 weeks ago
Sultan khan 9638d98b76 no message 3 weeks ago
haroon amjad 9c994d8dec Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner/Info.plist
#	lib/main.dart
#	pubspec.yaml
4 weeks ago
haroon amjad a91f26dcab Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter
# Conflicts:
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
4 weeks ago
haroon amjad 6344d78302 Merge branch 'master_merge' 4 weeks ago
Haroon Amjad 4baf5f9389 Update dependencies and remove unused keys from localization 4 weeks ago
Haroon6138 cd9f8e0b48 Merge pull request 'flutter_upgrade_with_timesheet_changes' (#21) from flutter_upgrade_with_timesheet_changes into master
Reviewed-on: https://34.17.182.140/Haroon6138/mohemm-flutter-app/pulls/21
4 weeks ago
Haroon6138 c49872f798 Merge branch 'master' into flutter_upgrade_with_timesheet_changes 4 weeks ago
Haroon Amjad f503dca074 Merge branch 'apilevel_raise' into master_merge
# Conflicts:
#	android/app/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart
#	pubspec.yaml
4 weeks ago
haroon amjad 9dcbb0d855 changes for Latest AGP 4 weeks ago
taha a6be594b3b Update dependencies and improve code structure 1 month ago
taha 9284d0e100 chat history maintained 1 month ago
Sultan khan 0175c958ef translation added. 1 month ago
Sultan khan ca6ce85d7d retailer screen added. 1 month ago
Sultan khan 782ad51823 categories updated. 1 month ago
Sultan khan 3cfe5355ef Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into flutter_upgrade_with_timesheet_changes
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Update to stores VersionID 10.1
  updates
1 month ago
Aamir Muhammad 9d7372ea4a Wala-Plus Independent Pre Login & Saved Login 2 months ago
Aamir Muhammad c0497201b6 Wala-Plus Independent Login 2 months ago
haroon amjad 41afe554e8 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
2 months ago
haroon amjad 70286096ae Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 2 months ago
haroon amjad ff6a4cc2fb update 2 months ago
haroon amjad 11155457b8 Update to stores VersionID 10.1 2 months ago
haroon amjad bea191e987 Merge branch 'flutter_upgrade_with_timesheet_changes' 2 months ago