 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 |
 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 |
|
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 |
|
sultan khan
|
c26b2d9a5f
|
search employee inprogress
|
8 months ago |
|
sultan khan
|
be46dcb9b1
|
employee search work in progress
|
8 months ago |
|
haroon amjad
|
77de3ed4cf
|
updates
|
10 months ago |
|
haroon amjad
|
39375f48ff
|
updates
|
1 year 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
|
c104de86ba
|
Updates
|
2 years ago |
|
haroon amjad
|
c4dc3e941d
|
auth key
|
2 years ago |
haroon amjad
|
f1382adf25
|
updates
|
3 years ago |
|
haroon amjad
|
bbcc9dc147
|
no message
|
3 years ago |
|
haroon amjad
|
ba46cf8dee
|
no message
|
3 years ago |
|
haroon amjad
|
d65fb5f9ff
|
iOS Deployment target
|
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 |
Sikander Saleem
|
29626ea408
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
528b0930c2
|
mark attendance counter 1.0
|
3 years ago |
Sultan khan
|
8d9561b570
|
COC changes
|
3 years ago |
|
haroon amjad
|
8f396f9ecf
|
ios config for testing
|
3 years ago |
|
haroon amjad
|
c14bfd22db
|
Mohemm Android build given to QA
|
3 years ago |
|
Sikander Saleem
|
3c49a45516
|
ios fixes
|
3 years ago |
|
Sikander Saleem
|
3fcbd9946a
|
configs for ios.
|
3 years ago |
tall3at
|
bf8dce2afd
|
Work List screen
|
4 years ago |
|
tall3at
|
1b6ebc67c3
|
first commit
|
4 years ago |