Commit Graph

350 Commits (2fb4a99a4247a2adf08e3e1e4bcd858210314a2d)

Author SHA1 Message Date
Sultan khan b2ffa0c619 Merge branch 'master' into mohem_flutter_upgrade
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/dialogs/otp_dialog.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/theme/app_theme.dart
#	lib/ui/attendance/monthly_attendance_screen.dart
#	lib/ui/chat/chat_home_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	lib/ui/my_team/view_attendance.dart
#	lib/ui/profile/delete_family_member.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/ui/work_list/worklist_detail_screen.dart
#	lib/ui/work_list/worklist_fragments/info_fragments.dart
#	lib/widgets/app_bar_widget.dart
#	lib/widgets/image_picker.dart
#	lib/widgets/nfc/nfc_reader_sheet.dart
#	pubspec.yaml
1 year ago
haroon amjad c57c22a58c ERM Channel Text URL implemented 1 year ago
Sultan khan 3b3046804e upgraded 1 year ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 2 years ago
sultan khan 6e15336cc4 image changes. 2 years ago
sultan khan 822a99a291 countdown updated. 2 years ago
sultan khan 75ba1283d3 event activity page added. 2 years ago
Sikander Saleem 6e3fc55fde event activity added - cont 2 years ago
Sikander Saleem c35074576a offer and discount, do not show if api have issue. 2 years ago
haroon amjad c1503cc236 updates & fixes 2 years ago
Sikander Saleem 4eb3e6d52d progress bar added on erm video. & skip button relocation. 2 years ago
haroon amjad 2682158590 ERM Channel Video changes 2 years ago
Sikander Saleem e8fbffdc9c scroll, padding & content by language added on image ad. 2 years ago
haroon amjad 10a337ddd7 Added additional details in VIDA Access Request in ITG 3 years ago
haroon amjad 55c096aa7e Chat video fixes 3 years ago
haroon amjad d3358d578c Update to stores 3 years ago
Sikander Saleem 449c93649a multiple survey added. 3 years ago
Sikander Saleem 610d4788c2 parameter added in survey. 3 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 3 years ago
Sultan khan 88be17249d Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
3 years ago
Aamir Muhammad 6cf7340417 Business Card Design Update 3 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 3 years ago
haroon amjad a48d703642 ITG ADs update 3 years ago
Sikander Saleem 23b4e81170 my documents added. 3 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 3 years ago
haroon amjad 15c8e80799 ERM Video fixes 3 years ago
haroon amjad 45fdb4a466 updates 4 years ago
haroon amjad 1f369e9122 survey updates 4 years ago
haroon amjad 1dca3076d9 Survey dynamic questions 4 years ago
Sikander Saleem 879e2aa561 Merge branch 'master' into development_sikander 4 years ago
Sikander Saleem 571b8bd7af itg active directory password change added. 4 years ago
haroon amjad b1e140fb75 PR Details implemented 4 years ago
Sikander Saleem d971f4a651 po worklist forward & approve and forward RespondAttributeList payload improvement. 4 years ago
mirza.shafique 13d8aac22e ERM fixes 4 years ago
haroon amjad 1ebcbd1079 ERM Channel Audio playback implemented 4 years ago
haroon amjad 379015ca6c chat privilege added 4 years ago
Faiz Hashmi 601a0cdbfd Added test Dialog for Huawei 4 years ago
haroon amjad 5e22bcc1da ERM Channel 4 years ago
haroon amjad aacc7c6437 icon change 4 years ago
Aamir Muhammad 2303daa1ad Merge branch 'master' into development_aamir 4 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 4 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 4 years ago
mirza.shafique d458e8ac45 Merge branch 'master' into development_mirza 4 years ago
Sikander Saleem 550e26dce1 Attendance loader fix 4 years ago
Sikander Saleem 0e329e8e2b ticket balance value display fixed & infant added in value. 4 years ago
Sultan khan b227f11c7b Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 4 years ago
haroon amjad 59885b29f6 Merge branch 'development_aamir' into 'master'
notification to chat navigate

