haroon amjad
|
be32b9c4a2
|
attendance fixes
|
3 years ago |
Sikander Saleem
|
550e26dce1
|
Attendance loader fix
|
3 years ago |
mirza.shafique
|
aa511f02ac
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/classes/consts.dart
# pubspec.yaml
|
3 years ago |
|
Sikander Saleem
|
e10ea6b023
|
mark attendance session expire fixed
|
3 years ago |
|
haroon amjad
|
a9bf383164
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
bd10bb4f1d
|
Push notifications handler implemented
|
3 years ago |
|
haroon amjad
|
c763e16f41
|
Merge branch 'master' into development_haroon
|
3 years ago |
 Aamir Muhammad
|
538fd133aa
|
Title Fix On AppBar
|
3 years ago |
|
haroon amjad
|
0d2052346e
|
updates
|
3 years ago |
|
Aamir Muhammad
|
54961c875f
|
Ios Stream Audio
|
3 years ago |
|
Aamir Muhammad
|
5028a3b860
|
App Bar online / Offline & Fixes
|
3 years ago |
|
Aamir Muhammad
|
a746b607df
|
Fixes
|
3 years ago |
|
Aamir Muhammad
|
d096559a2f
|
Fixes
|
3 years ago |
|
Aamir Muhammad
|
3871d3f1e3
|
Fixes
|
3 years ago |
|
Aamir Muhammad
|
35f814b74a
|
Merge branch 'master' into development_aamir
|
3 years ago |
Faiz Hashmi
|
5ff4c19301
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Aamir Muhammad
|
4635c7f3bc
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
8c3745b747
|
Voice Chat Fixes & Audio Player Implementation
|
3 years ago |
|
Faiz Hashmi
|
5bb998a8d2
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/classes/utils.dart
# lib/ui/marathon/widgets/marathon_banner.dart
|
3 years ago |
|
Faiz Hashmi
|
d9749fc402
|
Updated NoWinnerFoundDesign and some Logical Up gradations
|
3 years ago |
|
Sikander Saleem
|
45a5fdad02
|
ios nfc mark attendance confirmation dialog issue fix.
|
3 years ago |
|
Sikander Saleem
|
47b712d132
|
monthly attendance & ticket balance chart fix.
|
3 years ago |
 Sikander Saleem
