 Aamir Muhammad
|
7408e24245
|
Chat Delivered&Seen Event Added.
|
3 years ago |
|
Aamir Muhammad
|
c0ee98b06e
|
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 |
|
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 |
|
Aamir Muhammad
|
40b9cb9576
|
Chat 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 |
haroon amjad
|
e1030d73b2
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
|
3 years ago |
|
haroon amjad
|
09d2d9936b
|
Jira Fixes
|
3 years ago |
|
haroon amjad
|
9e86e1ceab
|
Merge branch 'development_mirza' into 'master'
Mark Attandence success animation and font settings
See merge request Cloud_Solution/mohemm-flutter-app!34
|
3 years ago |
devmirza121
|
937c4c18b5
|
Mark Attandence success animation and font settings
|
3 years ago |
 Sikander Saleem
|
203e5ac73c
|
Merge branch 'development_sikander' into 'master'
issues fixed.
See merge request Cloud_Solution/mohemm-flutter-app!33
|
3 years ago |
|
Sikander Saleem
|
1cd7cd4d76
|
issues fixed.
|
3 years ago |
|
Sikander Saleem
|
b9ee1230b6
|
Merge branch 'faiz_cs' into 'master'
Fixed issues in Release mode
See merge request Cloud_Solution/mohemm-flutter-app!32
|
3 years ago |
FaizHashmiCS22
|
8490faa3e5
|
Merge branch 'master' into development_faiz
|
3 years ago |
|
FaizHashmiCS22
|
f0129399e6
|
Resolved issue in Release mode
|
3 years ago |
|
Sikander Saleem
|
e0fb78efab
|
Merge branch 'faiz_cs' into 'master'
Design for the Marathon Module
See merge request Cloud_Solution/mohemm-flutter-app!27
|
3 years ago |
|
FaizHashmiCS22
|
f9885fa979
|
Merge branch 'master' into development_faiz
|
3 years ago |
|
Sikander Saleem
|
0af4f81694
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!31
|
3 years ago |
|
Sikander Saleem
|
0a73cced51
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
212f8e6663
|
worklist & itg counters issue resolved, delegate & request info in itg added.
|
3 years ago |
|
FaizHashmiCS22
|
f3623e29dc
|
Merge branch 'master' into development_faiz
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
haroon amjad
|
c1666b7140
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!30
|
3 years ago |
|
haroon amjad
|
966fb5e209
|
Worklist fixes
|
3 years ago |
|
Sikander Saleem
|
af314a84ce
|
Merge branch 'fatima' into 'master'
Fatima
See merge request Cloud_Solution/mohemm-flutter-app!29
|
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 |
Fatimah Alshammari
|
2d40ede37f
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
2002359ff1
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
e4db7e0cc2
|
fix issues
|
3 years ago |
|
haroon amjad
|
2704fcd147
|
PR Fixes
|
3 years ago |
|
Fatimah Alshammari
|
7024a6b73a
|
Merge branch 'master' into fatima
|
3 years ago |
|
Fatimah Alshammari
|
e2519b5df2
|
fix issues
|
3 years ago |
|
haroon amjad
|
861627c80a
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!28
|
3 years ago |
|
haroon amjad
|
b2810b53ba
|
Revert yesterday changes
|
3 years ago |
|
haroon amjad
|
588e8f51f0
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
8b0bae0891
|
Worklist updates
|
3 years ago |
|
FaizHashmiCS22
|
3d7b80b8a0
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
FaizHashmiCS22
|
70eceaf648
|
Adding interactions
|
3 years ago |
|
FaizHashmiCS22
|
60e7b5a2a0
|
Adjusted the font settings
|
3 years ago |
|
haroon amjad
|
5df6f71235
|
Merge branch 'fatima' into 'master'
fix issues
See merge request Cloud_Solution/mohemm-flutter-app!26
|
3 years ago |
|
Fatimah Alshammari
|
af56d8f71b
|
fix issues
|
3 years ago |
|
FaizHashmiCS22
|
3457136cdc
|
Updated the Banner calling
|
3 years ago |
|
FaizHashmiCS22
|
ab59821428
|
Merge conflicts resolved
|
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 |
|
Fatimah Alshammari
|
f515c0b39a
|
Merge branch 'master' into fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
3 years ago |
|
Fatimah Alshammari
|
7b4fe5bcbc
|
fix issues
|
3 years ago |
|
FaizHashmiCS22
|
38c7d78db3
|
Added UI Components for Marathon Module.. WIP
|
3 years ago |
|
Aamir Muhammad
|
912ac80707
|
Chat Fixes
|
3 years ago |
|
Aamir Muhammad
|
636d6935bc
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Aamir Muhammad
|
82afd0ae61
|
Chat Fixes
|
3 years ago |