Commit Graph

1573 Commits (4fc9c6a295cbaca5fa5b3ce6ff957d21e3241a3c)
 

Author SHA1 Message Date
haroon amjad 4fc9c6a295 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
17 hours ago
haroon amjad a2505c1575 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 17 hours ago
haroon amjad 72656a3564 update to stores, VersionID 10.0 17 hours ago
aamir-csol 1d3f33ea81 ENSAT, Notification Timer Counter & Dead Line 18 hours ago
Sultan khan 4a09bbdf1b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app 2 days ago
Sultan khan 2c2d16674e calendar issue fixed and courses enabled. 2 days ago
haroon amjad deb08dac31 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
2 weeks ago
haroon amjad 7c48a646cb updates 2 weeks ago
haroon amjad 73aedba023 updates 2 weeks ago
haroon amjad 9763c7c014 Update to stores, VersionID 9.9 2 weeks ago
Sultan khan 33829a2ab3 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  ticket enable
  dashboard
  dashboard
  Ticket
  Ticket
  color coding changes on the monthly leave calendar and prod e-learning URL added.
  VHR-279
  VHR-279
  Alma
  Banner updates, VersionID 9.7 sent to stores
  updates
  Etqan fixes, Update to Stores VersionID 9.6
  updates
  Greeting
  Greeting Card
  Ticket Attachments
  Survey title key fix
2 weeks ago
Aamir Saleem Ahmad 598ce5d7fe ticket enable 2 weeks ago
haroon amjad a9485d853f Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
2 weeks ago
haroon amjad 0dcd780359 updates 2 weeks ago
aamir-csol 8260a65bdd dashboard 3 weeks ago
aamir-csol de3f091ef1 dashboard 3 weeks ago
aamir-csol 279fbc85d1 Merge branch 'master' into flutter_upgrade_with_timesheet_changes 3 weeks ago
aamir-csol ecc0869a23 Ticket 3 weeks 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
3 weeks ago
aamir-csol e1f2819fe6 Ticket 3 weeks ago
Sultan khan 8ea831c2c4 color coding changes on the monthly leave calendar and prod e-learning URL added. 3 weeks ago
aamir-csol a131179c71 VHR-279 3 weeks ago
aamir-csol 9f4e9943cf VHR-279 3 weeks ago
aamir-csol deffeda015 Alma 3 weeks ago
Haroon Amjad 5ad012d602 Banner updates, VersionID 9.7 sent to stores 1 month ago
haroon amjad 54a2e7b449 Merge branch 'master_mohemm_flutter' 1 month ago
haroon amjad ca8211bf9d updates 1 month ago
haroon amjad 3391cf49ef updates 1 month ago
haroon amjad 3bafd74857 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
1 month ago
haroon amjad 352c85dcd8 updates 1 month ago
haroon amjad 152cd5c019 update 1 month ago
haroon amjad 057e71e3c0 Etqan fixes, Update to Stores VersionID 9.6 1 month 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
1 month ago
haroon amjad 480d9d466f updates 1 month ago
haroon amjad bdaccf133c updates 1 month ago
Haroon6138 16e2cc604f Merge pull request 'Courses-CR#-7150' (#20) from Courses-CR#-7150 into master
Reviewed-on: https://34.17.182.140/Haroon6138/mohemm-flutter-app/pulls/20
1 month ago
Sultan khan d5c3ce4c62 Merge branch 'master' into Courses-CR#-7150
* master:
1 month 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
1 month ago
Haroon6138 6a80e21c3f Merge pull request 'Courses-CR#-7150' (#19) from Courses-CR#-7150 into master
Reviewed-on: https://34.17.182.140/Haroon6138/mohemm-flutter-app/pulls/19
1 month 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
1 month ago
Sultan khan 3343e4fe10 sso and courses in app browser updated 1 month 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
1 month ago
haroon amjad eb3eb1d102 updates 1 month ago
aamir-csol 257b803cce QIPS-1205 2 months ago
aamir-csol a958257ce9 Greeting 2 months ago
aamir-csol dae746587f QIPS-1205 2 months ago
aamir-csol facb3bf4e6 QIPS-1205 2 months ago
aamir-csol 71d03ba664 QIPS-1205 2 months ago
aamir-csol 9f663df3cc QIPS-1205 2 months ago
aamir-csol ba8908d4eb Greeting Card 2 months ago