Commit Graph

170 Commits (0fdafcd7fc563aed1bc547ae00761c2fbadd9e9b)

Author SHA1 Message Date
Sikander Saleem 41a1ba125e code improvements. 2 years ago
Sikander Saleem 9314ea0514 Merge branch 'master' into development_sikander
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
2 years ago
Fatimah Alshammari 89058f9e59 Merge branch 'master' into Fatima 2 years ago
Fatimah Alshammari 416a33b2fd fix design 2 years ago
Sikander Saleem 171735202b leave balance cont3. 2 years ago
Sikander Saleem 2278a1e98f Merge remote-tracking branch 'origin/development_sikander' into development_sikander
# Conflicts:
#	lib/ui/leave_balance/add_leave_balance_screen.dart
2 years ago
Sikander Saleem d5c8604f32 leave balance cont3. 2 years ago
Sikander Saleem a14103b859 leave balance cont3. 2 years ago
Sikander Saleem 8855eb7622 leave balance cont2. 2 years ago
Sikander Saleem 169a9bcc60 leave balance cont. 2 years ago
Sikander Saleem c0ec2260e5 mark attendance improvement. 2 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 2 years ago
Sikander Saleem fc6b923fc4 mowadhafhi improvement. 2 years ago
Fatimah Alshammari 8aa14618d4 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima 2 years ago
Sikander Saleem 9b50c2cf31 mark attendance improvement. 2 years ago
Fatimah Alshammari dc880df35a Merge branch 'master' into Fatima
# Conflicts:
#	lib/config/routes.dart
#	lib/models/generic_response_model.dart
#	lib/models/profile_menu.model.dart
2 years ago
Fatimah Alshammari a22f679908 my team module and workList settings 2 years ago
Sikander Saleem 8247032a52 profile options linked with home page personal information. 2 years ago
Sikander Saleem 20f7d98ce5 profile improvements 2 years ago
Sikander Saleem 11bd7a7085 improvements. 2 years ago
Sikander Saleem 18084ce29f services menu structure improvements. 2 years ago
Sikander Saleem 1404715425 Vacation rule translation added. 2 years ago
Sikander Saleem 3750f2c904 Vacation rule added complete. 2 years ago
Sikander Saleem 4edb19c2bb Vacation rule added cont. 2 years ago
Sikander Saleem 55f1f792f9 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/models/profile_menu.model.dart
2 years ago
Sikander Saleem 3fcbd9946a configs for ios. 2 years ago
Fatimah Alshammari 0820f87877 Merge branch 'master' into Fatima 2 years ago
Fatimah Alshammari d1cc9bd468 fix issue 2 years ago
Sikander Saleem fabb847fd8 Merge branch 'development_sultan' into 'master'
Development sultan

See merge request mirza.shafique/mohem_flutter_app!49
2 years ago
Sultan Khan ff4a546e5f Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 2 years ago
Sultan Khan 1137e585e3 update button check 2 years ago
Fatimah Alshammari 058e287b25 fix translation 2 years ago
Fatimah Alshammari d52cc2d5cd Merge branch 'master' into Fatima 2 years ago
Fatimah Alshammari b502e038a5 fix issue 2 years ago
Sikander Saleem 0d812cf266 Vacation rule added. 2 years ago
Sikander Saleem 4ebba3900c dashboard improvements, monthly attendance & vacation rule added. 2 years ago
Sikander Saleem 04520250a5 badge on work list in bottom navigation bar. 2 years ago
Sikander Saleem 68146ecd97 dynamic forms finalized & improvements 2 years ago
Sikander Saleem 48de28c0b3 Merge branch 'master' into development_sikander 2 years ago
Fatimah Alshammari aca788ae26 fix translations 2 years ago
Fatimah Alshammari 2e5a8e7a6b fix issue. 2 years ago
Sikander Saleem c390d87fca Merge branch 'master' into development_sikander 2 years ago
Sikander Saleem d5b1512eb4 improvements 2 years ago
devmirza121 7ca9096d89 Merge issue 2.0 2 years ago
devmirza121 8fe51a654c Merge branch 'master' into development_mirza
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/main.dart
#	lib/ui/landing/today_attendance_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
2 years ago
devmirza121 4dc4a3fafb Merge issue 1.0 2 years ago
Fatimah Alshammari 1604cba140 fix translation. 2 years ago
Sultan Khan 2b93d43380 Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 2 years ago
Fatimah Alshammari 57bf34a93a fix translation. 2 years ago
Sultan Khan 3c777d220e basic details 2 years ago