Commit Graph

42 Commits (41afe554e8dac4cfe2b0a960712bf1f71b459203)

Author SHA1 Message Date
haroon amjad e4d182912c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	assets/langs/en-US.json
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
7 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 10 months ago
haroon amjad 1ee51a7597 Changed the device identifier, Update to Stores VersionID 9.5 11 months ago
haroon amjad 1bb44039d6 Update to stores, VersionID 9.2 1 year ago
Aamir Muhammad 72c178382f time sheet changes 2 years ago
Faiz Hashmi e585ab7a8c added the text intimation to join the marathon 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 4 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 4 years ago
haroon amjad 4a513c08d9 fixes 4 years ago
Faiz Hashmi 810920a934 Pushing after resolving multiple times API calling issue 4 years ago
Faiz Hashmi 96e52abbb9 Committing before reverting from SignalR to Apis 4 years ago
Aamir Muhammad eb7e5a4837 Chat Updates & Stability 4 years ago
haroon amjad c22556d9b6 fixes 4 years ago
Sikander Saleem 6e409c77a0 mark attendance counter & ios nfc fixed 1.0 4 years ago
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 4 years ago
Aamir Muhammad b190a248bf Chat Implementation Version 1 4 years ago
Sikander Saleem a45b6aece2 improvements 4 years ago
Sikander Saleem 4e22784676 ticket balance dashboard added. 4 years ago
Sikander Saleem 8855eb7622 leave balance cont2. 4 years ago
Sikander Saleem 3fcbd9946a configs for ios. 4 years ago
Sikander Saleem 0786a1fa03 lint rules added. 4 years ago
Sikander Saleem f1c36b5821 monthly pay slip added. 4 years ago
Sikander Saleem 95e2e74fd0 Merge branch 'master' into development_sikander
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/main.dart
#	lib/models/generic_response_model.dart
#	lib/ui/my_attendance/my_attendance_screen.dart
#	lib/ui/work_list/worklist_detail_screen.dart
4 years ago
Sikander Saleem 959750da9b ticket request cont. 4 years ago
Fatimah Alshammari d2a6ed8de7 fix monthly attendance 4 years ago
Sikander Saleem ae0a788728 Merge branch 'master' into development_sikander
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	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/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
4 years ago
Sikander Saleem 9cc86751eb missing swipe cont 4 years ago
Sultan Khan ff17adfd09 Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 5 years ago
Sultan Khan 06b3726d4a Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 5 years ago
Sultan Khan 0974861463 updated menus 5 years ago
devmirza121 68729ddbb9 NFC Attendance implement 5 years ago
Sikander Saleem 4b5ab2cd7f wokrlist api's added & improvements 5 years ago
Sikander Saleem e7a67cc58d Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/locale_keys.g.dart
#	lib/main.dart
#	lib/models/generic_response_model.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	pubspec.yaml
5 years ago
Sikander Saleem 6b9ea200ad login flow added. 5 years ago
devmirza121 b6670289b1 Dashboard API's 1.2 5 years ago
devmirza121 fb8d6c7b20 Dashboard API's 1.1 5 years ago
Sikander Saleem f1beefbc46 login apis, models & forgot password screen added. 5 years ago
Sikander Saleem 311ebd9c13 confirm login screen added & structure improvement. 5 years ago
Sikander Saleem 761b5abbab model improvements 5 years ago
Sikander Saleem 8470495332 Gradle updated, fonts added & structure improvements 5 years ago
tall3at 89f6df8c77 basic structure 5 years ago
tall3at 1b6ebc67c3 first commit 5 years ago