 Aamir Muhammad
|
abd1fa9375
|
chat voice message implementation
|
3 years ago |
 Sikander Saleem
|
3a6d1c3273
|
leave balance issues fixed-2.
|
3 years ago |
|
Sikander Saleem
|
fe02776a69
|
leave balance issues fixed.
|
3 years ago |
Faiz Hashmi
|
4cb7bbee5d
|
Pushing while testing!
|
3 years ago |
haroon amjad
|
696a6881c4
|
date fixes & Items of sale updates
|
3 years ago |
|
Aamir Muhammad
|
f60394cc38
|
chat voice message implementation
|
3 years ago |
|
Aamir Muhammad
|
ddba673970
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/generated_plugin_registrant.dart
|
3 years ago |
|
Aamir Muhammad
|
4021eccd9f
|
Chat Error Handling
|
3 years ago |
haroon amjad
|
9c867c3041
|
Merge branch 'development_aamir' into 'master'
Chat Fixes & Audio Implementation -- In Progress
See merge request Cloud_Solution/mohemm-flutter-app!113
|
3 years ago |
|
Aamir Muhammad
|
e40cd2c5c8
|
Chat Error Handling & Voice
|
3 years ago |
Sikander Saleem
|
91052f12bd
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
0077a876d9
|
improvements
|
3 years ago |
|
haroon amjad
|
5be9adca31
|
fixes
|
3 years ago |
|
Faiz Hashmi
|
3f7e1cd0be
|
Pushing before updating API Structure
|
3 years ago |
|
Sikander Saleem
|
7fc8fd9123
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Sikander Saleem
|
9602e95fe7
|
improvements
|
3 years ago |
|
haroon amjad
|
ece6a68a95
|
fixes
|
3 years ago |
|
Faiz Hashmi
|
885a1aa377
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Faiz Hashmi
|
58fb7a7894
|
Pushing for testing
|
3 years ago |
|
haroon amjad
|
2174512d79
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
b522aab685
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
haroon amjad
|
dafa075e4c
|
Merge branch 'development_aamir' into 'master'
Multiple Chat Issue
See merge request Cloud_Solution/mohemm-flutter-app!108
|
3 years ago |
|
haroon amjad
|
660fdb63dd
|
Updates & fixes
|
3 years ago |
|
Sikander Saleem
|
86d6b57cbc
|
dynamic list screen items grid view improvements
|
3 years ago |
|
Aamir Muhammad
|
08e0af8f64
|
Chat Bug's Fix
|
3 years ago |
|
haroon amjad
|
3b6f3f5c4f
|
Address info issue fixed
|
3 years ago |
|
haroon amjad
|
881b351505
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
631752cffa
|
fixes
|
3 years ago |
|
Aamir Muhammad
|
2266ace39a
|
Chat Fixes & Call Button Disabled
|
3 years ago |
|
Aamir Muhammad
|
28d055c449
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
9f91f1e83c
|
Chat Fixes
|
3 years ago |
|
haroon amjad
|
5f062d123a
|
Merge branch 'master' into development_haroon
|
3 years ago |
Sultan khan
|
5384d0e59c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
7b6e2547d7
|
comp-off issue fixed
|
3 years ago |
|
Faiz Hashmi
|
c1be522331
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Faiz Hashmi
|
2caf5b6caa
|
Pushing for testing
|
3 years ago |
|
haroon amjad
|
a39e6808d7
|
fixes & updates
|
3 years ago |
|
Aamir Muhammad
|
feff454e65
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
|
Aamir Muhammad
|
1144664d64
|
Images Fixes
|
3 years ago |
|
Aamir Muhammad
|
76239d0077
|
Fixes
|
3 years ago |
|
Faiz Hashmi
|
26ff2bf372
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Faiz Hashmi
|
86d25d3ecc
|
Added Privileged logic for Marathon
|
3 years ago |
|
haroon amjad
|
67c4970897
|
fixes
|
3 years ago |
|
haroon amjad
|
b22ecaff3a
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
4a513c08d9
|
fixes
|
3 years ago |
|
Aamir Muhammad
|
45b4adc252
|
Fav Users Images Fix
|
3 years ago |
|
Aamir Muhammad
|
2a39ee9ddc
|
Fav Users Images Fix
|
3 years ago |
|
Aamir Muhammad
|
feb5c5071c
|
Fav Users Images Fix
|
3 years ago |
|
haroon amjad
|
65e1540f97
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
43fb34c218
|
fixes
|
3 years ago |
|
Aamir Muhammad
|
ae559df29f
|
Chat Fixes & Counter Updated on Signal R
|
3 years ago |
|
Aamir Muhammad
|
668efb8412
|
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
|
0502d79fc1
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
Faiz Hashmi
|
8ae8f6d2fe
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
haroon amjad
|
1e7ff09f14
|
loader uncommented
|
3 years ago |
|
haroon amjad
|
4c53fcfdb6
|
updates & fixes
|
3 years ago |
|
Faiz Hashmi
|
810920a934
|
Pushing after resolving multiple times API calling issue
|
3 years ago |
|
haroon amjad
|
af2cbd8c50
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
ecaede0deb
|
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
|
59b1cbec38
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
2790d18c1d
|
fixes
|
3 years ago |
|
Sultan khan
|
a212963ad7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Sultan khan
|
0f38825314
|
bug fix
|
3 years ago |
|
Sultan khan
|
d25e608565
|
bug fixes
|
3 years ago |
|
haroon amjad
|
d66f841ca4
|
App security implemented, Offers & discounts fixes
|
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
|
25f4bd93bc
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Sikander Saleem
|
ae64001e63
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
fb0dff48bc
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
80c97b0a65
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
6d026a37ba
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
616e35f2d3
|
Fixes
|
3 years ago |
|
Aamir Muhammad
|
0f7afa911a
|
Fixes
|
3 years ago |
|
Fatimah Alshammari
|
29c9caddde
|
Merge branch 'master' into fatima
# Conflicts:
# lib/classes/consts.dart
# lib/ui/misc/request_submit_screen.dart
|
3 years ago |
|
Fatimah Alshammari
|
c51af6522c
|
fix issues
|
3 years ago |
|
Aamir Muhammad
|
70ffb8afd8
|
Fixes
|
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 |
|
Faiz Hashmi
|
603ff1b19f
|
Committing after API replacement from SignalR => InProgress
|
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 |
|
Sultan khan
|
86be7ccc5f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
c500da9a18
|
bug fix
|
3 years ago |
|
haroon amjad
|
915a7d208f
|
Jira translation fix
|
3 years ago |
|
haroon amjad
|
de6652623c
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
a949f15023
|
fixes
|
3 years ago |
|
Aamir Muhammad
|
e94a8d9a5e
|
Hub Connection Fix
|
3 years ago |
|
Aamir Muhammad
|
2d6ffff8be
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
ff7eb2ad6d
|
Chat Fixes & User Chat Counter
|
3 years ago |
|
haroon amjad
|
d2de59bf6e
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
Fatimah Alshammari
|
19ab49029f
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
581e6de897
|
fix issues
|
3 years ago |
mirza.shafique
|
38c6acbd7d
|
Merge branch 'master' into development_mirza
|
3 years ago |
|
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 |
|
haroon amjad
|
37ff4db9f6
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
26ddc00048
|
Updates & fixes
|
3 years ago |
|
Sultan khan
|
e9edc80eae
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
a0201efbfb
|
dynamic screen updated
|
3 years ago |
|
Fatimah Alshammari
|
965edf9141
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
53fb8605d8
|
Merge branch 'master' into fatima
# Conflicts:
# lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
|
3 years ago |
|
Fatimah Alshammari
|
c83f0c1199
|
fix issues
|
3 years ago |
|
haroon amjad
|
b834c52b5f
|
Updated Profile screen
|
3 years ago |
|
haroon amjad
|
0051d8b97e
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
00e81999de
|
Merge branch 'faiz_cs' into 'master'
Updated Banner Design and Success tone on Lottiee
See merge request Cloud_Solution/mohemm-flutter-app!46
|
3 years ago |
|
haroon amjad
|
28a882a2f6
|
Updates & Fixes
|
3 years ago |
|
FaizHashmiCS22
|
034436425a
|
Added success tone
|
3 years ago |
|
FaizHashmiCS22
|
fe8c6f9060
|
Updated Marathon Banner Design
|
3 years ago |
|
haroon amjad
|
868728b876
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
3e69880ddd
|
Merge branch 'faiz_cs' into 'master'
Position Widget Fixed
See merge request Cloud_Solution/mohemm-flutter-app!45
|
3 years ago |
|
haroon amjad
|
c0e7bc7c7d
|
Last Login fixes
|
3 years ago |
|
FaizHashmiCS22
|
8f088c78da
|
Position Fix
|
3 years ago |
|
haroon amjad
|
221bf28ddd
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
ea676e19ca
|
JIRA Fixes
|
3 years ago |
|
haroon amjad
|
54b9595add
|
Merge branch 'faiz_cs' into 'master'
UI Fixes
See merge request Cloud_Solution/mohemm-flutter-app!43
|
3 years ago |
|
FaizHashmiCS22
|
bdb8de15e3
|
Merge branch 'master' into development_faiz
|
3 years ago |
|
FaizHashmiCS22
|
09b2f8a23f
|
UI Fixes
|
3 years ago |
|
haroon amjad
|
7cc110b9a1
|
JIRA fixes
|
3 years ago |
|
Fatimah Alshammari
|
0a0c173331
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
0cca8ec935
|
fix issues
|
3 years ago |
|
mirza.shafique
|
e9de5c340b
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
3 years ago |
|
devmirza121
|
f06238a93f
|
OTP dialog new design
|
3 years ago |
|
Aamir Muhammad
|
235dc6b1f4
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
7408e24245
|
Chat Delivered&Seen Event Added.
|
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
|
1a2c9d1b15
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!37
|
3 years ago |
|
haroon amjad
|
ba588cd3a3
|
Merge branch 'faiz_cs' into 'master'
Added Answer Selection Status in Marathon
See merge request Cloud_Solution/mohemm-flutter-app!38
|
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 |
|
FaizHashmiCS22
|
710ec44293
|
Merge branch 'master' into development_faiz
# Conflicts:
# lib/ui/login/login_screen.dart
# lib/ui/marathon/marathon_screen.dart
|
3 years ago |
|
FaizHashmiCS22
|
11e4da6478
|
Added Answer Selected Status
|
3 years ago |
|
Fatimah Alshammari
|
79774416b4
|
Merge branch 'master' into fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
Fatimah Alshammari
|
69ded3dc43
|
fix my request
|
3 years ago |
|
Sikander Saleem
|
39240b734e
|
mark attendance counter & ios nfc fixed
|
3 years ago |
|
Aamir Muhammad
|
40b9cb9576
|
Chat Fixes
|
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 |
|
FaizHashmiCS22
|
db174035ca
|
Icons updated
|
3 years ago |
|
haroon amjad
|
e1030d73b2
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
|
3 years ago |