Sikander Saleem
|
4ebba3900c
|
dashboard improvements, monthly attendance & vacation rule added.
|
2 years ago |
Fatimah Alshammari
|
1ef3783fb9
|
Merge branch 'master' into Fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/api/profile_api_client.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/landing/widget/app_drawer.dart
# lib/ui/profile/delete_familyMember.dart
# lib/ui/profile/family_members.dart
# lib/ui/profile/phone_numbers.dart
# lib/ui/screens/profile/profile_screen.dart
|
2 years ago |
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
2 years ago |
Sikander Saleem
|
f1c36b5821
|
monthly pay slip added.
|
2 years ago |
Fatimah Alshammari
|
a4ca7433a4
|
add and update family member in progress
|
2 years ago |
haroon amjad
|
556215807b
|
pubspec update
|
2 years ago |
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
2 years ago |
Fatimah Alshammari
|
17ca565f4c
|
Merge branch 'development_sultan' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
lib/api/profile_api_client.dart
|
2 years ago |
Fatimah Alshammari
|
c3945d2583
|
family member in progress
|
2 years ago |
haroon amjad
|
9e8bc47f7e
|
Mowadhafhi request completed
|
2 years ago |
haroon amjad
|
cf523566cd
|
Mowadhafi home & details page done
|
2 years ago |
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
|
2 years ago |
Fatimah Alshammari
|
7be1bdcdc2
|
fix family member
|
2 years ago |
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
2 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
|
2 years ago |
Sikander Saleem
|
1e9a26e3df
|
missing swipe cont
|
2 years ago |
Sikander Saleem
|
c4096bd44d
|
improvements
|
2 years ago |
Sultan Khan
|
8f80bbb9db
|
profile dynamic forms
|
2 years ago |
Sultan Khan
|
13150321d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sikander Saleem
|
dadaeed10e
|
dynamic forms cont.
|
2 years ago |
Sultan Khan
|
57f789ca6d
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Fatimah Alshammari
|
6529c2aeba
|
profile pages
|
2 years ago |
Sultan Khan
|
74c06203db
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sultan Khan
|
6e86c0ba38
|
profile details
|
2 years ago |
Fatimah Alshammari
|
393e28b32c
|
fix profile
|
2 years ago |
Sultan Khan
|
82570b9ba6
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sikander Saleem
|
25d020441c
|
my attendance working cont-1
|
2 years ago |
Fatimah Alshammari
|
0e560558dc
|
Merge branch 'master' into Fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/extensions/widget_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard.dart
# pubspec.lock
# pubspec.yaml
|
2 years ago |
Sultan Khan
|
06b3726d4a
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
Sultan Khan
|
0974861463
|
updated menus
|
2 years ago |
Sikander Saleem
|
a431913bb6
|
purchase order & move order, item history & quotation analysis added.
|
3 years ago |
Fatimah Alshammari
|
0cd37ce0fa
|
fix calendar
|
3 years ago |
Sultan Khan
|
da6b935c0b
|
subpages changes
|
3 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
|
3 years ago |
Sikander Saleem
|
6b9ea200ad
|
login flow added.
|
3 years ago |
devmirza121
|
fb8d6c7b20
|
Dashboard API's 1.1
|
3 years ago |
Sikander Saleem
|
f1beefbc46
|
login apis, models & forgot password screen added.
|
3 years ago |
Sikander Saleem
|
c6ac45fc3d
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/colors.dart
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/landing/dashboard.dart
|
3 years ago |
Sikander Saleem
|
b38f4287b6
|
today attendance progress added(cont)
|
3 years ago |
tall3at
|
b2466122d3
|
internal Work List screen
|
3 years ago |
Sikander Saleem
|
f48e09b2d1
|
forgot password screen added.
|
3 years ago |
tall3at
|
bf8dce2afd
|
Work List screen
|
3 years ago |
Sikander Saleem
|
311ebd9c13
|
confirm login screen added & structure improvement.
|
3 years ago |
Sikander Saleem
|
761b5abbab
|
model improvements
|
3 years ago |
Sikander Saleem
|
8470495332
|
Gradle updated, fonts added & structure improvements
|
3 years ago |
tall3at
|
ac98216630
|
basic structure 1.0
|
3 years ago |
tall3at
|
89f6df8c77
|
basic structure
|
3 years ago |