Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity
1,417 Commits
25 Branches
0 Tags
22 MiB
master
flutter_upgrade_with_timesheet_changes
master-Api2.0_update3.29
mohem_flutter_upgrade
flutter_upgrade
master_eventActivity
master-Api2.0
mohemm_poc
faiz_disclosure
payment_worklist_CR_6939
development_sikander
development_aamir
sultan-dev
faiz_dev_marathon_text_fix
business_trip_settlement
development_haroon
development_haroon_merge_aamir
dev_faiz
development_aamir_testing23
development_faiz
mirza_hmg_wifi_phase_1
development_mirza
fatima
faiz_marathon_signalR_critical
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '04a2561f7f'
${ noResults }
Commit Graph

354 Commits (04a2561f7fd99fa702abc2117970bc01501c7582)

Author SHA1 Message Date
Aamir Muhammad 7408e24245 Chat Delivered&Seen Event Added. 3 years ago
haroon amjad 1a2c9d1b15 Merge branch 'fatima' into 'master' 
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!37
 3 years ago
Aamir Muhammad 6d5b2323ac Merge branch 'master' into development_aamir 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
 3 years ago
Fatimah Alshammari 79774416b4 Merge branch 'master' into fatima 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
 3 years ago
Fatimah Alshammari 69ded3dc43 fix my request 3 years ago
haroon amjad c87a00df6a Jira fixes 3 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and font settings 3 years ago
FaizHashmiCS22 f9885fa979 Merge branch 'master' into development_faiz 3 years ago
Sikander Saleem 0a73cced51 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 212f8e6663 worklist & itg counters issue resolved, delegate & request info in itg added. 3 years ago
FaizHashmiCS22 f3623e29dc Merge branch 'master' into development_faiz 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
 3 years ago
haroon amjad 966fb5e209 Worklist fixes 3 years ago
FaizHashmiCS22 199a65a994 Merge branch 'master' into development_faiz 3 years ago
haroon amjad 588e8f51f0 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 8b0bae0891 Worklist updates 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
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
Fatimah Alshammari 7b4fe5bcbc fix issues 3 years ago
Aamir Muhammad 82afd0ae61 Chat Fixes 3 years ago
Aamir Muhammad a623765510 Merge branch 'master' into development_aamir 3 years ago
haroon amjad 109c0ca0a2 PR PO fixes, Worklist fixes 3 years ago
Aamir Muhammad 05c6cc7f14 Chat Search User Api Implementation 3 years ago
Aamir Muhammad d4b31d4338 Chat Login Api Implementation 3 years ago
Aamir Muhammad a90da83fa5 Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/api/chat/chat_provider_model.dart
 3 years ago
Aamir Muhammad d24103b872 Chat Login Api Implementation 3 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 3 years ago
Sikander Saleem 49bd4114ce improvements 3 years ago
Aamir Muhammad 57ebe40b5d Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
 3 years ago
Aamir Muhammad e115137205 Chat Implementation Version 1 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
Sultan khan 8d9561b570 COC changes 3 years ago
haroon amjad 9f74c3c39a ITG request flow fixed 3 years ago
Sikander Saleem 0c7fbde013 Merge branch 'master' into development_sikander 
# Conflicts:
#	lib/ui/my_attendance/services_menu_list_screen.dart
 3 years ago
Sikander Saleem 9a0131277b create request by manager in my team, improvements 3 years ago
haroon amjad dd26452663 Fixes & updates 3 years ago
Sikander Saleem 9ce042e7d3 bussiness card improvement. 3 years ago
haroon amjad 20e6a6ddc3 Attendance fixes 3 years ago
devmirza121 8ce3a09375 Login with face and finger fixed 3 years ago
Sikander Saleem ea2a9c541c change password screen added. 3 years ago
Sikander Saleem 4b935f1dc5 leave balance dashboard added. 3 years ago
Sikander Saleem 8e94d57dae performance evaluation improvements. 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 9186e3cdaa leave balance validate model added. 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
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 a14103b859 leave balance cont3. 3 years ago
haroon amjad 7c0589ef32 Announcement details fixes 3 years ago
haroon amjad 028caf1379 Offers & Discounts implemented 3 years ago
Sikander Saleem 8855eb7622 leave balance cont2. 3 years ago
Sikander Saleem 169a9bcc60 leave balance cont. 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 3750f2c904 Vacation rule added complete. 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 68146ecd97 dynamic forms finalized & improvements 3 years ago
Sikander Saleem 48de28c0b3 Merge branch 'master' into development_sikander 3 years ago
Fatimah Alshammari aca788ae26 fix translations 3 years ago
Sikander Saleem c390d87fca Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem d5b1512eb4 improvements 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
Fatimah Alshammari 57bf34a93a fix translation. 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
Sultan Khan b10e6184d6 Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan 26bbff6844 Merge branch 'master' 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
devmirza121 2ced8313da QR, Digital Card & Employee ID Implementation 3 years ago
Sikander Saleem 2f013ba1ad lint rules added. 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
Sikander Saleem 2adb1e34bf Merge branch 'development_haroon' into 'master' 
Development haroon

See merge request mirza.shafique/mohem_flutter_app!35
 3 years ago
haroon amjad e045374703 Not found svg added, Pending transactions, Announcements. 3 years ago
Sikander Saleem e01bb920a7 Merge branch 'development_haroon' into 'master' 
Pending Transactions implemented

See merge request mirza.shafique/mohem_flutter_app!34
 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
Sikander Saleem 4c18f038e5 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem cb88f12ced return from leave done. 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 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
Fatimah Alshammari 7be1bdcdc2 fix family member 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
Sultan Khan 91a67638c4 phone number inprogress 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 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 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 2f395f29df Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Sultan Khan ff17adfd09 Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Sikander Saleem 9b5147b565 merge improvements 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 4817781fe1 Merge branch 'development_mirza' into development_sikander 
# Conflicts:
#	lib/provider/dashboard_provider_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
 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
devmirza121 eb3ddb3d9e NFC Attendance implement 1.3 4 years ago
devmirza121 68729ddbb9 NFC Attendance implement 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 b5c9b83fdd api structure improvement. 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