Fatimah Alshammari
|
1c750a4084
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
b34225501c
|
fix family member
|
3 years ago |
 Aamir Muhammad
|
407899a602
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/provider/chat_provider_model.dart
# lib/ui/chat/my_team_screen.dart
|
3 years ago |
|
Aamir Muhammad
|
3871d3f1e3
|
Fixes
|
3 years ago |
haroon amjad
|
3e1fb6c6bc
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!123
|
3 years ago |
haroon amjad
|
2ab39e0d7b
|
updates
|
3 years ago |
Sikander Saleem
|
e4ab7e96d1
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
|
3 years ago |
|
Sikander Saleem
|
1e478c9900
|
approve & reject button added on PO/PR & after request submission,loading issue fixed on worklist.
|
3 years ago |
|
Aamir Muhammad
|
4f780ad0aa
|
Fixes
|
3 years ago |
Faiz Hashmi
|
cdf016fc9b
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Faiz Hashmi
|
e5310eff4e
|
Removed Unnecessary API call
|
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
|
5261f3e416
|
marathon placement change, worklist type list improvement.
|
3 years ago |
|
Aamir Muhammad
|
773a99e8d9
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
09c401a157
|
Voice Chat Fixes & Audio Player Implementation
|
3 years ago |
|
Sikander Saleem
|
49e9b35eff
|
worklist setting ui improvements.
|
3 years ago |
|
Sikander Saleem
|
642fee7331
|
worklist setting update data payload issue fixed.
|
3 years ago |
|
Aamir Muhammad
|
fb3b3e8e46
|
Voice Chat Fixes & Audio Player Implementation
|
3 years ago |
|
Sikander Saleem
|
7131706998
|
password requirement check improvement.
|
3 years ago |
|
Sikander Saleem
|
dd8da2cdfe
|
upper case check removed from forgot & change password.
|
3 years ago |
|
Sikander Saleem
|
705adbc17e
|
code format monthly attendance
|
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 |
|
Aamir Muhammad
|
5eec9dc07b
|
chat voice message implementation
|
3 years ago |
|
haroon amjad
|
8a393c1e73
|
App update screen implemented
|
3 years ago |
|
Sikander Saleem
|
091abc68bf
|
IOS Fixes
|
3 years ago |
Sultan khan
|
e65d876223
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
3 years ago |
|
Sultan khan
|
2ab1c5afdc
|
dropdown clear issue fixed
|
3 years ago |
|
Aamir Muhammad
|
47a697f352
|
chat voice message implementation
|
3 years ago |
|
Faiz Hashmi
|
02fdfc746c
|
Pushing stable (acc to me :p) marathon
|
3 years ago |
|
haroon amjad
|
b3782f6342
|
updates & fixes
|
3 years ago |
|
Aamir Muhammad
|
12defa65ac
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
5d93451c13
|
chat voice message implementation
|
3 years ago |
|
haroon amjad
|
bcf67895b9
|
Dynamic forms & my team fixes
|
3 years ago |
|
haroon amjad
|
374417b6bd
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
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 |