Commit Graph

54 Commits (f31db58a7611421d0fede00699b52617b72ccaaf)

Author SHA1 Message Date
haroon amjad 6463dfc424 Reverting fatima changes 3 years ago
haroon amjad d80f93a6dc Revert "no message"
This reverts commit 323741ad06.
3 years ago
haroon amjad 323741ad06 no message 3 years ago
Fatimah Alshammari f43b4905c5 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into fatima
# Conflicts:
#	lib/ui/misc/request_submit_screen.dart
3 years ago
Sultan khan 86be7ccc5f Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan c500da9a18 bug fix 3 years ago
Fatimah Alshammari 581e6de897 fix issues 3 years ago
Fatimah Alshammari 85be372ad8 Merge branch 'master' into fatima
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/leave_balance/add_leave_balance_screen.dart
3 years ago
Fatimah Alshammari 9d0bf4fe7e fix issues 3 years ago
mirza.shafique ef5136ebfa worklist animation & loader 3 years ago
Sultan khan bcf4a9ec42 my team probation issue fixed 3 years ago
Fatimah Alshammari ba1a5c66ef fix issues 3 years ago
Fatimah Alshammari d849699489 fix issues 3 years ago
Fatimah Alshammari 9ecdd6b11d Merge branch 'master' into fatima
# Conflicts:
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
3 years ago
Fatimah Alshammari 22ac89e744 fix issues 3 years ago
Sultan khan 89812c0f72 Worklist changes 3 years ago
Sultan khan 4b79c6eda3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
haroon amjad 21d396b3bb Worklist updates 3 years ago
Sultan khan b9f9c31f01 lynx access issue fixed 3 years ago
Sultan khan e9edc80eae Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan a0201efbfb dynamic screen updated 3 years ago
haroon amjad 28a882a2f6 Updates & Fixes 3 years ago
haroon amjad 7cc110b9a1 JIRA fixes 3 years ago
haroon amjad c87a00df6a Jira fixes 3 years ago
FaizHashmiCS22 38c7d78db3 Added UI Components for Marathon Module.. WIP 3 years ago
Sikander Saleem f0ec4843b4 end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed. 3 years ago
Sikander Saleem 06810486e3 dynamic list center issue fixed. 3 years ago
Sikander Saleem 13e9c5fa21 centering issue in dynamic list view screen fixed. 3 years ago
Sikander Saleem 0c7fbde013 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/ui/my_attendance/services_menu_list_screen.dart
3 years ago
Sikander Saleem 9a0131277b create request by manager in my team, improvements 3 years ago
haroon amjad dd26452663 Fixes & updates 3 years ago
Sikander Saleem 4e22784676 ticket balance dashboard added. 3 years ago
Sikander Saleem 2f6e40da46 add leave balance cont. 3 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 3 years ago
Sikander Saleem 3fcbd9946a configs for ios. 3 years ago
Sikander Saleem 0d812cf266 Vacation rule added. 3 years ago
Sikander Saleem 68146ecd97 dynamic forms finalized & improvements 3 years ago
Sikander Saleem 48de28c0b3 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem d5b1512eb4 improvements 3 years ago
Fatimah Alshammari 1ef3783fb9 Merge branch 'master' into Fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/profile_api_client.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/widget/app_drawer.dart
#	lib/ui/profile/delete_familyMember.dart
#	lib/ui/profile/family_members.dart
#	lib/ui/profile/phone_numbers.dart
#	lib/ui/screens/profile/profile_screen.dart
3 years ago
Sikander Saleem 0b2a87aaaf dynamic forms logic improvement. 3 years ago
Sikander Saleem 2f013ba1ad lint rules added. 3 years ago
Sikander Saleem 0786a1fa03 lint rules added. 3 years ago
Sikander Saleem f1c36b5821 monthly pay slip added. 3 years ago
Sultan Khan 9b213dc9ab Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan ea5178fe20 profle dynamic forms 3 years ago
Sikander Saleem cb88f12ced return from leave done. 3 years ago
Sikander Saleem 959750da9b ticket request cont. 3 years ago
Sikander Saleem ae0a788728 Merge branch 'master' into development_sikander
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	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/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
3 years ago
Sikander Saleem 3e6fdd2cb5 missing swipe added. 3 years ago