 Sikander Saleem
|
95e2e74fd0
|
Merge branch 'master' into development_sikander
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/main.dart
# lib/models/generic_response_model.dart
# lib/ui/my_attendance/my_attendance_screen.dart
# lib/ui/work_list/worklist_detail_screen.dart
|
3 years ago |
Fatimah Alshammari
|
4ddd967177
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
# pubspec.yaml
|
3 years ago |
devmirza121
|
2010e9d6a0
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/colors.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/attendance/monthly_attendance.dart
# lib/ui/landing/dashboard.dart
# lib/widgets/radio/show_radio.dart
# pubspec.yaml
|
3 years ago |
|
Fatimah Alshammari
|
fd07de072c
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
lib/main.dart
lib/ui/profile/contact_details.dart
|
3 years ago |
|
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
3 years ago |
Sultan Khan
|
794cd2b1e8
|
phone number inprogress
|
3 years ago |
|
Fatimah Alshammari
|
60db9041a1
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
assets/langs/en-US.json
lib/ui/profile/contact_details.dart
lib/ui/profile/personal_info.dart
pubspec.yaml
|
3 years ago |
|
Fatimah Alshammari
|
d2a6ed8de7
|
fix monthly attendance
|
3 years ago |
|
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
3 years ago |
|
Sikander Saleem
|
ae0a788728
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# pubspec.yaml
|
3 years ago |
|
Sikander Saleem
|
3e6fdd2cb5
|
missing swipe added.
|
3 years ago |
|
Sikander Saleem
|
1e9a26e3df
|
missing swipe cont
|
3 years ago |
|
Sultan Khan
|
979879a286
|
phone number is progress
|
3 years ago |
|
Sikander Saleem
|
c4096bd44d
|
improvements
|
3 years ago |
|
Sikander Saleem
|
9cc86751eb
|
missing swipe cont
|
3 years ago |
|
Sultan Khan
|
8f80bbb9db
|
profile dynamic forms
|
3 years ago |
|
Sultan Khan
|
b5a5399b95
|
profile
|
3 years ago |
|
Sultan Khan
|
13150321d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Sikander Saleem
|
dadaeed10e
|
dynamic forms cont.
|
3 years ago |
|
Sultan Khan
|
a0ccacf078
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Sultan Khan
|
fad58931f3
|
profile
|
3 years ago |
|
Fatimah Alshammari
|
44c9a090f9
|
fix personal details
|
3 years ago |
|
Sultan Khan
|
57f789ca6d
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Fatimah Alshammari
|
6529c2aeba
|
profile pages
|
3 years ago |
|
Sultan Khan
|
74c06203db
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Fatimah Alshammari
|
393e28b32c
|
fix profile
|
3 years ago |
|
Fatimah Alshammari
|
b281efe14c
|
fix monthly attendance
|
4 years ago |
|
Sultan Khan
|
82570b9ba6
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
4 years ago |
|
Sikander Saleem
|
25d020441c
|
my attendance working cont-1
|
4 years ago |
|
Sultan Khan
|
06b3726d4a
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
4 years ago |
|
Sultan Khan
|
0974861463
|
updated menus
|
4 years ago |
|
Sikander Saleem
|
807d4b4046
|
item creation added.
|
4 years ago |
|
Sikander Saleem
|
a431913bb6
|
purchase order & move order, item history & quotation analysis added.
|
4 years ago |
|
Sikander Saleem
|
384aa8d9b4
|
wokrlist api's added & improvements
|
4 years ago |
|
Sikander Saleem
|
4b5ab2cd7f
|
wokrlist api's added & improvements
|
4 years ago |
|
Sikander Saleem
|
e7a67cc58d
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/locale_keys.g.dart
# lib/main.dart
# lib/models/generic_response_model.dart
# lib/ui/login/login_screen.dart
# lib/ui/login/verify_login_screen.dart
# pubspec.yaml
|
4 years ago |
|
Sikander Saleem
|
6b9ea200ad
|
login flow added.
|
4 years ago |
|
devmirza121
|
b6670289b1
|
Dashboard API's 1.2
|
4 years ago |
|
devmirza121
|
fb8d6c7b20
|
Dashboard API's 1.1
|
4 years ago |
|
devmirza121
|
baa7182655
|
Dashboard API's 1.0
|
4 years ago |
|
Sikander Saleem
|
02be1cde49
|
api structure improvement.
|
4 years ago |
|
Sikander Saleem
|
f1beefbc46
|
login apis, models & forgot password screen added.
|
4 years ago |
|
Sikander Saleem
|
bf08417bfa
|
login apis and models added.
|
4 years ago |
|
Sikander Saleem
|
311ebd9c13
|
confirm login screen added & structure improvement.
|
4 years ago |
tall3at
|
89f6df8c77
|
basic structure
|
4 years ago |