 haroon amjad
|
f6df04c432
|
Merge branch 'master_mohemm_flutter' into mohemm_HMG_flutter_upgrade
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/consts.dart
# lib/ui/landing/dashboard_screen.dart
# pubspec.yaml
|
3 months ago |
|
haroon amjad
|
7384f22942
|
Update to stores, VersionID 9.2
|
3 months ago |
 Aamir Muhammad
|
0e54c7dac9
|
worklist actions fragment action button changes
|
3 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
|
3 months ago |
Syed Taha Alam
|
e50d1f70b2
|
upgraded the sdk to 35
|
3 months ago |
|
Aamir Muhammad
|
cd36d61640
|
logins apis
|
4 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
|
4 months ago |
|
haroon amjad
|
7c9fc2f29c
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# ios/Runner/Info.plist
# lib/app_state/app_state.dart
# pubspec.yaml
|
6 months ago |
|
haroon amjad
|
e91b33805e
|
fixes & updates, Time sheet changes, Update to stores VersionID 8.7
|
6 months ago |
|
sultan khan
|
c26b2d9a5f
|
search employee inprogress
|
8 months ago |
|
sultan khan
|
be46dcb9b1
|
employee search work in progress
|
8 months ago |
|
haroon amjad
|
48f2264848
|
icon updates
|
10 months ago |
|
haroon amjad
|
2477d9009a
|
Merge branch 'master_mohemm_flutter'
# 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
# pubspec.yaml
|
10 months ago |
|
haroon amjad
|
cdd56b2a5a
|
Issue fixes & updates
|
11 months ago |
|
haroon amjad
|
26bbc54503
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# AppIcons/Assets.xcassets/AppIcon.appiconset/100.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/114.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/120.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/144.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/152.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/167.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/180.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/20.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/29.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/40.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/50.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/57.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/58.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/60.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/72.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/76.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/80.png
# AppIcons/Assets.xcassets/AppIcon.appiconset/87.png
# AppIcons/appstore.png
# AppIcons/playstore.png
# android/app/src/main/AndroidManifest.xml
# android/app/src/main/res/mipmap-hdpi/ic_launcher.png
# android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
# android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
# android/app/src/main/res/mipmap-mdpi/ic_launcher.png
# android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
# android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
# android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
# android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
# android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
# android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
# android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
# android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
# ios/Runner.xcodeproj/project.pbxproj
# lib/app_state/app_state.dart
# pubspec.yaml
|
1 year ago |
|
haroon amjad
|
dc6195259d
|
Alhabib Mohem identity changed
|
1 year ago |
|
haroon amjad
|
d55d2dee50
|
Mohemm identity updated
|
1 year ago |
|
haroon amjad
|
39375f48ff
|
updates
|
1 year ago |
|
haroon amjad
|
f841ccac3e
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
|
1 year ago |
|
haroon amjad
|
096c52d979
|
worklist updates
|
1 year ago |
|
haroon amjad
|
557c356233
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
|
2 years ago |
|
haroon amjad
|
55c096aa7e
|
Chat video fixes
|
2 years ago |
|
haroon amjad
|
609d3ca48a
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# ios/Runner.xcodeproj/project.pbxproj
# lib/app_state/app_state.dart
# pubspec.yaml
|
2 years ago |
|
haroon amjad
|
d3358d578c
|
Update to stores
|
2 years ago |
|
haroon amjad
|
29643489d6
|
Added permissions for viewing files
|
2 years ago |
|
haroon amjad
|
0728cc3dd4
|
Updated Mowadhafi Attachment Handling
|
2 years ago |
|
haroon amjad
|
c104de86ba
|
Updates
|
2 years ago |
|
haroon amjad
|
39d9136299
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/ui/dialogs/id/business_card_dialog.dart
|
2 years ago |
|
Aamir Muhammad
|
6cf7340417
|
Business Card Design Update
|
2 years ago |
|
haroon amjad
|
e433c011e4
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/notifications.dart
# lib/generated_plugin_registrant.dart
# pubspec.yaml
|
2 years ago |
|
haroon amjad
|
5098aa7f90
|
my docs upload fix
|
2 years ago |
|
haroon amjad
|
c3376c0e3b
|
Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
# ios/Runner/Info.plist
# lib/app_state/app_state.dart
|
2 years ago |
|
haroon amjad
|
1a8db3b0ee
|
ERM Channel updates
|
2 years ago |
haroon amjad
|
cc110df55e
|
Merge branch 'master_mohemm_flutter' into development_haroon
|
3 years ago |
 Sikander Saleem
|
d971f4a651
|
po worklist forward & approve and forward RespondAttributeList payload improvement.
|
3 years ago |
|
haroon amjad
|
e14f046456
|
updates
|
3 years ago |
|
haroon amjad
|
f1382adf25
|
updates
|
3 years ago |
|
haroon amjad
|
ba46cf8dee
|
no message
|
3 years ago |
|
haroon amjad
|
20109cbe9e
|
Attendance fixes
|
3 years ago |
|
haroon amjad
|
3b13701cec
|
Android fixes
|
3 years ago |
|
haroon amjad
|
cacce00893
|
Crashlytics implemented
|
3 years ago |
haroon amjad
|
d3c5fd1467
|
Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
|
3 years ago |
|
haroon amjad
|
6436062642
|
HMG Mohemm Setup
|
3 years ago |
|
haroon amjad
|
e0d02554b1
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
182fa6774e
|
Huawei push implementation
|
3 years ago |
|
Aamir Muhammad
|
a8008bb9a7
|
Chat Fix & Web RTC Methods
|
3 years ago |
mirza.shafique
|
aa511f02ac
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/classes/consts.dart
# pubspec.yaml
|
3 years ago |
|
Aamir Muhammad
|
1eca46600d
|
Merge branch 'master' into development_aamir
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# ios/Runner/Info.plist
# lib/api/chat/chat_api_client.dart
# lib/ui/login/login_screen.dart
|
3 years ago |
|
mirza.shafique
|
5f525f16a0
|
local network test
|
3 years ago |
|
haroon amjad
|
a9bf383164
|
Updates & fixes
|
3 years ago |