 Aamir Muhammad
|
f4f9b442c8
|
Chat Updates & Counter Event Modifications
|
3 years ago |
|
Aamir Muhammad
|
2e88275285
|
Chat Updates & Counter Event Modifications
|
3 years ago |
haroon amjad
|
e8043f6980
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!54
|
3 years ago |
Fatimah Alshammari
|
ba1a5c66ef
|
fix issues
|
3 years ago |
|
Aamir Muhammad
|
00dee97bca
|
Chat Count Api / Chat Token Updates / Chat Call UI
|
3 years ago |
|
Aamir Muhammad
|
68939f6256
|
Chat Call UI
|
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
|
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 |
haroon amjad
|
21d396b3bb
|
Worklist updates
|
3 years ago |
|
Fatimah Alshammari
|
c83f0c1199
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
0cca8ec935
|
fix issues
|
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
|
d77f9a3362
|
Worklist fixes
|
3 years ago |
|
Fatimah Alshammari
|
79774416b4
|
Merge branch 'master' into fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
Fatimah Alshammari
|
69ded3dc43
|
fix my request
|
3 years ago |
|
haroon amjad
|
8f84e51b6d
|
Merge branch 'master' into development_haroon
|
3 years ago |
devmirza121
|
937c4c18b5
|
Mark Attandence success animation and font settings
|
3 years ago |
|
haroon amjad
|
b169b658dc
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
cf9f84f38b
|
PO fixes
|
3 years ago |
FaizHashmiCS22
|
3d7b80b8a0
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
FaizHashmiCS22
|
60e7b5a2a0
|
Adjusted the font settings
|
3 years ago |
|
FaizHashmiCS22
|
3c6e4a725f
|
Merge branch 'master' into faiz_cs
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# pubspec.yaml
|
3 years ago |
|
Fatimah Alshammari
|
f515c0b39a
|
Merge branch 'master' into fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
3 years ago |
|
FaizHashmiCS22
|
38c7d78db3
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
Fatimah Alshammari
|
1b13b732b8
|
fix issues
|
3 years ago |
|
haroon amjad
|
aabc86290a
|
Language change option added in app drawer
|
3 years ago |
|
haroon amjad
|
109c0ca0a2
|
PR PO fixes, Worklist fixes
|
3 years ago |
|
Aamir Muhammad
|
d24103b872
|
Chat Login Api Implementation
|
3 years ago |
|
Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
 Sikander Saleem
|
d61315a5fe
|
Merge branch 'master' into development_sikander
|
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 |
|
Aamir Muhammad
|
b190a248bf
|
Chat Implementation Version 1
|
3 years ago |
|
devmirza121
|
0d0832277f
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/ui/work_list/worklist_fragments/detail_fragment.dart
# lib/ui/work_list/worklist_fragments/info_fragments.dart
# pubspec.yaml
|
3 years ago |
|
devmirza121
|
116175efaa
|
Work list UI Change
|
3 years ago |
|
Sikander Saleem
|
f36606f603
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/work_list_screen.dart
|
3 years ago |
|
Sikander Saleem
|
06810486e3
|
dynamic list center issue fixed.
|
3 years ago |
Sultan khan
|
ca3febeccd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
|
3 years ago |
|
Sultan khan
|
8d9561b570
|
COC changes
|
3 years ago |
|
Fatimah Alshammari
|
53dabdd853
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
be506fa059
|
fix issues
|
3 years ago |
|
haroon amjad
|
f6c9b6dce9
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
dd26452663
|
Fixes & updates
|
3 years ago |
|
Sikander Saleem
|
a45b6aece2
|
improvements
|
3 years ago |
|
Sikander Saleem
|
4b935f1dc5
|
leave balance dashboard added.
|
3 years ago |
Sultan Khan
|
70a7108d9c
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
|
3 years ago |
Sikander Saleem
|
3cd3aaa6d3
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/ui/landing/widget/app_drawer.dart
|
3 years ago |
|
haroon amjad
|
fb2924964b
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
3 years ago |
|
Sikander Saleem
|
2ce3c535d2
|
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
|
3 years ago |