haroon amjad
|
bdaccf133c
|
updates
|
1 day 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 day 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 day 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 day ago |
aamir-csol
|
257b803cce
|
QIPS-1205
|
2 weeks ago |
aamir-csol
|
a958257ce9
|
Greeting
|
2 weeks ago |
aamir-csol
|
dae746587f
|
QIPS-1205
|
2 weeks ago |
aamir-csol
|
facb3bf4e6
|
QIPS-1205
|
2 weeks ago |
aamir-csol
|
71d03ba664
|
QIPS-1205
|
2 weeks ago |
aamir-csol
|
9f663df3cc
|
QIPS-1205
|
2 weeks ago |
aamir-csol
|
ba8908d4eb
|
Greeting Card
|
2 weeks ago |
aamir-csol
|
a8f390d49f
|
QIPS-1175,QIPS-1179,QIPS-1180
|
2 weeks ago |
aamir-csol
|
2c7d3bf963
|
QIPS-1175,QIPS-1179,QIPS-1180
|
3 weeks ago |
aamir-csol
|
31d1804f7a
|
QIPS-1175,QIPS-1179,QIPS-1180
|
4 weeks ago |
Sultan khan
|
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
|
2 months ago |
Sultan khan
|
a426bc332e
|
E-learning Mandatory Courses - CR# 7150
|
2 months ago |
aamir-csol
|
a28eb4426b
|
Merge remote-tracking branch 'origin/etqan_ovr_integration' into etqan_ovr_integration
|
2 months ago |
aamir-csol
|
dfa7d9a713
|
approval level commented Code for filter .
|
2 months ago |
haroon amjad
|
9112b26987
|
updates
|
2 months ago |
aamir-csol
|
d021c95def
|
Parking Qr Solution
|
2 months ago |
aamir-csol
|
99414bf787
|
Itiqan Ovr Completed
|
2 months ago |
aamir-csol
|
0b08606813
|
Ticket History
|
5 months ago |
aamir-csol
|
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
|
5 months ago |
aamir-csol
|
c7e44965d6
|
Get Ticket Accural Balance Changes
|
5 months ago |
aamir-csol
|
cca95cee6a
|
ticket changes moved to dashboard & wallet balance
|
6 months ago |
aamir-csol
|
1bcecde59b
|
ticket changes moved to dashboard
|
7 months 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
|
8 months ago |
Syed Taha Alam
|
e50d1f70b2
|
upgraded the sdk to 35
|
8 months ago |
Aamir Muhammad
|
cd36d61640
|
logins apis
|
8 months ago |
Sultan khan
|
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
|
9 months ago |
Sultan khan
|
3b3046804e
|
upgraded
|
9 months ago |
haroon amjad
|
e91b33805e
|
fixes & updates, Time sheet changes, Update to stores VersionID 8.7
|
11 months ago |
Aamir Muhammad
|
72c178382f
|
time sheet changes
|
11 months ago |
sultan khan
|
c26b2d9a5f
|
search employee inprogress
|
1 year ago |
Sikander Saleem
|
6e3fc55fde
|
event activity added - cont
|
1 year ago |
Sikander Saleem
|
c35074576a
|
offer and discount, do not show if api have issue.
|
1 year ago |
haroon amjad
|
22af6fa2f9
|
Huawei location fix
|
2 years ago |
haroon amjad
|
55c096aa7e
|
Chat video fixes
|
2 years ago |
haroon amjad
|
d3358d578c
|
Update to stores
|
2 years ago |
Sikander Saleem
|
58962ede03
|
CR-6273 implemented.
|
2 years ago |
haroon amjad
|
281f0bab78
|
updates
|
3 years ago |
haroon amjad
|
a58d4753e4
|
Merge branch 'sultan-dev' into development_haroon
# Conflicts:
# assets/langs/en-US.json
# lib/classes/utils.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# pubspec.yaml
|
3 years ago |
Sikander Saleem
|
23b4e81170
|
my documents added.
|
3 years ago |
Sultan khan
|
608a8fcb97
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/app_state/app_state.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
|
3 years ago |
Sultan khan
|
790103bdc9
|
chat changes
|
3 years ago |
Sultan khan
|
fd6058e87d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/app_state/app_state.dart
# lib/generated/locale_keys.g.dart
|
3 years ago |
Sikander Saleem
|
571b8bd7af
|
itg active directory password change added.
|
3 years ago |
Sultan khan
|
9cb71b525e
|
group chat started
|
3 years ago |
mirza.shafique
|
7d7acfa2df
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/main.dart
|
3 years ago |
haroon amjad
|
99c1f95e1f
|
Attendance Progress screen fixes
|
3 years ago |