Commit Graph

1145 Commits (cd399a032c77191f2ed30278e5ced21d23fca41f)

Author SHA1 Message Date
FaizHashmi cc03ab6a80 minor changes 3 weeks ago
FaizHashmi 6aec5b1a8c refactoriåtion 3 weeks ago
FaizHashmi e134e8d4e5 refactoriåtion 3 weeks ago
Sultan khan 825845b4c3 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  changhes
  toast gravity change

# Conflicts:
#	lib/ui/landing/dashboard_screen_for_dependet.dart
3 weeks ago
Sultan khan 0a270bd323 login flow updated 3 weeks ago
FaizHashmi fa1cbf866b changhes 3 weeks ago
FaizHashmi ae816a1f8f toast gravity change 3 weeks ago
FaizHashmi f19a1441b3 url change 3 weeks ago
FaizHashmi 857d1e74ac Merge branch 'wala_plus' into wala_plus_with_dialog_removal 3 weeks ago
FaizHashmi e05e97a536 Updated the dialogs to toast 3 weeks ago
Sultan khan d6310e5233 search 3 weeks ago
FaizHashmi aff3bc2fc0 fixed the dependent flow. 3 weeks ago
Sultan khan 2cc22bdc21 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:
  dependent_details_screen.dart fix
3 weeks ago
FaizHashmi 269a1a4da8 dependent_details_screen.dart fix 3 weeks ago
Sultan khan 87bcdf72cb 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:
  UI Fixes
3 weeks ago
Sultan khan deae01a677 no message 3 weeks ago
FaizHashmi 771b16c519 UI Fixes 3 weeks ago
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
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 c42c30658f no message 3 weeks ago
FaizHashmi f079b84614 km away fixed. 3 weeks ago
FaizHashmi f05aafbd52 km away fixed. 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
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 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 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
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
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 bea191e987 Merge branch 'flutter_upgrade_with_timesheet_changes' 2 months ago
haroon amjad 89b77c205b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app 2 months ago
Sultan khan bfd1ce2eab add family member issue fixed. 2 months ago
haroon amjad 64e2b2c42a updates 2 months ago
Sultan khan a9f0cb8216 CEI, worklist po pr filter, date issue in absence dynamic screen 2 months ago
Sultan khan f218dab93e PR changes done. 4 months ago
Sultan khan a5e0e1165e Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Timer Counter & Dead line Counter Null Handling
4 months ago
aamir-csol e9fc205bee Timer Counter & Dead line Counter Null Handling 6 months ago
Sultan khan a37ce5c666 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  update to stores, VersionID 10.0
  ENSAT, Notification Timer Counter & Dead Line

# Conflicts:
#	lib/ui/screens/ticket/ticket_detailed_screen.dart
6 months ago
Sultan khan a6454776dd fixes for monthly calendar color coding .. and ticket screen 6 months ago
haroon amjad 4fc9c6a295 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
7 months ago
haroon amjad a2505c1575 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 7 months ago
aamir-csol 1d3f33ea81 ENSAT, Notification Timer Counter & Dead Line 7 months ago
Sultan khan 2c2d16674e calendar issue fixed and courses enabled. 7 months ago
haroon amjad deb08dac31 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
7 months ago
haroon amjad 7c48a646cb updates 7 months ago
haroon amjad 73aedba023 updates 7 months ago
Aamir Saleem Ahmad 598ce5d7fe ticket enable 7 months ago
haroon amjad a9485d853f Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
7 months ago
haroon amjad 0dcd780359 updates 7 months ago
aamir-csol de3f091ef1 dashboard 7 months ago
aamir-csol 279fbc85d1 Merge branch 'master' into flutter_upgrade_with_timesheet_changes 7 months ago
aamir-csol ecc0869a23 Ticket 7 months ago
aamir-csol 90faa4dd5e Merge branch 'Courses-CR#-7150' into flutter_upgrade_with_timesheet_changes
# Conflicts:
#	lib/api/api_client.dart
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	lib/ui/screens/ticket/ticket_detailed_screen.dart
#	lib/widgets/sso_webview_widget.dart
7 months ago
aamir-csol e1f2819fe6 Ticket 7 months ago
Sultan khan 8ea831c2c4 color coding changes on the monthly leave calendar and prod e-learning URL added. 7 months ago
aamir-csol a131179c71 VHR-279 7 months ago
aamir-csol 9f4e9943cf VHR-279 7 months ago
Haroon Amjad 5ad012d602 Banner updates, VersionID 9.7 sent to stores 8 months ago
haroon amjad 54a2e7b449 Merge branch 'master_mohemm_flutter' 8 months ago
haroon amjad ca8211bf9d updates 8 months ago
haroon amjad 3391cf49ef updates 8 months ago
haroon amjad 3bafd74857 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
8 months ago
haroon amjad 352c85dcd8 updates 8 months ago
haroon amjad 057e71e3c0 Etqan fixes, Update to Stores VersionID 9.6 8 months ago
haroon amjad e4d182912c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	assets/langs/en-US.json
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
8 months ago
haroon amjad 480d9d466f updates 8 months ago
haroon amjad bdaccf133c updates 8 months ago
Sultan khan 5da81968d7 Merge branch 'greeting_card' into Courses-CR#-7150
* greeting_card:
  Greeting
  Greeting Card

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/generated/codegen_loader.g.dart
#	lib/provider/dashboard_provider_model.dart
8 months ago
Sultan khan b240f55aff Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into Courses-CR#-7150
# Conflicts:
#	lib/ui/landing/widget/menus_widget.dart
8 months ago
Sultan khan 3343e4fe10 sso and courses in app browser updated 8 months ago
haroon amjad 2c9db30d6a Merge branch 'master' into etqan_ovr_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/provider/dashboard_provider_model.dart
8 months ago
haroon amjad eb3eb1d102 updates 8 months ago
aamir-csol 257b803cce QIPS-1205 8 months ago
aamir-csol a958257ce9 Greeting 8 months ago
aamir-csol facb3bf4e6 QIPS-1205 8 months ago
aamir-csol 71d03ba664 QIPS-1205 8 months ago
aamir-csol 9f663df3cc QIPS-1205 8 months ago
aamir-csol ba8908d4eb Greeting Card 8 months ago
aamir-csol a8f390d49f QIPS-1175,QIPS-1179,QIPS-1180 8 months ago