Sikander Saleem
|
6be8510b86
|
drawer menu ui changed.
|
3 years ago |
haroon amjad
|
028caf1379
|
Offers & Discounts implemented
|
3 years ago |
Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
3 years ago |
|
haroon amjad
|
1719c7029e
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/screens/announcements/announcement_details.dart
# pubspec.yaml
|
3 years ago |
devmirza121
|
7ca9096d89
|
Merge issue 2.0
|
3 years ago |
|
devmirza121
|
8fe51a654c
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/main.dart
# lib/ui/landing/today_attendance_screen.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
3 years ago |
|
devmirza121
|
2ced8313da
|
QR, Digital Card & Employee ID Implementation
|
3 years ago |
|
haroon amjad
|
d614532956
|
Announcements implemented
|
3 years ago |
|
haroon amjad
|
556215807b
|
pubspec update
|
3 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
|
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 |
|
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
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
|
1e9a26e3df
|
missing swipe cont
|
3 years ago |
Sultan Khan
|
b5a5399b95
|
profile
|
3 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
|
4 years ago |
|
devmirza121
|
b898481cf7
|
Merge branch 'Fatima' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/extensions/widget_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/landing/dashboard.dart
# pubspec.lock
# pubspec.yaml
|
4 years ago |
|
Fatimah Alshammari
|
0cd37ce0fa
|
fix calendar
|
4 years ago |
|
devmirza121
|
68729ddbb9
|
NFC Attendance implement
|
4 years ago |
|
devmirza121
|
48a261d674
|
Dashboard API's 1.4
|
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
|
fb8d6c7b20
|
Dashboard API's 1.1
|
4 years ago |
|
devmirza121
|
c2ced77bca
|
shimmer
|
4 years ago |
|
Sikander Saleem
|
78ca9e2c70
|
icons added & dashboard ui
|
4 years ago |
|
Sikander Saleem
|
311ebd9c13
|
confirm login screen added & structure improvement.
|
4 years ago |
|
Sikander Saleem
|
761b5abbab
|
model improvements
|
4 years ago |
|
Sikander Saleem
|
8470495332
|
Gradle updated, fonts added & structure improvements
|
4 years ago |
tall3at
|
89f6df8c77
|
basic structure
|
4 years ago |
|
tall3at
|
1b6ebc67c3
|
first commit
|
4 years ago |