Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity
1,419 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 'master'
${ noResults }
Commit Graph

143 Commits (master)

Author SHA1 Message Date
Aamir Muhammad 2303daa1ad Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Amir Saleem 992490812e Notification IOS Fix 3 years ago
haroon amjad 59885b29f6 Merge branch 'development_aamir' into 'master' 
notification to chat navigate

See merge request Cloud_Solution/mohemm-flutter-app!142
 3 years ago
mirza.shafique aa511f02ac Merge branch 'master' into development_mirza 
# Conflicts:
#	lib/classes/consts.dart
#	pubspec.yaml
 3 years ago
Aamir Muhammad 75eab961ce Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/classes/notifications.dart
 3 years ago
Aamir Muhammad ffd894ca28 Notification To Specific Screen 3 years ago
Sikander Saleem dd6627f216 firebase notification token issue fix. 3 years ago
Aamir Muhammad 698aee3482 Notification 3 years ago
Aamir Muhammad 1eca46600d Merge branch 'master' into development_aamir 
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner/Info.plist
#	lib/api/chat/chat_api_client.dart
#	lib/ui/login/login_screen.dart
 3 years ago
Sikander Saleem f8ae5b0987 mark attendance session expire fixed 3 years ago
Aamir Muhammad 7152b0d57b Chat Fix 3 years ago
Sikander Saleem f4b57a33f9 local internet connectivity fixed on ios 3 years ago
haroon amjad a9bf383164 Updates & fixes 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
haroon amjad 3003f354b8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app 3 years ago
haroon amjad fe5807c997 version update 3 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 3 years ago
haroon amjad f6c5e1de41 Merge branch 'master' into development_haroon 3 years ago
haroon amjad b4fc3dd5fd version fixes 3 years ago
Aamir Muhammad 09c401a157 Voice Chat Fixes & Audio Player Implementation 3 years ago
haroon amjad 696a6881c4 date fixes & Items of sale updates 3 years ago
Aamir Muhammad e40cd2c5c8 Chat Error Handling & Voice 3 years ago
Sikander Saleem 86d6b57cbc dynamic list screen items grid view improvements 3 years ago
haroon amjad a39e6808d7 fixes & updates 3 years ago
Aamir Muhammad ae559df29f Chat Fixes & Counter Updated on Signal R 3 years ago
haroon amjad ecaede0deb Updates & fixes 3 years ago
Aamir Muhammad 3e666eb6be Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad f6f801f9cf Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad cecb2d59e9 Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image 3 years ago
Faiz Hashmi 2f825151a0 Merge branch 'master' into faiz_cs 
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/marathon/marathon_intro_screen.dart
#	lib/ui/marathon/marathon_provider.dart
#	lib/ui/marathon/marathon_screen.dart
#	lib/ui/marathon/marathon_winner_selection.dart
#	lib/ui/marathon/widgets/question_card.dart
#	pubspec.yaml
 3 years ago
Sikander Saleem 7d651c247a marathon improvements. 3 years ago
Faiz Hashmi cbe251829f Added HubConnection Code 3 years ago
haroon amjad 03c488c663 Merge branch 'master' into development_haroon 
# Conflicts:
#	lib/classes/consts.dart
#	lib/widgets/app_bar_widget.dart
 3 years ago
Aamir Muhammad 68939f6256 Chat Call UI 3 years ago
haroon amjad 7fc80367d0 Merge branch 'master' into development_haroon 
# Conflicts:
#	lib/classes/consts.dart
 3 years ago
Aamir Muhammad ee0e774611 Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/classes/colors.dart
#	lib/classes/consts.dart
 3 years ago
Aamir Muhammad 8ba3dcf43b Chat Fixes & Favorite Api Implementation 3 years ago
haroon amjad c22556d9b6 fixes 3 years ago
haroon amjad 2fdde18b52 Merge branch 'faiz_cs' into 'master' 
Updated Banner Again :D

See merge request Cloud_Solution/mohemm-flutter-app!49
 3 years ago
haroon amjad 21d396b3bb Worklist updates 3 years ago
Zohaib Iqbal Kambrani 143d0772f2 test commit from iMac with nothing special 3 years ago
FaizHashmiCS22 034436425a Added success tone 3 years ago
Sikander Saleem 528b0930c2 mark attendance counter 1.0 3 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and 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
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 3 years ago
Sikander Saleem 7aa2e0f000 code of conduct, workmen regulations added. & improvement. 3 years ago
Aamir Muhammad 57ebe40b5d Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
 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
haroon amjad 866bb8a29e Pull to refresh, Items for Sale & Offers n Discounts fixes 3 years ago
haroon amjad ff2f42303e pubspec update 3 years ago
haroon amjad eb29553d26 NFC Fixes 3 years ago
haroon amjad b0b84c572c Last Login Fixes 3 years ago
Fatimah Alshammari 07d4aadc4e added survey screen 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
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