haroon amjad
|
cf9f84f38b
|
PO fixes
|
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 |
FaizHashmiCS22
|
3c6e4a725f
|
Merge branch 'master' into faiz_cs
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# pubspec.yaml
|
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 |
FaizHashmiCS22
|
38c7d78db3
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
Fatimah Alshammari
|
1b13b732b8
|
fix issues
|
3 years ago |
haroon amjad
|
aabc86290a
|
Language change option added in app drawer
|
3 years ago |
haroon amjad
|
109c0ca0a2
|
PR PO fixes, Worklist fixes
|
3 years ago |
Aamir Muhammad
|
d24103b872
|
Chat Login Api Implementation
|
3 years ago |
Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
Sikander Saleem
|
d61315a5fe
|
Merge branch 'master' into development_sikander
|
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 |
devmirza121
|
0d0832277f
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/ui/work_list/worklist_fragments/detail_fragment.dart
# lib/ui/work_list/worklist_fragments/info_fragments.dart
# pubspec.yaml
|
3 years ago |
devmirza121
|
116175efaa
|
Work list UI Change
|
3 years ago |
Sikander Saleem
|
f36606f603
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/work_list_screen.dart
|
3 years ago |
Sikander Saleem
|
06810486e3
|
dynamic list center issue fixed.
|
3 years ago |
Sultan khan
|
ca3febeccd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
|
3 years ago |
Sultan khan
|
8d9561b570
|
COC changes
|
3 years ago |
Fatimah Alshammari
|
53dabdd853
|
Merge branch 'master' into fatima
|
3 years ago |
Fatimah Alshammari
|
be506fa059
|
fix issues
|
3 years ago |
haroon amjad
|
f6c9b6dce9
|
Updates & fixes
|
3 years ago |
haroon amjad
|
dd26452663
|
Fixes & updates
|
3 years ago |
Sikander Saleem
|
a45b6aece2
|
improvements
|
3 years ago |
Sikander Saleem
|
4b935f1dc5
|
leave balance dashboard added.
|
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 |
Fatimah Alshammari
|
07636bef77
|
Merge branch 'master' into Fatima
|
3 years ago |
Sikander Saleem
|
ee2c74b5da
|
leave balance submit request added.
|
3 years ago |
Sikander Saleem
|
cf7843191b
|
leave balance added.
|
3 years ago |
Fatimah Alshammari
|
bee1aef03e
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/models/get_user_item_type_list.dart
# lib/models/my_team/get_attendance_tracking_list_model.dart
# lib/models/my_team/get_employee_subordinates_list.dart
# lib/models/update_item_type_success_list.dart
# lib/models/update_user_item_type_list.dart
# lib/models/worklist/update_user_type_list.dart
# lib/ui/my_team/view_attendance.dart
# lib/ui/profile/contact_details.dart
|
3 years ago |
Fatimah Alshammari
|
d640ce29de
|
fix issue
|
3 years ago |
Sikander Saleem
|
2f6e40da46
|
add leave balance cont.
|
3 years ago |
Sikander Saleem
|
9186e3cdaa
|
leave balance validate model added.
|
3 years ago |
Sikander Saleem
|
41a1ba125e
|
code improvements.
|
3 years ago |
Sikander Saleem
|
9314ea0514
|
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
# lib/models/generic_response_model.dart
|
3 years ago |
Fatimah Alshammari
|
89058f9e59
|
Merge branch 'master' into Fatima
|
3 years ago |
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
3 years ago |
haroon amjad
|
50f203cd55
|
Updates & fixes
|
3 years ago |
haroon amjad
|
a05d037211
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/colors.dart
# lib/extensions/string_extensions.dart
# lib/ui/screens/announcements/announcement_details.dart
# lib/ui/screens/announcements/announcements.dart
# lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
# lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
|
3 years ago |
Sikander Saleem
|
2278a1e98f
|
Merge remote-tracking branch 'origin/development_sikander' into development_sikander
# Conflicts:
# lib/ui/leave_balance/add_leave_balance_screen.dart
|
3 years ago |
Sikander Saleem
|
d5c8604f32
|
leave balance cont3.
|
3 years ago |
Sikander Saleem
|
a14103b859
|
leave balance cont3.
|
3 years ago |
haroon amjad
|
028caf1379
|
Offers & Discounts implemented
|
3 years ago |
Sikander Saleem
|
8855eb7622
|
leave balance cont2.
|
3 years ago |
Sikander Saleem
|
d6cc5fcc6c
|
pending transaction.
|
3 years ago |
haroon amjad
|
a855e535cd
|
Item for sale implemented
|
3 years ago |
Fatimah Alshammari
|
dc880df35a
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/models/profile_menu.model.dart
|
3 years ago |
Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
3 years ago |
Sikander Saleem
|
8247032a52
|
profile options linked with home page personal information.
|
3 years ago |
Sikander Saleem
|
3750f2c904
|
Vacation rule added complete.
|
3 years ago |
haroon amjad
|
40cdaca0ef
|
Merge branch 'master' into development_haroon
|
3 years ago |
haroon amjad
|
5c15d07dc8
|
updates
|
3 years ago |
Sikander Saleem
|
4edb19c2bb
|
Vacation rule added cont.
|
3 years ago |
Sikander Saleem
|
55f1f792f9
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/models/profile_menu.model.dart
|
3 years ago |
Sikander Saleem
|
3fcbd9946a
|
configs for ios.
|
3 years ago |
Sultan Khan
|
39b916bcc8
|
performance page added
|
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 |
haroon amjad
|
c63844dcf7
|
My requests & CCP
|
3 years ago |
Fatimah Alshammari
|
0820f87877
|
Merge branch 'master' into Fatima
|
3 years ago |
Fatimah Alshammari
|
d1cc9bd468
|
fix issue
|
3 years ago |
Sultan Khan
|
ff4a546e5f
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sikander Saleem
|
0d812cf266
|
Vacation rule added.
|
3 years ago |
Sikander Saleem
|
48de28c0b3
|
Merge branch 'master' into development_sikander
|
3 years ago |
Sultan Khan
|
3c777d220e
|
basic details
|
3 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
|
3 years ago |
Fatimah Alshammari
|
30ca1894db
|
fix issues.
|
3 years ago |
Sikander Saleem
|
0b2a87aaaf
|
dynamic forms logic improvement.
|
3 years ago |
Sultan Khan
|
b10e6184d6
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Fatimah Alshammari
|
23110b792f
|
completed add and update family member
|
3 years ago |
Sultan Khan
|
06b14394bd
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sultan Khan
|
e6e150b9e3
|
address phone numbers
|
3 years ago |
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
3 years ago |
Sikander Saleem
|
f1c36b5821
|
monthly pay slip added.
|
3 years ago |
Fatimah Alshammari
|
a4ca7433a4
|
add and update family member in progress
|
3 years ago |
haroon amjad
|
d614532956
|
Announcements implemented
|
3 years ago |
haroon amjad
|
e045374703
|
Not found svg added, Pending transactions, Announcements.
|
3 years ago |
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
3 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
|
3 years ago |
Fatimah Alshammari
|
c3945d2583
|
family member in progress
|
3 years ago |
Sultan Khan
|
9b213dc9ab
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sultan Khan
|
ea5178fe20
|
profle dynamic forms
|
3 years ago |
haroon amjad
|
9e8bc47f7e
|
Mowadhafhi request completed
|
3 years ago |
haroon amjad
|
cf523566cd
|
Mowadhafi home & details page done
|
3 years ago |
Sultan Khan
|
f329f7030d
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
Sultan Khan
|
23326a769a
|
PHONE NUMBERS
|
3 years ago |
Sikander Saleem
|
ce7183a137
|
merge conflicts fixed.
|
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 |
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
|
3 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 |