Commit Graph

98 Commits (2f22519d86d606d4683308d742241ac348052766)

Author SHA1 Message Date
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 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
Sikander Saleem 3702bac7c2 voip merge conflicts resolve 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
Sikander Saleem 7f6f240590 CR-6273 improvement. 2 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 2 years ago
haroon amjad 5098aa7f90 my docs upload fix 2 years ago
Aamir Muhammad 73cb717bfb Merge branch 'master' into development_aamir
# Conflicts:
#	pubspec.yaml
2 years ago
Aamir Muhammad 42c3b7a8af Updates To 3.10 2 years ago
Sikander Saleem 23b4e81170 my documents added. 2 years ago
Aamir Muhammad 23820e7e5e Ios Voip Kit 2 years ago
Aamir Muhammad 364d1292a0 OneSignal Api 2 years ago
Aamir Muhammad 8aa92d127c End Call 2 years ago
haroon amjad 9030b9bc81 Notification details implemented 2 years ago
haroon amjad babe36232e Image slider fixed 3 years ago
haroon amjad 204aeebe5f Item for sale updates 3 years ago
haroon amjad 724227fc12 Item for sale attachment updates 3 years ago
haroon amjad 8f83f89dc7 Item for sale improvements 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
haroon amjad 696a6881c4 date fixes & Items of sale updates 3 years ago
haroon amjad a39e6808d7 fixes & updates 3 years ago
haroon amjad 2790d18c1d fixes 3 years ago
haroon amjad d66f841ca4 App security implemented, Offers & discounts fixes 3 years ago
haroon amjad 6efc07fcab Jira fixes 3 years ago
haroon amjad c7dca3c377 Jira fixes for announcements & attachments 3 years ago
haroon amjad c436908d25 updates & fixes 3 years ago
haroon amjad c2a4df89bb offers & discouts 3 years ago
haroon amjad c22556d9b6 fixes 3 years ago
Sultan khan e9edc80eae Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan a0201efbfb dynamic screen updated 3 years ago
Fatimah Alshammari 69ded3dc43 fix my request 3 years ago
haroon amjad 588e8f51f0 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 8b0bae0891 Worklist updates 3 years ago
Fatimah Alshammari af56d8f71b fix issues 3 years ago
haroon amjad f07167e734 Leave balance fix, Items for sale fix 3 years ago
Sikander Saleem ba65fbb79d Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 13e9c5fa21 centering issue in dynamic list view screen fixed. 3 years ago
haroon amjad e65beebfe8 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
3 years ago
haroon amjad 866bb8a29e Pull to refresh, Items for Sale & Offers n Discounts fixes 3 years ago
Sikander Saleem e8c8c225c7 icon direction bug fixes 3 years ago
haroon amjad f6c9b6dce9 Updates & fixes 3 years ago
Sikander Saleem 9ce042e7d3 bussiness card improvement. 3 years ago
Sikander Saleem a45b6aece2 improvements 3 years ago
Sikander Saleem cbcb3cdc00 item for sale improvement cont. 3 years ago
Sikander Saleem 7eadd97869 item for sale ui improvements & translation added. 3 years ago
Sikander Saleem f647b32c65 item for sale improvement. 3 years ago
Sikander Saleem b79edd701c code improvement & translation added. 3 years ago