haroon amjad
6344d78302
Merge branch 'master_merge'
1 day ago
4baf5f9389
Update dependencies and remove unused keys from localization
1 day 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
1 day ago
Haroon6138
c49872f798
Merge branch 'master' into flutter_upgrade_with_timesheet_changes
1 day ago
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
1 day ago
haroon amjad
9dcbb0d855
changes for Latest AGP
1 day ago
taha
a6be594b3b
Update dependencies and improve code structure
5 days ago
taha
9284d0e100
chat history maintained
1 week ago
0175c958ef
translation added.
1 week ago
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
2 weeks ago
haroon amjad
11155457b8
Update to stores VersionID 10.1
4 weeks ago
haroon amjad
bea191e987
Merge branch 'flutter_upgrade_with_timesheet_changes'
4 weeks ago
haroon amjad
89b77c205b
Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
4 weeks ago
bfd1ce2eab
add family member issue fixed.
1 month ago
haroon amjad
64e2b2c42a
updates
1 month ago
d2eaa863d6
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 :
CEI, worklist po pr filter, date issue in absence dynamic screen
PR changes done.
fixes for monthly calendar color coding .. and ticket screen
1 month ago
8812decd6e
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 :
Timer Counter & Dead line Counter Null Handling
update to stores, VersionID 10.0
ENSAT, Notification Timer Counter & Dead Line
calendar issue fixed and courses enabled.
Update to stores, VersionID 9.9
ticket enable
1 month ago
a9f0cb8216
CEI, worklist po pr filter, date issue in absence dynamic screen
1 month ago
f218dab93e
PR changes done.
3 months ago
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
3 months ago
e9fc205bee
Timer Counter & Dead line Counter Null Handling
5 months ago
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
a6454776dd
fixes for monthly calendar color coding .. and ticket screen
6 months ago
haroon amjad
72656a3564
update to stores, VersionID 10.0
6 months ago
1d3f33ea81
ENSAT, Notification Timer Counter & Dead Line
6 months ago
4a09bbdf1b
Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
6 months ago
2c2d16674e
calendar issue fixed and courses enabled.
6 months ago
haroon amjad
9763c7c014
Update to stores, VersionID 9.9
6 months ago
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
6 months ago
598ce5d7fe
ticket enable
6 months ago
8260a65bdd
dashboard
6 months ago
de3f091ef1
dashboard
6 months ago
279fbc85d1
Merge branch 'master' into flutter_upgrade_with_timesheet_changes
6 months ago
ecc0869a23
Ticket
6 months ago
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
6 months ago
e1f2819fe6
Ticket
6 months ago
8ea831c2c4
color coding changes on the monthly leave calendar and prod e-learning URL added.
6 months ago
a131179c71
VHR-279
6 months ago
9f4e9943cf
VHR-279
6 months ago
deffeda015
Alma
6 months ago
5ad012d602
Banner updates, VersionID 9.7 sent to stores
7 months ago
haroon amjad
3391cf49ef
updates
7 months ago
haroon amjad
057e71e3c0
Etqan fixes, Update to Stores VersionID 9.6
7 months ago
haroon amjad
bdaccf133c
updates
7 months 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
7 months ago
d5c3ce4c62
Merge branch 'master' into Courses-CR#-7150
...
* master:
7 months ago
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
7 months 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
7 months ago
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
7 months ago
3343e4fe10
sso and courses in app browser updated
7 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
7 months ago
haroon amjad
eb3eb1d102
updates
7 months ago
257b803cce
QIPS-1205
7 months ago
a958257ce9
Greeting
7 months ago
dae746587f
QIPS-1205
7 months ago
facb3bf4e6
QIPS-1205
7 months ago
71d03ba664
QIPS-1205
7 months ago
9f663df3cc
QIPS-1205
7 months ago
ba8908d4eb
Greeting Card
7 months ago
a8f390d49f
QIPS-1175,QIPS-1179,QIPS-1180
7 months ago
2c7d3bf963
QIPS-1175,QIPS-1179,QIPS-1180
7 months ago
31d1804f7a
QIPS-1175,QIPS-1179,QIPS-1180
8 months ago
haroon amjad
82c9aa8a2f
updates
8 months ago
048c9b395f
approval level commented Code for filter .
8 months ago
eea35e4d77
approval level commented Code for filter .
8 months ago
19ccee6a20
updates
8 months ago
5705619ce4
untracked icon added
8 months ago
fe583c234b
Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
...
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app :
approval level commented Code for filter .
Parking Qr Solution
CR-19329 - ERP MOWADHFAI System changes
Changed the device identifier, Update to Stores VersionID 9.5
Update to Stores for Fixed Asset Disposal, VersionID 9.4
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/api/dashboard_api_client.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
8 months ago
a426bc332e
E-learning Mandatory Courses - CR# 7150
8 months ago
12d8fd95ba
approval level commented Code for filter .
8 months ago
eebaafcf7c
approval level commented Code for filter .
8 months ago
a28eb4426b
Merge remote-tracking branch 'origin/etqan_ovr_integration' into etqan_ovr_integration
8 months ago
dfa7d9a713
approval level commented Code for filter .
8 months ago
haroon amjad
9112b26987
updates
8 months ago
e3fcc992df
approval level commented Code for filter .
8 months ago
d021c95def
Parking Qr Solution
9 months ago
74bcf3e1b7
translation
9 months ago
912f7b23f1
Merge branch 'master' into etqan_ovr_integration
9 months ago
99414bf787
Itiqan Ovr Completed
9 months ago
haroon amjad
90bf529865
CR-19329 - ERP MOWADHFAI System changes
9 months ago
4f4db082fa
Chat Bot Completed
9 months ago
f253a5e99e
Chat Bot Completed
9 months ago
5809aa157f
Ticket Attachments
9 months ago
e11b214a28
Merge remote-tracking branch 'origin/flutter_upgrade_with_timesheet_changes' into flutter_upgrade_with_timesheet_changes
9 months ago
234dce65e5
chat bot & Speech to Text
9 months ago
haroon amjad
1ee51a7597
Changed the device identifier, Update to Stores VersionID 9.5
10 months ago
haroon amjad
9b3601f06a
Update to Stores for Fixed Asset Disposal, VersionID 9.4
10 months ago
89ea554c7a
Merge branch 'flutter_upgrade_with_timesheet_changes'
10 months ago
3d91a1444e
wallet ticket fix
10 months ago
bc697df13d
Merge branch 'flutter_upgrade_with_timesheet_changes'
11 months ago
fb35e256e7
CS Standard Change Request
...
CR-7260
Fixed Asset Disposal Request amendment
11 months ago
c9d5ab98a3
work-list fixes
11 months ago
b96c460d6b
Get Notification User Information Updates
12 months ago
676e662967
Survey title key fix
12 months ago
bf3f9b55fc
changes for security ogout attempt..
12 months ago
c191d4c0c0
Survey Title Key Fix
12 months ago
0b08606813
Ticket History
12 months ago
107846dd82
Merge branch 'refs/heads/master' into flutter_upgrade_with_timesheet_changes
...
# Conflicts:
# android/app/build.gradle
# lib/ui/landing/dashboard_screen.dart
# lib/ui/landing/widget/services_widget.dart
12 months ago
c7e44965d6
Get Ticket Accural Balance Changes
12 months ago
haroon amjad
04a2561f7f
Update to stores VersionID 9.2
12 months ago
haroon amjad
413db57206
favourites list changes
12 months ago
c06c020fb3
favorites search enabled.
12 months ago
cca95cee6a
ticket changes moved to dashboard & wallet balance
1 year ago
1bcecde59b
ticket changes moved to dashboard
1 year ago
c8fa64171e
coreLibraryDesugaringEnabled
1 year ago
haroon amjad
55ece8921f
Merge branch 'mohem_flutter_upgrade'
...
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/consts.dart
1 year ago
haroon amjad
7384f22942
Update to stores, VersionID 9.2
1 year ago
Aamir Muhammad
0e54c7dac9
worklist actions fragment action button changes
1 year ago
Aamir Muhammad
d651b34381
Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade
...
# Conflicts:
# android/app/build.gradle
# android/build.gradle
# android/gradle.properties
# android/gradle/wrapper/gradle-wrapper.properties
# android/settings.gradle
# ios/Runner.xcodeproj/project.pbxproj
# lib/api/dashboard_api_client.dart
# lib/classes/consts.dart
# lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
# lib/widgets/mark_attendance_widget.dart
# pubspec.yaml
1 year ago
haroon amjad
6400678f95
updates
1 year ago
Aamir Muhammad
c62f3f6485
Merge branch 'master' into mohem_flutter_upgrade
...
# Conflicts:
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
1 year ago
Aamir Muhammad
5864c77226
worklist actions fragment action button changes
1 year ago
Aamir Muhammad
8d6c3ddc0b
mazaya banner changes
1 year ago
Aamir Muhammad
56b18c493a
mazaya banner changes
1 year ago
Aamir Muhammad
515ffef14e
tickt booking implementation
1 year ago
Aamir Muhammad
f61817937b
tickt booking implementation
1 year ago
e50d1f70b2
upgraded the sdk to 35
1 year ago
Aamir Muhammad
cd36d61640
logins apis
1 year ago
haroon amjad
dcbf7b386a
Survey link launch issue fixed, Updated to Stores VersionID 9.1
1 year ago
b2ffa0c619
Merge branch 'master' into mohem_flutter_upgrade
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/app_state/app_state.dart
# lib/classes/consts.dart
# lib/dialogs/otp_dialog.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/theme/app_theme.dart
# lib/ui/attendance/monthly_attendance_screen.dart
# lib/ui/chat/chat_home_screen.dart
# lib/ui/login/verify_last_login_screen.dart
# lib/ui/login/verify_login_screen.dart
# lib/ui/my_team/view_attendance.dart
# lib/ui/profile/delete_family_member.dart
# lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
# lib/ui/work_list/worklist_detail_screen.dart
# lib/ui/work_list/worklist_fragments/info_fragments.dart
# lib/widgets/app_bar_widget.dart
# lib/widgets/image_picker.dart
# lib/widgets/nfc/nfc_reader_sheet.dart
# pubspec.yaml
1 year ago
haroon amjad
c57c22a58c
ERM Channel Text URL implemented
1 year ago
3b3046804e
upgraded
1 year ago
haroon amjad
aaa4f13493
App update to stores, Version ID 8.9
1 year ago
haroon amjad
d4b7550bab
Worklist actions buttons updates
1 year ago
haroon amjad
4e2a774086
App update to stores, Version ID 8.8
1 year ago
9b683235c9
request information added,
1 year ago
haroon amjad
0e7bac4557
ITG Timesheet & Approval level fixes
1 year ago
haroon amjad
e91b33805e
fixes & updates, Time sheet changes, Update to stores VersionID 8.7
1 year ago
6fbc7e33ee
Merge branch 'flutter_upgrade_with_timesheet_changes'
...
# Conflicts:
# lib/classes/consts.dart
# lib/ui/work_list/itg_fragments/request_detail_fragment.dart
1 year ago
49e520ea4b
update
1 year ago
Aamir Muhammad
72c178382f
time sheet changes
1 year ago
54aa610856
long text field changed to separate field.
2 years ago
c26b2d9a5f
search employee inprogress
2 years ago
be46dcb9b1
employee search work in progress
2 years ago
haroon amjad
7c3f6a508f
updates & fixes
2 years ago
5db63e571a
WD: flutter upgraded to 3.27.4
2 years ago
haroon amjad
92a16381aa
Update to stores VersionID 8.6
2 years ago
haroon amjad
5adc2bc64f
updates
2 years ago
6e15336cc4
image changes.
2 years ago
29334a9ef0
leave balance page fix.
2 years ago
822a99a291
countdown updated.
2 years ago
75ba1283d3
event activity page added.
2 years ago
6e3fc55fde
event activity added - cont
2 years ago
a33da491f9
description format section seperated in itg forms
2 years ago
c35074576a
offer and discount, do not show if api have issue.
2 years ago
9362859013
CEI notification body added.
2 years ago
haroon amjad
e20d6eca3f
Safe device issue fixed
2 years ago
3e19508c5e
child education assistance added.
2 years ago
haroon amjad
9f89f7530d
Update to stores VersionID 8.5
2 years ago
haroon amjad
c1503cc236
updates & fixes
2 years ago
haroon amjad
5d0091fe5b
Unsafe device check implemented
2 years ago
4eb3e6d52d
progress bar added on erm video. & skip button relocation.
2 years ago
haroon amjad
2682158590
ERM Channel Video changes
2 years ago
haroon amjad
cdd56b2a5a
Issue fixes & updates
2 years ago
haroon amjad
b20e0a8c7b
updates
2 years ago
0da0ffd43e
itg form attachment overlapping issue fixed.
2 years ago
d4e17e7f0d
dynamic form parent value added. (saudi council employee)
2 years ago
8e49df98a2
translation issue fixed.
2 years ago
5ecb4845a1
po item history chart and scrollable list view added.
2 years ago
b06fb6345a
actions & attachment api response overlapping other request responses. fixed.
2 years ago
haroon amjad
11881b0ba1
hotfix for payment request WL
2 years ago
haroon amjad
368d109d9f
absence days fix
2 years ago
ea7467502f
updated changes for payment worklist.
2 years ago
275c2a8aa7
Merge branch 'payment_worklist_CR_6939'
...
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/consts.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/work_list/worklist_detail_screen.dart
2 years ago
c72189bb6b
version number changed
2 years ago
adc26a2435
Merge branch 'payment_worklist_CR_6939' of http://34.17.75.184/Haroon6138/mohemm-flutter-app into mohem_flutter_upgrade
...
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/consts.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/work_list/worklist_detail_screen.dart
2 years ago
9cbbbebe4b
Merge branch 'master' of http://34.17.75.184/Haroon6138/mohemm-flutter-app into mohem_flutter_upgrade
...
# Conflicts:
# pubspec.yaml
2 years ago
bafb6c8470
missing swipe issue and payment work-list and business trip issue fixed.
2 years ago
haroon amjad
d55d2dee50
Mohemm identity updated
2 years ago
haroon amjad
39375f48ff
updates
2 years ago
423e8551f1
changes updated
2 years ago
db40f42a08
payment CR 6939 done
2 years ago
taha.alam
2e3abed42e
WD: dialog color changes.
2 years ago
taha.alam
2bdaaf9e16
WD: flutter upgrade fron 3.7 to 3.19.0
2 years ago
haroon amjad
096c52d979
worklist updates
2 years ago
haroon amjad
3327130e74
Attendance location updates
2 years ago
550992ccf4
generate QR Api email parameter added.
2 years ago
030887452d
generate QR Api added.
2 years ago
e8fbffdc9c
scroll, padding & content by language added on image ad.
2 years ago
haroon amjad
f09f08be82
Store update to version 6.0
2 years ago
c7a4e4023e
error code 699 fixes
2 years ago
348e4713ec
worklist-PO-PR issue fixed.
3 years ago
haroon amjad
f77854c794
update to stores version 5.9
3 years ago
2b7df41f35
advance search bottom sheet issue when keyboard appear.
3 years ago
haroon amjad
10a337ddd7
Added additional details in VIDA Access Request in ITG
3 years ago
haroon amjad
22af6fa2f9
Huawei location fix
3 years ago
haroon amjad
55c096aa7e
Chat video fixes
3 years ago
haroon amjad
d3358d578c
Update to stores
3 years ago
haroon amjad
5f3c4b034f
Monthly attendance fixes
3 years ago
haroon amjad
697d44635c
Storage permissions handled
3 years ago
df07a5f9f6
Merge branch 'master' into development_sikander
3 years ago
haroon amjad
c7ff754dd8
Password expired fixes & ITG Attachments implementation
3 years ago
2cea45f0e1
Merge branch 'master' into development_sikander
...
# Conflicts:
# lib/app_state/app_state.dart
3 years ago
haroon amjad
43e1e4df6b
forgot password changes
3 years ago
haroon amjad
771914326f
Forgot password flow updated
3 years ago
haroon amjad
4e7e5bc0e7
document type name updated in My Documents
3 years ago
haroon amjad
29643489d6
Added permissions for viewing files
3 years ago
haroon amjad
0728cc3dd4
Updated Mowadhafi Attachment Handling
3 years ago
haroon amjad
fc3c1c057a
Attachments handled in transactions list mowadhafi
3 years ago
haroon amjad
b9fcf399c4
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app
3 years ago
haroon amjad
c104de86ba
Updates
3 years ago
Haroon6138
7faf1ca530
Merge pull request 'half day leave bug fixed' ( #15 ) from sultan-dev into master
...
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/15
3 years ago
haroon amjad
bd46589607
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app
3 years ago
haroon amjad
a411b8e978
File picker permission issue fixed
3 years ago
449c93649a
multiple survey added.
3 years ago
d1e2d0f59b
Merge branch 'master' into development_sikander
...
# Conflicts:
# lib/app_state/app_state.dart
3 years ago
610d4788c2
parameter added in survey.
3 years ago
d44bc37681
marathon tutorial added.
3 years ago
haroon amjad
Haroon Amjad
taha
Sultan khan
aamir-csol
Aamir Saleem Ahmad
Aamir Muhammad
Syed Taha Alam
Sikander Saleem
taha.alam