haroon amjad
|
8a393c1e73
|
App update screen implemented
|
3 years ago |
|
haroon amjad
|
b3782f6342
|
updates & fixes
|
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 |
 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 |
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 |
|
haroon amjad
|
5be9adca31
|
fixes
|
3 years ago |
|
Faiz Hashmi
|
3f7e1cd0be
|
Pushing before updating API Structure
|
3 years ago |
|
Faiz Hashmi
|
885a1aa377
|
Merge branch 'master' into faiz_cs
|
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
|
660fdb63dd
|
Updates & fixes
|
3 years ago |
|
Sikander Saleem
|
86d6b57cbc
|
dynamic list screen items grid view improvements
|
3 years ago |
|
haroon amjad
|
631752cffa
|
fixes
|
3 years ago |
|
Faiz Hashmi
|
2caf5b6caa
|
Pushing for testing
|
3 years ago |
|
haroon amjad
|
a39e6808d7
|
fixes & updates
|
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
|
4a513c08d9
|
fixes
|
3 years ago |
|
haroon amjad
|
43fb34c218
|
fixes
|
3 years ago |
|
Faiz Hashmi
|
8ae8f6d2fe
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
Faiz Hashmi
|
810920a934
|
Pushing after resolving multiple times API calling issue
|
3 years ago |
|
haroon amjad
|
ecaede0deb
|
Updates & 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
|
d25e608565
|
bug fixes
|
3 years ago |
|
haroon amjad
|
6efc07fcab
|
Jira fixes
|
3 years ago |
|
Faiz Hashmi
|
4e4e393f3d
|
updated endpoints
|
3 years ago |
|
Faiz Hashmi
|
ead2dcb631
|
Committing after API replacement from SignalR => InProgress
|
3 years ago |
|
Faiz Hashmi
|
677a0ca275
|
Committing after API replacement from SignalR => InProgress
|
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 |
|
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
|
f3ffdc0088
|
marathon URL update
|
3 years ago |
|
haroon amjad
|
8133542ae0
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
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 |
|
Faiz Hashmi
|
96e52abbb9
|
Committing before reverting from SignalR to Apis
|
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
|
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
|
741259505d
|
marathon api const added.
|
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 |
|
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 |
|
Faiz Hashmi
|
904e4df424
|
Questions Fetching process in Progress
|
3 years ago |
|
Aamir Muhammad
|
545c33ee4a
|
Chat Fixes
|
3 years ago |
|
Sikander Saleem
|
ccb89584e2
|
chat structure issues.
|
3 years ago |
|
Aamir Muhammad
|
db3e1427c5
|
Advertisement Image/ Video Module
|
3 years ago |
|
Faiz Hashmi
|
cbe251829f
|
Added HubConnection Code
|
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
|
2e88275285
|
Chat Updates & Counter Event Modifications
|
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
|
2546fb52a9
|
Chat Count Api / Chat Token Updates / Chat Call UI
|
3 years ago |
Sikander Saleem
|
3cac5eebbc
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
00dee97bca
|
Chat Count Api / Chat Token Updates / 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
|
ab6f265ef4
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Sikander Saleem
|
55187f4e36
|
Chat Fixes
|
3 years ago |
|
haroon amjad
|
80e18911b7
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Aamir Muhammad
|
b18ebf7a54
|
Chat Favorite Screen & Fixes
|
3 years ago |
|
Sikander Saleem
|
29626ea408
|
Chat Fixes
|
3 years ago |
|
haroon amjad
|
4ff3a5093b
|
Action duration implemented
|
3 years ago |
|
Sikander Saleem
|
93e7f7c862
|
Chat Fixes
|
3 years ago |
|
haroon amjad
|
cffe185cda
|
ITG Count fixes
|
3 years ago |
|
mirza.shafique
|
ea8fd42abd
|
Otp clear & resend fixed
|
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 |
Fatimah Alshammari
|
22ac89e744
|
fix issues
|
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 |
|
FaizHashmiCS22
|
fe8c6f9060
|
Updated Marathon Banner Design
|
3 years ago |
|
haroon amjad
|
221bf28ddd
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
7cc110b9a1
|
JIRA fixes
|
3 years ago |
|
devmirza121
|
f06238a93f
|
OTP dialog new design
|
3 years ago |
|
Aamir Muhammad
|
96e1be7823
|
Chat Delivered&Seen Event Added.
|
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
|
bf802f3d67
|
Merge branch 'development_mirza' into 'master'
Development mirza
See merge request Cloud_Solution/mohemm-flutter-app!36
|
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 |
|
FaizHashmiCS22
|
11e4da6478
|
Added Answer Selected Status
|
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 |
|
haroon amjad
|
c87a00df6a
|
Jira fixes
|
3 years ago |
|
FaizHashmiCS22
|
199a65a994
|
Merge branch 'master' into development_faiz
|
3 years ago |
|
FaizHashmiCS22
|
5ed9991428
|
Added new Intimmation Screens with Lottie
|
3 years ago |
|
haroon amjad
|
8b0bae0891
|
Worklist updates
|
3 years ago |
|
FaizHashmiCS22
|
38c7d78db3
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
FaizHashmiCS22
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
Sikander Saleem
|
d200624ac2
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/consts.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
|
Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
3 years ago |
|
Sikander Saleem
|
d26b7e0753
|
worklist improvements
|
3 years ago |
|
Sikander Saleem
|
91abaa8475
|
improvements.
|
3 years ago |
|
Sikander Saleem
|
5c5da60b12
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
f0ec4843b4
|
end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed.
|
3 years ago |
|
Aamir Muhammad
|
b190a248bf
|
Chat Implementation Version 1
|
3 years ago |
|
Sultan khan
|
398880c4ad
|
bug fixes
|
3 years ago |
|
Sultan khan
|
8d9561b570
|
COC changes
|
3 years ago |
|
Sikander Saleem
|
95b60181b1
|
bug fixes
|
3 years ago |
|
haroon amjad
|
dd26452663
|
Fixes & updates
|
3 years ago |
|
haroon amjad
|
c14bfd22db
|
Mohemm Android build given to QA
|
3 years ago |
|
haroon amjad
|
e6405b2251
|
NFC fixes
|
3 years ago |
|
haroon amjad
|
eb29553d26
|
NFC Fixes
|
3 years ago |
|
Sikander Saleem
|
a45b6aece2
|
improvements
|
3 years ago |
|
Sikander Saleem
|
4e22784676
|
ticket balance dashboard added.
|
3 years ago |
|
Sikander Saleem
|
4b935f1dc5
|
leave balance dashboard added.
|
3 years ago |
|
Sikander Saleem
|
f3855c3883
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
cbcb3cdc00
|
item for sale improvement cont.
|
3 years ago |
|
Fatimah Alshammari
|
6a1f655b1f
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Sikander Saleem
|
8e94d57dae
|
performance evaluation improvements.
|
3 years ago |
|
Sikander Saleem
|
b79edd701c
|
code improvement & translation added.
|
3 years ago |
|
Fatimah Alshammari
|
e2720c7057
|
fix design issues
|
3 years ago |
|
haroon amjad
|
fb2924964b
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
3 years ago |
|
Sikander Saleem
|
2f6e40da46
|
add leave balance cont.
|
3 years ago |
|
Fatimah Alshammari
|
89058f9e59
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
3 years ago |
|
haroon amjad
|
a05d037211
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/colors.dart
# lib/extensions/string_extensions.dart
# lib/ui/screens/announcements/announcement_details.dart
# lib/ui/screens/announcements/announcements.dart
# lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
# lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
|
3 years ago |
|
Sikander Saleem
|
d6cc5fcc6c
|
pending transaction.
|
3 years ago |
|
haroon amjad
|
a855e535cd
|
Item for sale implemented
|
3 years ago |
|
Fatimah Alshammari
|
dc880df35a
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/models/profile_menu.model.dart
|
3 years ago |
|
Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
3 years ago |
|
Sikander Saleem
|
20f7d98ce5
|
profile improvements
|
3 years ago |
|
Sikander Saleem
|
4edb19c2bb
|
Vacation rule added cont.
|
3 years ago |
|
haroon amjad
|
1719c7029e
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/screens/announcements/announcement_details.dart
# pubspec.yaml
|
3 years ago |
|
haroon amjad
|
c63844dcf7
|
My requests & CCP
|
3 years ago |
|
Sikander Saleem
|
2f013ba1ad
|
lint rules added.
|
3 years ago |
|
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
3 years ago |
|
Sikander Saleem
|
2966ca129c
|
monthly pay slip improvement
|
3 years ago |
|
Sikander Saleem
|
f1c36b5821
|
monthly pay slip added.
|
3 years ago |
|
haroon amjad
|
e045374703
|
Not found svg added, Pending transactions, Announcements.
|
3 years ago |
|
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
3 years ago |
|
Sikander Saleem
|
95e2e74fd0
|
Merge branch 'master' into development_sikander
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/main.dart
# lib/models/generic_response_model.dart
# lib/ui/my_attendance/my_attendance_screen.dart
# lib/ui/work_list/worklist_detail_screen.dart
|
3 years ago |
|
devmirza121
|
2010e9d6a0
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/colors.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/attendance/monthly_attendance.dart
# lib/ui/landing/dashboard.dart
# lib/widgets/radio/show_radio.dart
# pubspec.yaml
|
3 years ago |
|
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
3 years ago |
|
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
3 years ago |
|
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
3 years ago |