Commit Graph

265 Commits (0b08606813201dc0152331159d6964b8f7f11a32)

Author SHA1 Message Date
haroon amjad 379015ca6c chat privilege added 3 years ago
Faiz Hashmi 601a0cdbfd Added test Dialog for Huawei 3 years ago
haroon amjad 5e22bcc1da ERM Channel 3 years ago
haroon amjad aacc7c6437 icon change 3 years ago
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
mirza.shafique d458e8ac45 Merge branch 'master' into development_mirza 3 years ago
Sikander Saleem 550e26dce1 Attendance loader fix 3 years ago
Sikander Saleem 0e329e8e2b ticket balance value display fixed & infant added in value. 3 years ago
Sultan khan b227f11c7b Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 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
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
3 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
mirza.shafique aa511f02ac Merge branch 'master' into development_mirza
# Conflicts:
#	lib/classes/consts.dart
#	pubspec.yaml
3 years ago
Aamir Muhammad 948689b67a Notification To Specific Screen 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 84a07df310 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 0f84f9ae65 app life cycle added.
file attachment option added on dynamic form. & improvements
3 years ago
Aamir Muhammad 698aee3482 Notification 3 years ago
Sikander Saleem e10ea6b023 mark attendance session expire fixed 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
haroon amjad e685cf188c updates 3 years ago
haroon amjad 47a274b1d3 Merge branch 'master' into development_haroon 3 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 3 years ago
haroon amjad 0d2052346e updates 3 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 3 years ago
Sikander Saleem 5261f3e416 marathon placement change, worklist type list improvement. 3 years ago
Sikander Saleem 47732d67cb drawer item align issue fixed on arabic. 3 years ago
haroon amjad b522aab685 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad 08e0af8f64 Chat Bug's Fix 3 years ago
haroon amjad 631752cffa fixes 3 years ago
haroon amjad a39e6808d7 fixes & updates 3 years ago
Aamir Muhammad 76239d0077 Fixes 3 years ago
Aamir Muhammad feb5c5071c Fav Users Images Fix 3 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 3 years ago
Faiz Hashmi f31db58a76 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Faiz Hashmi 603ff1b19f Committing after API replacement from SignalR => InProgress 3 years ago
haroon amjad 915a7d208f Jira translation fix 3 years ago
Aamir Muhammad e94a8d9a5e Hub Connection Fix 3 years ago
Aamir Muhammad abc586b81e Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 8d5cc7ed23 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 4e96108207 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 0db4a5a7cd Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad fb97319164 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad f6f801f9cf Chat Fixes & User Chat Counter 3 years ago
Sikander Saleem 3438b9c174 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem b718f96c3a counter direction issue fix. 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 91a0be7974 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Sikander Saleem 7d651c247a marathon improvements. 3 years ago
Faiz Hashmi 59ad00ca2a Fetched Questoins and Added Answer Interactivity 3 years ago
Aamir Muhammad 545c33ee4a Chat Fixes 3 years ago
Aamir Muhammad fa36cd7ddf Advertisement Image/ Video Module 3 years ago
Aamir Muhammad fa7e08c215 Advertisement Image/ Video Module 3 years ago
Aamir Muhammad db3e1427c5 Advertisement Image/ Video Module 3 years ago
Aamir Muhammad ed15ce92b6 Chat Updates & Stability 3 years ago
Aamir Muhammad 68ebecf98a Chat Updates & Stability 3 years ago
Aamir Muhammad eb7e5a4837 Chat Updates & Stability 3 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
3 years ago
Faiz Hashmi 35a4b780a7 Added initial APIs for Marathon 3 years ago
haroon amjad 1ec45c35aa Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
3 years ago
haroon amjad 4f88f30368 updates 3 years ago
Aamir Muhammad 5708c93ae5 Chat Updates 3 years ago
Aamir Muhammad a64ae80a4a Chat Updates 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 00dee97bca Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
haroon amjad c436908d25 updates & fixes 3 years ago
haroon amjad c22556d9b6 fixes 3 years ago
haroon amjad 28a882a2f6 Updates & Fixes 3 years ago
haroon amjad ea676e19ca JIRA Fixes 3 years ago
haroon amjad d1652ef04d Merge branch 'development_mirza' into 'master'
attendance file fixed

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

See merge request Cloud_Solution/mohemm-flutter-app!36
3 years ago
haroon amjad d77f9a3362 Worklist fixes 3 years ago
Sikander Saleem 39240b734e mark attendance counter & ios nfc fixed 3 years ago
haroon amjad c22736dd79 Merge branch 'master' into development_haroon 3 years ago
haroon amjad c87a00df6a Jira fixes 3 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
3 years ago
Sikander Saleem 528b0930c2 mark attendance counter 1.0 3 years ago
haroon amjad e1030d73b2 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app 3 years ago
haroon amjad 09d2d9936b 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 199a65a994 Merge branch 'master' into development_faiz 3 years ago
haroon amjad 8b0bae0891 Worklist updates 3 years ago
FaizHashmiCS22 3457136cdc Updated the Banner calling 3 years ago
FaizHashmiCS22 ab59821428 Merge conflicts resolved 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 38c7d78db3 Added UI Components for Marathon Module.. WIP 3 years ago
Sikander Saleem 0ad9d4dd9e Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem defa8a8adb redirection added on worklist detail when approve or reject. 3 years ago
haroon amjad aabc86290a Language change option added in app drawer 3 years ago
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 3 years ago
haroon amjad 27ac98539f Merge branch 'master' into development_haroon 3 years ago
haroon amjad 4024e5fd3f updates & fixes 3 years ago