Sultan khan
|
88be17249d
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
|
2 years ago |
|
Sultan khan
|
6d92a78843
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
|
2 years ago |
|
Sultan khan
|
c56c9533b2
|
date format issue fixed.
|
2 years ago |
devamirsaleemahmad
|
12ec0a25ee
|
business trip settlement fix.
|
2 years ago |
 Sikander Saleem
|
58962ede03
|
CR-6273 implemented.
|
2 years ago |
 haroon amjad
|
a58d4753e4
|
Merge branch 'sultan-dev' into development_haroon
# Conflicts:
# assets/langs/en-US.json
# lib/classes/utils.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# pubspec.yaml
|
2 years ago |
|
Sultan khan
|
333dba3777
|
business mission issue fixed.
|
2 years ago |
Sikander Saleem
|
23b4e81170
|
my documents added.
|
2 years ago |
|
haroon amjad
|
15c8e80799
|
ERM Video fixes
|
2 years ago |
|
Sultan khan
|
608a8fcb97
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/app_state/app_state.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
|
2 years ago |
|
Sultan khan
|
aca223c700
|
business trip fixed
|
2 years ago |
|
Sultan khan
|
790103bdc9
|
chat changes
|
2 years ago |
|
Sikander Saleem
|
571b8bd7af
|
itg active directory password change added.
|
3 years ago |
haroon amjad
|
91eb51e42f
|
marathon updates & DateFormat fixes
|
3 years ago |
|
Sultan khan
|
61904ca5f7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/consts.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
|
Sikander Saleem
|
1e478c9900
|
approve & reject button added on PO/PR & after request submission,loading issue fixed on worklist.
|
3 years ago |
|
Sikander Saleem
|
47732d67cb
|
drawer item align issue fixed on arabic.
|
3 years ago |
|
Sultan khan
|
e65d876223
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
2ab1c5afdc
|
dropdown clear issue fixed
|
3 years ago |
|
haroon amjad
|
bcf67895b9
|
Dynamic forms & my team fixes
|
3 years ago |
|
Sikander Saleem
|
3a6d1c3273
|
leave balance issues fixed-2.
|
3 years ago |
|
Sikander Saleem
|
fe02776a69
|
leave balance issues fixed.
|
3 years ago |
|
Sikander Saleem
|
86d6b57cbc
|
dynamic list screen items grid view improvements
|
3 years ago |
|
Sultan khan
|
5384d0e59c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
7b6e2547d7
|
comp-off issue fixed
|
3 years ago |
|
haroon amjad
|
4c53fcfdb6
|
updates & fixes
|
3 years ago |
Fatimah Alshammari
|
dde200fd7a
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
cd813a163f
|
fix issues
|
3 years ago |
|
Sultan khan
|
d25e608565
|
bug fixes
|
3 years ago |
|
haroon amjad
|
6463dfc424
|
Reverting fatima changes
|
3 years ago |
|
haroon amjad
|
d80f93a6dc
|
Revert "no message"
This reverts commit 323741ad06.
|
3 years ago |
|
haroon amjad
|
323741ad06
|
no message
|
3 years ago |
|
Fatimah Alshammari
|
f43b4905c5
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into fatima
# Conflicts:
# lib/ui/misc/request_submit_screen.dart
|
3 years ago |
|
Sultan khan
|
86be7ccc5f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
c500da9a18
|
bug fix
|
3 years ago |
|
Fatimah Alshammari
|
581e6de897
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
85be372ad8
|
Merge branch 'master' into fatima
# Conflicts:
# lib/classes/consts.dart
# lib/ui/leave_balance/add_leave_balance_screen.dart
|
3 years ago |
|
Fatimah Alshammari
|
9d0bf4fe7e
|
fix issues
|
3 years ago |
mirza.shafique
|
ef5136ebfa
|
worklist animation & loader
|
3 years ago |
|
Sultan khan
|
bcf4a9ec42
|
my team probation issue fixed
|
3 years ago |
|
Fatimah Alshammari
|
ba1a5c66ef
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
d849699489
|
fix issues
|
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
|
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
|
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 |