 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 |
|
Aamir Muhammad
|
1a337f82c2
|
Master Merge
|
2 years ago |
|
Aamir Muhammad
|
2f62498c66
|
Merge branch 'master' into development_aamir
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# ios/Runner.xcodeproj/project.pbxproj
# lib/api/chat/chat_api_client.dart
# lib/classes/consts.dart
|
2 years ago |
 haroon amjad
|
0728cc3dd4
|
Updated Mowadhafi Attachment Handling
|
2 years ago |
|
haroon amjad
|
fc3c1c057a
|
Attachments handled in transactions list mowadhafi
|
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
|
b9fcf399c4
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app
|
2 years ago |
|
haroon amjad
|
c104de86ba
|
Updates
|
2 years ago |
|
Haroon6138
|
7faf1ca530
|
Merge pull request 'half day leave bug fixed' (#15) from sultan-dev into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/15
|
2 years ago |
|
haroon amjad
|
bd46589607
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app
|
2 years ago |
|
haroon amjad
|
a411b8e978
|
File picker permission issue fixed
|
2 years ago |
|
Sultan khan
|
74bc09d5d6
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
# lib/app_state/app_state.dart
|
2 years ago |
|
Sultan khan
|
c86d9f4678
|
termination work-list fixed
|
2 years ago |
 FaizHashmiCS22
|
80a359d9b0
|
Merge pull request 'faiz_dev_marathon_fix' (#16) from faiz_dev_marathon_text_fix into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/16
|
2 years ago |
Faiz Hashmi
|
5723b64234
|
Join MarathonProviderFix
|
2 years ago |
|
Faiz Hashmi
|
ada971c7e4
|
Merge branch 'master' into faiz_dev_marathon_text_fix
# Conflicts:
# lib/classes/consts.dart
|
2 years ago |
|
Faiz Hashmi
|
753d3de3c2
|
Join MarathonProviderFix
|
2 years ago |
Sikander Saleem
|
eaf0ff3525
|
ios changes
|
2 years ago |
|
Sikander Saleem
|
07d4ffa58e
|
ios changes
|
2 years ago |
|
Sikander Saleem
|
3702bac7c2
|
voip merge conflicts resolve
|
2 years ago |
|
Sikander Saleem
|
f6f7d02833
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/consts.dart
|
2 years ago |
|
Sultan khan
|
d4a795dda1
|
half day leave bug fixed
|
2 years ago |
|
haroon amjad
|
a2ed4e52f3
|
Marathon changes
|
2 years ago |
|
Haroon6138
|
25de451d3b
|
Merge pull request 'faiz_dev_marathon_text_fix' (#13) from faiz_dev_marathon_text_fix into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/13
|
2 years ago |
|
Faiz Hashmi
|
684a200285
|
Join MarathonProviderFix
|
2 years ago |
|
Faiz Hashmi
|
9a6d2d44e1
|
before staring participant fix.
|
2 years ago |
|
Aamir Muhammad
|
33fb6fe6be
|
Voip Call
|
2 years ago |
|
Aamir Muhammad
|
f8ba1957cd
|
Merge branch 'master' into development_aamir
# Conflicts:
# 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/landing/dashboard_screen.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# pubspec.yaml
|
2 years ago |
|
Aamir Muhammad
|
bcff7ebf17
|
Change
|
2 years ago |
|
haroon amjad
|
52d389b268
|
In App update implemented
|
2 years ago |
|
haroon amjad
|
5fae260ffa
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app
|
2 years ago |
|
haroon amjad
|
ff908bd2a7
|
updates
|
2 years ago |
|
FaizHashmiCS22
|
2e60909e05
|
Merge pull request 'added the text intimation to join the marathon' (#10) from faiz_dev_marathon_text_fix into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/10
|
2 years ago |
|
Faiz Hashmi
|
e585ab7a8c
|
added the text intimation to join the marathon
|
2 years ago |
|
Haroon6138
|
66c1e5b9f1
|
Merge pull request 'sultan-dev' (#9) from sultan-dev into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/9
|
2 years ago |
|
Sultan khan
|
88be17249d
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
|
2 years ago |
|
Sultan khan
|
c9886be2d8
|
work list ITG str change
|
2 years ago |
|
Sultan khan
|
d7f45fa0b9
|
ITG change pushed.
|
2 years ago |
|
Haroon6138
|
4194a52685
|
Merge pull request 'business_trip_settlement && business card design update' (#8) from business_trip_settlement into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/8
|
2 years ago |
|
Aamir Muhammad
|
6cf7340417
|
Business Card Design Update
|
2 years ago |
|
Sultan khan
|
6d92a78843
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
|
2 years ago |
|
Sultan khan
|
c56c9533b2
|
date format issue fixed.
|
2 years ago |
devamirsaleemahmad
|
12ec0a25ee
|
business trip settlement fix.
|
2 years ago |
|
haroon amjad
|
74b12391d2
|
update to store for document upload CR
|
2 years ago |
 Sikander Saleem
|
88d2209e86
|
Merge pull request 'CR-6273 improvement.' (#7) from development_sikander into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/7
|
2 years ago |
|
Sikander Saleem
|
7f6f240590
|
CR-6273 improvement.
|
2 years ago |
|
Sikander Saleem
|
e504bd13e1
|
Merge pull request 'CR-6273 implemented.' (#6) from development_sikander into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/6
|
2 years ago |
|
Sikander Saleem
|
58962ede03
|
CR-6273 implemented.
|
2 years ago |
|
Haroon6138
|
0589a55c8d
|
Merge pull request 'development_haroon' (#5) from development_haroon into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/5
|
2 years ago |
|
haroon amjad
|
281f0bab78
|
updates
|
2 years ago |