 Aamir Muhammad
|
28d977017e
|
Sultan Merge
|
2 years ago |
|
Aamir Muhammad
|
2f22519d86
|
Merge remote-tracking branch 'origin/sultan-dev' into development_aamir
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# android/gradle/wrapper/gradle-wrapper.properties
# lib/api/chat/chat_api_client.dart
# lib/app_state/app_state.dart
# lib/classes/consts.dart
# lib/generated_plugin_registrant.dart
# lib/main.dart
# lib/provider/chat_provider_model.dart
# lib/ui/chat/group_chat_detaied_screen.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# lib/widgets/image_picker.dart
# pubspec.yaml
|
2 years ago |
Sultan khan
|
f21348d9b7
|
Merge branch 'development_haroon_merge_aamir' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
# android/gradle/wrapper/gradle-wrapper.properties
# lib/api/chat/chat_api_client.dart
# lib/classes/consts.dart
# lib/generated_plugin_registrant.dart
# lib/main.dart
# lib/provider/chat_provider_model.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# pubspec.yaml
|
2 years ago |
 haroon amjad
|
a411b8e978
|
File picker permission issue fixed
|
2 years ago |
|
Aamir Muhammad
|
6cf7340417
|
Business Card Design Update
|
2 years ago |
 Sikander Saleem
|
7f6f240590
|
CR-6273 improvement.
|
2 years ago |
|
Sikander Saleem
|
58962ede03
|
CR-6273 implemented.
|
2 years ago |
|
haroon amjad
|
0fd1c8c96b
|
Merge branch 'master' into development_haroon
|
2 years ago |
|
haroon amjad
|
e39526b5eb
|
Updates & fixes
|
2 years ago |
Sikander Saleem
|
23b4e81170
|
my documents added.
|
2 years ago |
|
haroon amjad
|
59116b700a
|
Location check added
|
2 years ago |
|
haroon amjad
|
1dca3076d9
|
Survey dynamic questions
|
3 years ago |
haroon amjad
|
064be6d195
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
227855a6a5
|
dynamic text field improvement.
|
3 years ago |
|
haroon amjad
|
c34d8a2633
|
Location updates
|
3 years ago |
mirza.shafique
|
7d7acfa2df
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/main.dart
|
3 years ago |
|
haroon amjad
|
4bac19f9b8
|
Platform ID & Huawei fixes
|
3 years ago |
|
haroon amjad
|
8f83f89dc7
|
Item for sale improvements
|
3 years ago |
|
haroon amjad
|
ca369f2243
|
huawei attendance fixes
|
3 years ago |
|
haroon amjad
|
20109cbe9e
|
Attendance fixes
|
3 years ago |
|
haroon amjad
|
182fa6774e
|
Huawei push implementation
|
3 years ago |
|
mirza.shafique
|
2455e27595
|
hmg wifi implementation
|
3 years ago |
|
haroon amjad
|
91eb51e42f
|
marathon updates & DateFormat fixes
|
3 years ago |
|
haroon amjad
|
be32b9c4a2
|
attendance fixes
|
3 years ago |
|
Sikander Saleem
|
550e26dce1
|
Attendance loader fix
|
3 years ago |
|
mirza.shafique
|
aa511f02ac
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/classes/consts.dart
# pubspec.yaml
|
3 years ago |
|
Sikander Saleem
|
e10ea6b023
|
mark attendance session expire fixed
|
3 years ago |
|
haroon amjad
|
a9bf383164
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
bd10bb4f1d
|
Push notifications handler implemented
|
3 years ago |
|
haroon amjad
|
c763e16f41
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
Aamir Muhammad
|
538fd133aa
|
Title Fix On AppBar
|
3 years ago |
|
haroon amjad
|
0d2052346e
|
updates
|
3 years ago |
|
Aamir Muhammad
|
54961c875f
|
Ios Stream Audio
|
3 years ago |
|
Aamir Muhammad
|
5028a3b860
|
App Bar online / Offline & Fixes
|
3 years ago |
|
Aamir Muhammad
|
a746b607df
|
Fixes
|
3 years ago |
|
Aamir Muhammad
|
d096559a2f
|
Fixes
|
3 years ago |
|
Aamir Muhammad
|
3871d3f1e3
|
Fixes
|
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
|
45a5fdad02
|
ios nfc mark attendance confirmation dialog issue fix.
|
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 |
|
Sikander Saleem
|
fe02776a69
|
leave balance issues fixed.
|
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 |