 haroon amjad
|
38906e24b7
|
Merge branch 'master' into wala_plus_with_dialog_removal
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# ios/Flutter/AppFrameworkInfo.plist
# ios/Runner.xcodeproj/project.pbxproj
# ios/Runner/Info.plist
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
# lib/models/get_mobile_login_info_list_model.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/verify_last_login_screen.dart
# pubspec.yaml
|
2 days ago |
FaizHashmi
|
06295821aa
|
made the city search functional
|
1 week ago |
|
FaizHashmi
|
6ba06065b3
|
Fav Tab Changes and SearchBar Fix
|
1 week ago |
Sultan khan
|
bd6e9577e3
|
Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
Toast fixed
# Conflicts:
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
|
2 weeks ago |
|
FaizHashmi
|
2fb4a99a42
|
Toast fixed
|
2 weeks ago |
|
Sultan khan
|
fe36263ac0
|
design changed
|
2 weeks ago |
|
Sultan khan
|
99c2d658e1
|
Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
Toast fixed
|
2 weeks ago |
|
Sultan khan
|
1d2ed863ae
|
no message
|
2 weeks ago |
|
FaizHashmi
|
b931ed8138
|
Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal
|
2 weeks ago |
|
FaizHashmi
|
b25b398695
|
Toast fixed
|
2 weeks ago |
|
Sultan khan
|
a517e4e48b
|
last login token updated.
|
2 weeks ago |
|
FaizHashmi
|
d6fdcb214d
|
chip color change
|
2 weeks ago |
|
Sultan khan
|
37303458bf
|
Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
Added filters
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen_for_dependet.dart
|
2 weeks ago |
|
Sultan khan
|
cd2703cbc5
|
favorite offers done
|
2 weeks ago |
|
FaizHashmi
|
6d4bddd42d
|
Added filters
|
2 weeks ago |
|
FaizHashmi
|
154b62bbad
|
Added sub categories
|
2 weeks ago |
|
Sultan khan
|
f6865959e6
|
no message
|
2 weeks ago |
|
Sultan khan
|
4cd4766ab8
|
no message
|
3 weeks ago |
|
Sultan khan
|
0a270bd323
|
login flow updated
|
3 weeks ago |
|
FaizHashmi
|
857d1e74ac
|
Merge branch 'wala_plus' into wala_plus_with_dialog_removal
|
3 weeks ago |
|
FaizHashmi
|
e05e97a536
|
Updated the dialogs to toast
|
3 weeks ago |
|
Sultan khan
|
d6310e5233
|
search
|
3 weeks ago |
|
FaizHashmi
|
aff3bc2fc0
|
fixed the dependent flow.
|
3 weeks ago |
|
FaizHashmi
|
a165bf695d
|
Merge remote-tracking branch 'origin/wala_plus' into wala_plus
|
3 weeks ago |
|
FaizHashmi
|
a94613f693
|
km away fixed.
|
3 weeks ago |
|
Sultan khan
|
c42c30658f
|
no message
|
3 weeks ago |
|
FaizHashmi
|
74bb37593a
|
filter api added
|
3 weeks ago |
|
FaizHashmi
|
3e4f97a4c1
|
Added business card API
|
3 weeks ago |
|
FaizHashmi
|
858fa7edb7
|
changes
|
3 weeks ago |
|
Sultan khan
|
9638d98b76
|
no message
|
3 weeks ago |
Haroon Amjad
|
f503dca074
|
Merge branch 'apilevel_raise' into master_merge
# Conflicts:
# android/app/build.gradle
# android/gradle/wrapper/gradle-wrapper.properties
# android/settings.gradle
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/api/dashboard_api_client.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart
# pubspec.yaml
|
4 weeks ago |
 taha
|
a6be594b3b
|
Update dependencies and improve code structure
|
1 month ago |
|
Sultan khan
|
ca6ce85d7d
|
retailer screen added.
|
1 month ago |
|
Sultan khan
|
782ad51823
|
categories updated.
|
1 month ago |
 Aamir Muhammad
|
9d7372ea4a
|
Wala-Plus Independent Pre Login & Saved Login
|
2 months ago |
|
Aamir Muhammad
|
c0497201b6
|
Wala-Plus Independent Login
|
2 months ago |
|
haroon amjad
|
89b77c205b
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
|
2 months ago |
|
haroon amjad
|
64e2b2c42a
|
updates
|
2 months ago |
|
Sultan khan
|
a9f0cb8216
|
CEI, worklist po pr filter, date issue in absence dynamic screen
|
2 months ago |
aamir-csol
|
1d3f33ea81
|
ENSAT, Notification Timer Counter & Dead Line
|
7 months ago |
|
aamir-csol
|
ecc0869a23
|
Ticket
|
7 months ago |
|
aamir-csol
|
90faa4dd5e
|
Merge branch 'Courses-CR#-7150' into flutter_upgrade_with_timesheet_changes
# Conflicts:
# lib/api/api_client.dart
# lib/api/dashboard_api_client.dart
# lib/classes/consts.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/screens/ticket/ticket_detailed_screen.dart
# lib/widgets/sso_webview_widget.dart
|
7 months ago |
|
aamir-csol
|
e1f2819fe6
|
Ticket
|
7 months ago |
|
Sultan khan
|
8ea831c2c4
|
color coding changes on the monthly leave calendar and prod e-learning URL added.
|
7 months ago |
|
aamir-csol
|
deffeda015
|
Alma
|
7 months ago |
|
Sultan khan
|
5da81968d7
|
Merge branch 'greeting_card' into Courses-CR#-7150
* greeting_card:
Greeting
Greeting Card
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/api/dashboard_api_client.dart
# lib/generated/codegen_loader.g.dart
# lib/provider/dashboard_provider_model.dart
|
8 months ago |
|
Sultan khan
|
b240f55aff
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into Courses-CR#-7150
# Conflicts:
# lib/ui/landing/widget/menus_widget.dart
|
8 months ago |
|
haroon amjad
|
2c9db30d6a
|
Merge branch 'master' into etqan_ovr_integration
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/api/dashboard_api_client.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/provider/dashboard_provider_model.dart
|
8 months ago |
|
aamir-csol
|
facb3bf4e6
|
QIPS-1205
|
8 months ago |
|
aamir-csol
|
71d03ba664
|
QIPS-1205
|
8 months ago |