Commit Graph

1220 Commits (9c994d8dec2ea23942bc42368d30f9882fdf2a3d)

Author SHA1 Message Date
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 4baf5f9389 Update dependencies and remove unused keys from localization 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
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
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
6 months ago
haroon amjad a2505c1575 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 6 months ago
haroon amjad 72656a3564 update to stores, VersionID 10.0 6 months ago
aamir-csol 1d3f33ea81 ENSAT, Notification Timer Counter & Dead Line 6 months ago
Sultan khan 4a09bbdf1b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app 6 months ago
Sultan khan 2c2d16674e calendar issue fixed and courses enabled. 6 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
haroon amjad 9763c7c014 Update to stores, VersionID 9.9 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 8260a65bdd dashboard 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
aamir-csol deffeda015 Alma 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