See merge request Cloud_Solution/mohemm-flutter-app!142
4 years ago
Sultan khan 61904ca5f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
4 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 4 years ago
mirza.shafique aa511f02ac Merge branch 'master' into development_mirza
# Conflicts:
#	lib/classes/consts.dart
#	pubspec.yaml
4 years ago
Aamir Muhammad 948689b67a Notification To Specific Screen 4 years ago
Aamir Muhammad 75eab961ce Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
4 years ago
Aamir Muhammad ffd894ca28 Notification To Specific Screen 4 years ago
Sikander Saleem 84a07df310 Merge branch 'master' into development_sikander 4 years ago
Sikander Saleem 0f84f9ae65 app life cycle added.
file attachment option added on dynamic form. & improvements
4 years ago
Aamir Muhammad 698aee3482 Notification 4 years ago
Sikander Saleem e10ea6b023 mark attendance session expire fixed 4 years ago
Aamir Muhammad c8f9826266 Permission Issue 4 years ago
haroon amjad e685cf188c updates 4 years ago
haroon amjad 47a274b1d3 Merge branch 'master' into development_haroon 4 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 4 years ago
haroon amjad 0d2052346e updates 4 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 4 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 4 years ago
Sikander Saleem 5261f3e416 marathon placement change, worklist type list improvement. 4 years ago
Sikander Saleem 47732d67cb drawer item align issue fixed on arabic. 4 years ago
haroon amjad b522aab685 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
4 years ago
Aamir Muhammad 08e0af8f64 Chat Bug's Fix 4 years ago
haroon amjad 631752cffa fixes 4 years ago
haroon amjad a39e6808d7 fixes & updates 4 years ago
Aamir Muhammad 76239d0077 Fixes 4 years ago
Aamir Muhammad feb5c5071c Fav Users Images Fix 4 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 4 years ago
Faiz Hashmi f31db58a76 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
4 years ago
Faiz Hashmi 603ff1b19f Committing after API replacement from SignalR => InProgress 4 years ago
haroon amjad 915a7d208f Jira translation fix 4 years ago
Aamir Muhammad e94a8d9a5e Hub Connection Fix 4 years ago
Aamir Muhammad abc586b81e Chat Fixes & User Chat Counter 4 years ago
Aamir Muhammad 8d5cc7ed23 Chat Fixes & User Chat Counter 4 years ago
Aamir Muhammad 4e96108207 Chat Fixes & User Chat Counter 4 years ago
Aamir Muhammad 0db4a5a7cd Chat Fixes & User Chat Counter 4 years ago
Aamir Muhammad fb97319164 Chat Fixes & User Chat Counter 4 years ago
Aamir Muhammad f6f801f9cf Chat Fixes & User Chat Counter 4 years ago
Sikander Saleem 3438b9c174 Merge branch 'master' into development_sikander 4 years ago
Sikander Saleem b718f96c3a counter direction issue fix. 4 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
4 years ago
Sikander Saleem 91a0be7974 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/classes/consts.dart
4 years ago
Sikander Saleem 7d651c247a marathon improvements. 4 years ago
Faiz Hashmi 59ad00ca2a Fetched Questoins and Added Answer Interactivity 4 years ago
Aamir Muhammad 545c33ee4a Chat Fixes 4 years ago
Aamir Muhammad fa36cd7ddf Advertisement Image/ Video Module 4 years ago
Aamir Muhammad fa7e08c215 Advertisement Image/ Video Module 4 years ago
Aamir Muhammad db3e1427c5 Advertisement Image/ Video Module 4 years ago
Aamir Muhammad ed15ce92b6 Chat Updates & Stability 4 years ago
Aamir Muhammad 68ebecf98a Chat Updates & Stability 4 years ago
Aamir Muhammad eb7e5a4837 Chat Updates & Stability 4 years ago
Faiz Hashmi 790cb727e9 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
4 years ago
Faiz Hashmi 35a4b780a7 Added initial APIs for Marathon 4 years ago
haroon amjad 1ec45c35aa Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
4 years ago
haroon amjad 4f88f30368 updates 4 years ago
Aamir Muhammad 5708c93ae5 Chat Updates 4 years ago
Aamir Muhammad a64ae80a4a Chat Updates 4 years ago
haroon amjad 03c488c663 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
#	lib/widgets/app_bar_widget.dart
4 years ago
Aamir Muhammad 00dee97bca Chat Count Api / Chat Token Updates / Chat Call UI 4 years ago
haroon amjad c436908d25 updates & fixes 4 years ago
haroon amjad c22556d9b6 fixes 4 years ago
haroon amjad 28a882a2f6 Updates & Fixes 4 years ago
haroon amjad ea676e19ca JIRA Fixes 4 years ago
haroon amjad d1652ef04d Merge branch 'development_mirza' into 'master'
attendance file fixed

