Commit Graph

33 Commits (3c49a455165359d7c6d38c91f5d9cdc5fed2abe6)

Author SHA1 Message Date
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 8247032a52 profile options linked with home page personal information. 3 years ago
Sikander Saleem 18084ce29f services menu structure improvements. 3 years ago
Sikander Saleem 3fcbd9946a configs for ios. 3 years ago
Sikander Saleem 0d812cf266 Vacation rule added. 3 years ago
Sikander Saleem 4ebba3900c dashboard improvements, monthly attendance & 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 57bf34a93a fix translation. 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
Fatimah Alshammari 30ca1894db fix issues. 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 42e93e42a9 merge issue fixed 3 years ago
Sikander Saleem 95e2e74fd0 Merge branch 'master' into development_sikander
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/main.dart
#	lib/models/generic_response_model.dart
#	lib/ui/my_attendance/my_attendance_screen.dart
#	lib/ui/work_list/worklist_detail_screen.dart
3 years ago
Sikander Saleem 959750da9b ticket request cont. 3 years ago
Fatimah Alshammari 60db9041a1 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
 Conflicts:
	assets/langs/en-US.json
	lib/ui/profile/contact_details.dart
	lib/ui/profile/personal_info.dart
	pubspec.yaml
3 years ago
Fatimah Alshammari d2a6ed8de7 fix monthly attendance 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
Sikander Saleem 1e9a26e3df missing swipe cont 3 years ago
Sikander Saleem 9cc86751eb missing swipe cont 3 years ago
Sultan Khan 8f80bbb9db profile dynamic forms 3 years ago
Sikander Saleem dadaeed10e dynamic forms cont. 3 years ago
Sikander Saleem 25d020441c my attendance working cont-1 4 years ago