Commit Graph

245 Commits (d021c95def20a4dc2754d2644d6d5ba167714e14)

Author SHA1 Message Date
aamir-csol d021c95def Parking Qr Solution 1 day ago
Sultan khan bc697df13d Merge branch 'flutter_upgrade_with_timesheet_changes' 2 months ago
Sultan khan fb35e256e7 CS Standard Change Request
CR-7260

Fixed Asset Disposal Request amendment
2 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
3 months ago
aamir-csol c7e44965d6 Get Ticket Accural Balance 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
6 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 6 months ago
Aamir Muhammad cd36d61640 logins apis 6 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
7 months ago
haroon amjad c57c22a58c ERM Channel Text URL implemented 7 months ago
Sultan khan 3b3046804e upgraded 7 months ago
Aamir Muhammad 72c178382f time sheet changes 9 months ago
sultan khan c26b2d9a5f search employee inprogress 10 months ago
sultan khan be46dcb9b1 employee search work in progress 11 months ago
sultan khan 75ba1283d3 event activity page added. 11 months ago
Sikander Saleem 6e3fc55fde event activity added - cont 12 months ago
Sikander Saleem 9362859013 CEI notification body added. 1 year ago
Sikander Saleem 3e19508c5e child education assistance added. 1 year ago
haroon amjad 368d109d9f absence days fix 1 year ago
Sultan khan 423e8551f1 changes updated 1 year ago
Sultan khan db40f42a08 payment CR 6939 done 1 year ago
Sikander Saleem df07a5f9f6 Merge branch 'master' into development_sikander 2 years ago
haroon amjad c7ff754dd8 Password expired fixes & ITG Attachments implementation 2 years ago
Sikander Saleem 2cea45f0e1 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
haroon amjad fc3c1c057a Attachments handled in transactions list mowadhafi 2 years ago
Sultan khan 74bc09d5d6 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Sultan khan c86d9f4678 termination work-list fixed 2 years ago
Sikander Saleem d1e2d0f59b Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Faiz Hashmi 5723b64234 Join MarathonProviderFix 2 years ago
Sikander Saleem 610d4788c2 parameter added in survey. 2 years ago
Sultan khan d4a795dda1 half day leave bug fixed 2 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 2 years ago
Sultan khan d7f45fa0b9 ITG change pushed. 2 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 2 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
2 years ago
haroon amjad a48d703642 ITG ADs update 2 years ago
Sikander Saleem 23b4e81170 my documents added. 2 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 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
haroon amjad 9030b9bc81 Notification details implemented 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
haroon amjad 1dca3076d9 Survey dynamic questions 3 years ago
haroon amjad b1e140fb75 PR Details implemented 3 years ago
Sultan khan 9cb71b525e group chat started 3 years ago
haroon amjad d49a030580 PR details from PO implemented 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 3 years ago
Sultan khan 61904ca5f7 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/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
3 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
Faiz Hashmi 7f02dff689 Added the Sequence Number in Question Options and Removed isCorrectOption 3 years ago