See merge request Cloud_Solution/mohemm-flutter-app!40
4 years ago
Sikander Saleem e4737f403e attendance file fixed 4 years ago
haroon amjad bf802f3d67 Merge branch 'development_mirza' into 'master'
Development mirza

See merge request Cloud_Solution/mohemm-flutter-app!36
4 years ago
haroon amjad d77f9a3362 Worklist fixes 4 years ago
Sikander Saleem 39240b734e mark attendance counter & ios nfc fixed 4 years ago
haroon amjad c22736dd79 Merge branch 'master' into development_haroon 4 years ago
haroon amjad c87a00df6a Jira fixes 4 years ago
haroon amjad 8be8525360 Merge branch 'development_mirza' into 'master'
mark attendance counter 1.0

See merge request Cloud_Solution/mohemm-flutter-app!35
4 years ago
Sikander Saleem 528b0930c2 mark attendance counter 1.0 4 years ago
haroon amjad e1030d73b2 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app 4 years ago
haroon amjad 09d2d9936b Jira Fixes 4 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and font settings 4 years ago
FaizHashmiCS22 f9885fa979 Merge branch 'master' into development_faiz 4 years ago
Sikander Saleem 0a73cced51 Merge branch 'master' into development_sikander 4 years ago
Sikander Saleem 212f8e6663 worklist & itg counters issue resolved, delegate & request info in itg added. 4 years ago
FaizHashmiCS22 199a65a994 Merge branch 'master' into development_faiz 4 years ago
haroon amjad 8b0bae0891 Worklist updates 4 years ago
FaizHashmiCS22 3457136cdc Updated the Banner calling 4 years ago
FaizHashmiCS22 ab59821428 Merge conflicts resolved 4 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
4 years ago
FaizHashmiCS22 38c7d78db3 Added UI Components for Marathon Module.. WIP 4 years ago
Sikander Saleem 0ad9d4dd9e Merge branch 'master' into development_sikander 4 years ago
Sikander Saleem defa8a8adb redirection added on worklist detail when approve or reject. 4 years ago
haroon amjad aabc86290a Language change option added in app drawer 4 years ago
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 4 years ago
haroon amjad 27ac98539f Merge branch 'master' into development_haroon 4 years ago
haroon amjad 4024e5fd3f updates & fixes 4 years ago
Sikander Saleem 27b5cbfdf6 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/ui/work_list/worklist_detail_screen.dart
4 years ago
Sikander Saleem 0213a7a4ef worklist api calling delay fixed. 4 years ago
Sikander Saleem c29d003401 services dynamic list issue fixed on payslip 4 years ago
haroon amjad 8f9fb5eb1d image fixes 4 years ago
haroon amjad c8d25c997b Revert "updates"
This reverts commit 981fc9f8d207334488189c9051042d3792452592.
4 years ago
haroon amjad da7929bf3e updates 4 years ago
Sikander Saleem b429b139c8 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/ui/work_list/worklist_detail_screen.dart
4 years ago
haroon amjad 847b9df6fc date fix in dashboard 4 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 4 years ago
Sikander Saleem 7aa2e0f000 code of conduct, workmen regulations added. & improvement. 4 years ago
Sikander Saleem d200624ac2 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
4 years ago
Aamir Muhammad 963dcce941 adding chat option on dashboard 4 years ago
Sikander Saleem d26b7e0753 worklist improvements 4 years ago
Sultan khan 398880c4ad bug fixes 4 years ago
haroon amjad e65beebfe8 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
4 years ago