Faiz Hashmi
|
35a4b780a7
|
Added initial APIs for Marathon
|
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
|
1a2c9d1b15
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!37
|
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 |
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
|
c87a00df6a
|
Jira fixes
|
3 years ago |
devmirza121
|
937c4c18b5
|
Mark Attandence success animation and font settings
|
3 years ago |
|
FaizHashmiCS22
|
f9885fa979
|
Merge branch 'master' into development_faiz
|
3 years ago |
 Sikander Saleem
|
0a73cced51
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
212f8e6663
|
worklist & itg counters issue resolved, delegate & request info in itg added.
|
3 years ago |
|
FaizHashmiCS22
|
f3623e29dc
|
Merge branch 'master' into development_faiz
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
haroon amjad
|
966fb5e209
|
Worklist fixes
|
3 years ago |
|
FaizHashmiCS22
|
199a65a994
|
Merge branch 'master' into development_faiz
|
3 years ago |
|
haroon amjad
|
588e8f51f0
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
8b0bae0891
|
Worklist updates
|
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 |
|
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 |
|
Fatimah Alshammari
|
7b4fe5bcbc
|
fix issues
|
3 years ago |
|
Aamir Muhammad
|
82afd0ae61
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
a623765510
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
haroon amjad
|
109c0ca0a2
|
PR PO fixes, Worklist fixes
|
3 years ago |
|
Aamir Muhammad
|
05c6cc7f14
|
Chat Search User Api Implementation
|
3 years ago |
|
Aamir Muhammad
|
d4b31d4338
|
Chat Login Api Implementation
|
3 years ago |
|
Aamir Muhammad
|
a90da83fa5
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/api/chat/chat_provider_model.dart
|
3 years ago |
|
Aamir Muhammad
|
d24103b872
|
Chat Login Api Implementation
|
3 years ago |
|
haroon amjad
|
5b5cc16b90
|
Advanced Search implemented
|
3 years ago |
|
Sikander Saleem
|
49bd4114ce
|
improvements
|
3 years ago |
|
Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
|
Aamir Muhammad
|
e115137205
|
Chat Implementation Version 1
|
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 |
Sultan khan
|
8d9561b570
|
COC changes
|
3 years ago |
|
haroon amjad
|
9f74c3c39a
|
ITG request flow 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
|
9ce042e7d3
|
bussiness card improvement.
|
3 years ago |
|
haroon amjad
|
20e6a6ddc3
|
Attendance fixes
|
3 years ago |
|
devmirza121
|
8ce3a09375
|
Login with face and finger fixed
|
3 years ago |
|
Sikander Saleem
|
ea2a9c541c
|
change password screen added.
|
3 years ago |
|
Sikander Saleem
|
4b935f1dc5
|
leave balance dashboard added.
|
3 years ago |
Sikander Saleem
|
8e94d57dae
|
performance evaluation improvements.
|
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 |
|
Sikander Saleem
|
6be8510b86
|
drawer menu ui changed.
|
3 years ago |