Commit Graph

24 Commits (9c994d8dec2ea23942bc42368d30f9882fdf2a3d)

Author SHA1 Message Date
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
1 week ago
taha a6be594b3b Update dependencies and improve code structure 2 weeks ago
Sultan khan a9f0cb8216 CEI, worklist po pr filter, date issue in absence dynamic screen 1 month ago
haroon amjad 7c3f6a508f updates & fixes 2 years ago
Sikander Saleem 6e3fc55fde event activity added - cont 2 years ago
Sultan khan bafb6c8470 missing swipe issue and payment work-list and business trip issue fixed. 2 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 4 years ago
Faiz Hashmi 5bb998a8d2 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/utils.dart
#	lib/ui/marathon/widgets/marathon_banner.dart
4 years ago
Faiz Hashmi 4cb7bbee5d Pushing while testing! 4 years ago
haroon amjad 696a6881c4 date fixes & Items of sale updates 4 years ago
haroon amjad 5be9adca31 fixes 4 years ago
haroon amjad e505a9fa8c fixes 4 years ago
haroon amjad a947b759f8 Merge branch 'master' into development_haroon 4 years ago
haroon amjad c7dca3c377 Jira fixes for announcements & attachments 4 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
4 years ago
haroon amjad 46af0c42c7 updates & fixes 4 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
4 years ago
Faiz Hashmi 35a4b780a7 Added initial APIs for Marathon 4 years ago
haroon amjad 4ff3a5093b Action duration implemented 4 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 4 years ago
Sikander Saleem 0786a1fa03 lint rules added. 4 years ago
haroon amjad 427c5fb5b6 Pending Transactions implemented 4 years ago
Sikander Saleem 384aa8d9b4 wokrlist api's added & improvements 5 years ago
Sikander Saleem 4b5ab2cd7f wokrlist api's added & improvements 5 years ago