|
47732d67cb
|
drawer item align issue fixed on arabic.
|
3 years ago |
|
Sikander Saleem
|
fe02776a69
|
leave balance issues fixed.
|
3 years ago |
|
haroon amjad
|
b522aab685
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
haroon amjad
|
660fdb63dd
|
Updates & fixes
|
3 years ago |
|
Sikander Saleem
|
86d6b57cbc
|
dynamic list screen items grid view improvements
|
3 years ago |
|
haroon amjad
|
3b6f3f5c4f
|
Address info issue fixed
|
3 years ago |
|
haroon amjad
|
a39e6808d7
|
fixes & updates
|
3 years ago |
|
haroon amjad
|
243da0c775
|
fixes
|
3 years ago |
|
Aamir Muhammad
|
ae559df29f
|
Chat Fixes & Counter Updated on Signal R
|
3 years ago |
|
Aamir Muhammad
|
ff3592a120
|
Chat Fixes & Counter Updated on Signal R
|
3 years ago |
|
Aamir Muhammad
|
30c7f5738d
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
7d1086522d
|
Chat Fixes & Counter Updated on Signal R
|
3 years ago |
|
haroon amjad
|
4c53fcfdb6
|
updates & fixes
|
3 years ago |
Sultan khan
|
f1b7b897cc
|
leave balance page updated
|
3 years ago |
Fatimah Alshammari
|
dde200fd7a
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
cd813a163f
|
fix issues
|
3 years ago |
|
haroon amjad
|
1a3bf90b89
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
Aamir Muhammad
|
8433d594a2
|
Chat Sort On Messages, Scroll Fix, Search Improved
|
3 years ago |
|
haroon amjad
|
6efc07fcab
|
Jira fixes
|
3 years ago |
|
Faiz Hashmi
|
f31db58a76
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
haroon amjad
|
6463dfc424
|
Reverting fatima changes
|
3 years ago |
|
haroon amjad
|
d80f93a6dc
|
Revert "no message"
This reverts commit 323741ad06.
|
3 years ago |
|
haroon amjad
|
323741ad06
|
no message
|
3 years ago |
|
Fatimah Alshammari
|
f43b4905c5
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into fatima
# Conflicts:
# lib/ui/misc/request_submit_screen.dart
|
3 years ago |
|
Fatimah Alshammari
|
19ab49029f
|
Merge branch 'master' into fatima
|
3 years ago |
|
mirza.shafique
|
38c6acbd7d
|
Merge branch 'master' into development_mirza
|
3 years ago |
|
mirza.shafique
|
31fba1f8e6
|
worklist animation fix
|
3 years ago |
|
Aamir Muhammad
|
0f13ab65d6
|
Chat Fixes & User Chat Counter
|
3 years ago |
|
Faiz Hashmi
|
96e52abbb9
|
Committing before reverting from SignalR to Apis
|
3 years ago |
|
Fatimah Alshammari
|
85be372ad8
|
Merge branch 'master' into fatima
# Conflicts:
# lib/classes/consts.dart
# lib/ui/leave_balance/add_leave_balance_screen.dart
|
3 years ago |
|
Fatimah Alshammari
|
9d0bf4fe7e
|
fix issues
|
3 years ago |
|
Aamir Muhammad
|
76c3c5c3ae
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
mirza.shafique
|
ef5136ebfa
|
worklist animation & loader
|
3 years ago |
|
Aamir Muhammad
|
3e666eb6be
|
Chat Fixes & User Chat Counter
|
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 |
|
haroon amjad
|
0ca002d9be
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/chat/chat_home_screen.dart
|
3 years ago |
|
haroon amjad
|
ff0c1e1efc
|
Merge branch 'master' into development_haroon
|
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
|
468555046b
|
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 |
|
Aamir Muhammad
|
68939f6256
|
Chat Call UI
|
3 years ago |
|
haroon amjad
|
80e18911b7
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
haroon amjad
|
c436908d25
|
updates & fixes
|
3 years ago |
|
Aamir Muhammad
|
fb54403584
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
55ff08c3f3
|
Chat Favorite Screen & Fixes
|
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
|
67f4fdef28
|
Chat Fixes & Favorite Api Implementation
|
3 years ago |
|
Aamir Muhammad
|
8ba3dcf43b
|
Chat Fixes & Favorite Api Implementation
|
3 years ago |
|
haroon amjad
|
21d396b3bb
|
Worklist updates
|
3 years ago |
|
haroon amjad
|
26ddc00048
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
28a882a2f6
|
Updates & Fixes
|
3 years ago |
|
haroon amjad
|
221bf28ddd
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
7cc110b9a1
|
JIRA fixes
|
3 years ago |
|
Aamir Muhammad
|
77a56759dc
|
Chat Delivered&Seen Event Added.
|
3 years ago |
|
Aamir Muhammad
|
f0d2c78f83
|
Chat Delivered&Seen Event Added.
|
3 years ago |
|
Aamir Muhammad
|
235dc6b1f4
|
Merge branch 'master' into development_aamir
|
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 |
|
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 |
|
Sikander Saleem
|
6e409c77a0
|
mark attendance counter & ios nfc fixed 1.0
|
3 years ago |
|
Sikander Saleem
|
39240b734e
|
mark attendance counter & ios nfc fixed
|
3 years ago |
|
devmirza121
|
937c4c18b5
|
Mark Attandence success animation and font settings
|
3 years ago |
|
FaizHashmiCS22
|
199a65a994
|
Merge branch 'master' into development_faiz
|
3 years ago |
|
haroon amjad
|
8b0bae0891
|
Worklist updates
|
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 |
|
Aamir Muhammad
|
636d6935bc
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
82afd0ae61
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
defa8a8adb
|
redirection added on worklist detail when approve or reject.
|
3 years ago |
|
Aamir Muhammad
|
90b60ce55a
|
Chat Search User Api Implementation
|
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
|
d4b31d4338
|
Chat Login Api Implementation
|
3 years ago |
|
Sikander Saleem
|
02aff92726
|
advance search improvement, approve delegate added.
|
3 years ago |
|
haroon amjad
|
f07167e734
|
Leave balance fix, Items for sale fix
|
3 years ago |