Commit Graph

407 Commits (ea8fd42abd83fcee9544b909c3b534096808666d)

Author SHA1 Message Date
mirza.shafique ea8fd42abd Otp clear & resend fixed 3 years ago
Aamir Muhammad ee0e774611 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/colors.dart
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad 67f4fdef28 Chat Fixes & Favorite Api Implementation 3 years ago
Aamir Muhammad 8ba3dcf43b Chat Fixes & Favorite Api Implementation 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 5cd0ff1567 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
haroon amjad 2fdde18b52 Merge branch 'faiz_cs' into 'master'
Updated Banner Again :D

See merge request Cloud_Solution/mohemm-flutter-app!49
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 c7d2b0aa8a Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
FaizHashmiCS22 9bdb6bfb71 Updated Banner Again :D 3 years ago
haroon amjad 37ff4db9f6 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 26ddc00048 Updates & fixes 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
Fatimah Alshammari 965edf9141 fix issues 3 years ago
Fatimah Alshammari 53fb8605d8 Merge branch 'master' into fatima
# Conflicts:
#	lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
3 years ago
Fatimah Alshammari c83f0c1199 fix issues 3 years ago
haroon amjad b834c52b5f Updated Profile screen 3 years ago
haroon amjad 0051d8b97e Merge branch 'master' into development_haroon 3 years ago
haroon amjad 00e81999de Merge branch 'faiz_cs' into 'master'
Updated Banner Design and Success tone on Lottiee

See merge request Cloud_Solution/mohemm-flutter-app!46
3 years ago
haroon amjad 28a882a2f6 Updates & Fixes 3 years ago
FaizHashmiCS22 034436425a Added success tone 3 years ago
FaizHashmiCS22 fe8c6f9060 Updated Marathon Banner Design 3 years ago
haroon amjad 868728b876 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 3e69880ddd Merge branch 'faiz_cs' into 'master'
Position Widget Fixed

See merge request Cloud_Solution/mohemm-flutter-app!45
3 years ago
haroon amjad c0e7bc7c7d Last Login fixes 3 years ago
FaizHashmiCS22 8f088c78da Position Fix 3 years ago
haroon amjad 221bf28ddd Merge branch 'master' into development_haroon 3 years ago
haroon amjad ea676e19ca JIRA Fixes 3 years ago
haroon amjad 54b9595add Merge branch 'faiz_cs' into 'master'
UI Fixes

See merge request Cloud_Solution/mohemm-flutter-app!43
3 years ago
FaizHashmiCS22 bdb8de15e3 Merge branch 'master' into development_faiz 3 years ago
FaizHashmiCS22 09b2f8a23f UI Fixes 3 years ago
haroon amjad 7cc110b9a1 JIRA fixes 3 years ago
Fatimah Alshammari 0a0c173331 Merge branch 'master' into fatima 3 years ago
Fatimah Alshammari 0cca8ec935 fix issues 3 years ago
mirza.shafique e9de5c340b Merge branch 'master' into development_mirza
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
3 years ago
devmirza121 f06238a93f OTP dialog new design 3 years ago
Aamir Muhammad 235dc6b1f4 Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 7408e24245 Chat Delivered&Seen Event Added. 3 years ago
haroon amjad d1652ef04d Merge branch 'development_mirza' into 'master'
attendance file fixed

See merge request Cloud_Solution/mohemm-flutter-app!40
3 years ago
Sikander Saleem e4737f403e attendance file fixed 3 years ago
haroon amjad bf802f3d67 Merge branch 'development_mirza' into 'master'
Development mirza

See merge request Cloud_Solution/mohemm-flutter-app!36
3 years ago
haroon amjad 1a2c9d1b15 Merge branch 'fatima' into 'master'
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!37
3 years ago
haroon amjad ba588cd3a3 Merge branch 'faiz_cs' into 'master'
Added Answer Selection Status in Marathon

See merge request Cloud_Solution/mohemm-flutter-app!38
3 years ago
haroon amjad d77f9a3362 Worklist fixes 3 years ago
Aamir Muhammad 6d5b2323ac Merge branch 'master' into development_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
3 years ago