mirza.shafique
|
31fba1f8e6
|
worklist animation fix
|
3 years ago |
haroon amjad
|
0fb4a749a4
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
8133542ae0
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
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 |
|
haroon amjad
|
62acd531b0
|
fixes
|
3 years ago |
|
haroon amjad
|
f63e0e1e7c
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/work_list/worklist_detail_screen.dart
|
3 years ago |
|
haroon amjad
|
e505a9fa8c
|
fixes
|
3 years ago |
|
Aamir Muhammad
|
4e96108207
|
Chat Fixes & User Chat Counter
|
3 years ago |
|
Aamir Muhammad
|
0f13ab65d6
|
Chat Fixes & User Chat Counter
|
3 years ago |
Faiz Hashmi
|
3e1b24eb00
|
Committing before reverting from SignalR to Apis
|
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
|
0db4a5a7cd
|
Chat Fixes & User Chat Counter
|
3 years ago |
|
Aamir Muhammad
|
fb97319164
|
Chat Fixes & User Chat Counter
|
3 years ago |
|
Aamir Muhammad
|
76c3c5c3ae
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Aamir Muhammad
|
6a3c6a25d0
|
Chat Fixes & User Chat Counter
|
3 years ago |
|
Aamir Muhammad
|
13a7f60d67
|
Chat Fixes & User Chat Counter
|
3 years ago |
|
mirza.shafique
|
ef5136ebfa
|
worklist animation & loader
|
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 |
|
haroon amjad
|
c9dd403b23
|
subordinate leave fix
|
3 years ago |
|
haroon amjad
|
a947b759f8
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
c7dca3c377
|
Jira fixes for announcements & attachments
|
3 years ago |
|
Aamir Muhammad
|
cecb2d59e9
|
Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image
|
3 years ago |
|
Faiz Hashmi
|
49b57cae08
|
Code Reformatting and Added Logics
|
3 years ago |
 Sikander Saleem
|
3438b9c174
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
93901ce444
|
Merge branch 'faiz_cs' into 'master'
Integrated Questions API and Answer Selection -> InProgress
See merge request Cloud_Solution/mohemm-flutter-app!77
|
3 years ago |
|
Sikander Saleem
|
4eb8cca7d2
|
Merge branch 'sultan-dev' into 'master'
basic details issue fixed
See merge request Cloud_Solution/mohemm-flutter-app!76
|
3 years ago |
|
Sikander Saleem
|
f5684ab27e
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
b718f96c3a
|
counter direction issue fix.
|
3 years ago |
Sultan khan
|
492b6b5e34
|
basic details issue fixed
|
3 years ago |
|
Aamir Muhammad
|
cd0b00021d
|
Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image
|
3 years ago |
|
Aamir Muhammad
|
46de4b88ab
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/provider/chat_provider_model.dart
|
3 years ago |
|
Aamir Muhammad
|
3309541142
|
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 |
|
Faiz Hashmi
|
c57f6e5be3
|
Added QuestionsAnswer Statuses Handling
|
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 |
|
Aamir Muhammad
|
5430fd2d32
|
Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image
|
3 years ago |
|
haroon amjad
|
0ca002d9be
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/chat/chat_home_screen.dart
|
3 years ago |
|
Faiz Hashmi
|
59ad00ca2a
|
Fetched Questoins and Added Answer Interactivity
|
3 years ago |
|
haroon amjad
|
46af0c42c7
|
updates & fixes
|
3 years ago |
|
Aamir Muhammad
|
0538a3c313
|
Chat Fixes & Chat Media Preview Api Implementation
|
3 years ago |
|
Aamir Muhammad
|
967257ec2e
|
Chat Fixes
|
3 years ago |
|
Faiz Hashmi
|
904e4df424
|
Questions Fetching process in Progress
|
3 years ago |
|
haroon amjad
|
f39817936f
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
Aamir Muhammad
|
545c33ee4a
|
Chat Fixes
|
3 years ago |
|
haroon amjad
|
ff0c1e1efc
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
Aamir Muhammad
|
d99bc6e206
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Sikander Saleem
|
7f2aa4415d
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
ccb89584e2
|
chat structure issues.
|
3 years ago |
|
Aamir Muhammad
|
fa36cd7ddf
|
Advertisement Image/ Video Module
|
3 years ago |
|
Sikander Saleem
|
ce0de886c6
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/consts.dart
# lib/provider/chat_provider_model.dart
# lib/ui/chat/chat_detailed_screen.dart
|
3 years ago |
|
Sikander Saleem
|
8018120c6a
|
chat structure issues.
|
3 years ago |
|
Aamir Muhammad
|
bdc00e39d9
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
fa7e08c215
|
Advertisement Image/ Video Module
|
3 years ago |
|
Faiz Hashmi
|
192647031a
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Aamir Muhammad
|
db3e1427c5
|
Advertisement Image/ Video Module
|
3 years ago |
|
Sikander Saleem
|
cd45330243
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
ef723fe468
|
self user checks added while delegate
|
3 years ago |
|
Faiz Hashmi
|
cbe251829f
|
Added HubConnection Code
|
3 years ago |
|
haroon amjad
|
6a0c488435
|
translation fix
|
3 years ago |
|
Fatimah Alshammari
|
8169936bc0
|
fix issues
|
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 |
|
Aamir Muhammad
|
dc9d1715d9
|
Chat Updates & Counter Event Modifications
|
3 years ago |
|
Aamir Muhammad
|
622404896c
|
Chat Updates & Counter Event Modifications
|
3 years ago |
|
Aamir Muhammad
|
f4f9b442c8
|
Chat Updates & Counter Event Modifications
|
3 years ago |
|
Sultan khan
|
557a4c3737
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
bcf4a9ec42
|
my team probation issue fixed
|
3 years ago |
|
haroon amjad
|
c1527f5f0a
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
Aamir Muhammad
|
2e88275285
|
Chat Updates & Counter Event Modifications
|
3 years ago |
|
haroon amjad
|
42d2de2ec8
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
468555046b
|
updates
|
3 years ago |
haroon amjad
|
fe36f12413
|
Merge branch 'development_aamir' into 'master'
Chat Updates & Counter Event Modifications
See merge request Cloud_Solution/mohemm-flutter-app!61
|
3 years ago |
|
Sultan khan
|
ee553ae476
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
aadc7203a6
|
no message
|
3 years ago |
|
haroon amjad
|
e8043f6980
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!54
|
3 years ago |
|
Fatimah Alshammari
|
ba1a5c66ef
|
fix issues
|
3 years ago |
|
Aamir Muhammad
|
86ac29946f
|
Chat Updates & Counter Event Modifications
|
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 |
|
Aamir Muhammad
|
06e7a913da
|
Chat Count Api / Chat Token Updates / Chat Call UI
|
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
|
8cb5d9a061
|
Chat Count Api / Chat Token Updates / Chat Call UI
|
3 years ago |
Sikander Saleem
|
c6cd550dbc
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
3cac5eebbc
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
33609ea773
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
44d76f0687
|
Chat Count Api / Chat Token Updates / Chat Call UI
|
3 years ago |
|
Aamir Muhammad
|
d7c0ef7bfb
|
Chat Count Api / Chat Token Updates / Chat Call UI
|
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
|
dd0d4b82a3
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Aamir Muhammad
|
bb583def64
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
ab6f265ef4
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Sikander Saleem
|
55187f4e36
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
7c00f7dce8
|
Chat Fixes
|
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
|
ae917a4154
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
c190fbf5ca
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
670a5fbc03
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
fb54403584
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Sikander Saleem
|
b8e20633c9
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
4433f538b7
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
b18ebf7a54
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Sikander Saleem
|
29626ea408
|
Chat Fixes
|
3 years ago |
|
Fatimah Alshammari
|
034d840cec
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
d849699489
|
fix issues
|
3 years ago |
|
Sikander Saleem
|
f1aadf5031
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
2934203b8b
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
2fe41977d8
|
Chat Fixes
|
3 years ago |
|
haroon amjad
|
4ff3a5093b
|
Action duration implemented
|
3 years ago |
|
Sikander Saleem
|
93e7f7c862
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
3e5ce90c9a
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
83aabd0555
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Aamir Muhammad
|
5412dcaf35
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
haroon amjad
|
cffe185cda
|
ITG Count fixes
|
3 years ago |
|
Aamir Muhammad
|
ca4c9584b9
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Aamir Muhammad
|
55ff08c3f3
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
haroon amjad
|
c7928d61af
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
c2a4df89bb
|
offers & discouts
|
3 years ago |
|
mirza.shafique
|
ea8fd42abd
|
Otp clear & resend fixed
|
3 years ago |
|
haroon amjad
|
7fc80367d0
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
haroon amjad
|
6fe015d104
|
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
|
c22556d9b6
|
fixes
|
3 years ago |
|
haroon amjad
|
e826f5048c
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
4d0d3a980e
|
Item history updated
|
3 years ago |
|
Fatimah Alshammari
|
9ecdd6b11d
|
Merge branch 'master' into fatima
# Conflicts:
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
|
3 years ago |
|
Fatimah Alshammari
|
22ac89e744
|
fix issues
|
3 years ago |
|
haroon amjad
|
8ee2c6d974
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
3be279d571
|
Worklist images added
|
3 years ago |
|
Sultan khan
|
89812c0f72
|
Worklist changes
|
3 years ago |
|
Sultan khan
|
5cd0ff1567
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
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 |
|
Sultan khan
|
4b79c6eda3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
haroon amjad
|
21d396b3bb
|
Worklist updates
|
3 years ago |
|
Sultan khan
|
b9f9c31f01
|
lynx access issue fixed
|
3 years ago |
|
Sultan khan
|
c7d2b0aa8a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
FaizHashmiCS22
|
9bdb6bfb71
|
Updated Banner Again :D
|
3 years ago |