Commit Graph

773 Commits (master)

Author SHA1 Message Date
Faiz Hashmi 3215ae6757 Merge branch 'master' into faiz_development_moe
# Conflicts:
#	lib/generated/locale_keys.g.dart
2 years ago
mirza.shafique 46acc41995 Merge branch 'master' into dev_mirza
# Conflicts:
#	lib/generated/codegen_loader.g.dart
2 years ago
mirza.shafique 12bfd034c9 fixes 1.2 2 years ago
Sultan khan b073399ef4 MOE bug fixes 2 years ago
Faiz Hashmi dae1a3c6cb Few Changes 2 years ago
mirza.shafique 7bbcaaf89f click fixes 1.0 3 years ago
Sikander Saleem 31c49fbeec Merge branch 'master' into moe-sikander
# Conflicts:
#	lib/ui/screens/my_requests/my_requests.dart
3 years ago
Sikander Saleem d44d0b7709 dates format issue resolved. 3 years ago
mirza.shafique f7ab465c1e click fixes 1.0 3 years ago
mirza.shafique a5bf631d40 Merge branch 'master' into dev_mirza 3 years ago
mirza.shafique 4a865a06e4 click fixes 3 years ago
Sikander Saleem 44f23f413e my request / concurrent reports improvements. 3 years ago
Sikander Saleem 94b74cf9f0 improvements. 3 years ago
Sikander Saleem 18ec3e4288 character count added on format type N. 3 years ago
Sikander Saleem 4de3c55ad9 Merge branch 'master-parent' into moe-sikander 3 years ago
Sikander Saleem add2b3a10f chat connection issue while logout fixed. 3 years ago
haroon amjad b760dc44a5 Updates & fixes 3 years ago
Sikander Saleem 24b09ed7f3 dashboard changes. 3 years ago
haroon amjad e0d02554b1 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 182fa6774e Huawei push implementation 3 years ago
Sikander Saleem 5f7c135346 Merge branch 'mohemm-flutter-app-master' into moe-sikander
# Conflicts:
#	lib/main.dart
#	lib/ui/landing/dashboard_screen.dart
3 years ago
Sikander Saleem 2b35c3d8d6 Merge branch 'development_aamir' into 'master'
Chat  Fix & Web RTC -- Inprogress

See merge request Cloud_Solution/mohemm-flutter-app!154
3 years ago
Aamir Muhammad 2303daa1ad Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 3 years ago
Faiz Hashmi 33af55c28d some fixes while testing 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
mirza.shafique 2e8d6c4ede merge fork 3 years ago
mirza.shafique 5233154a44 moheem env 3 years ago
Sikander Saleem 1f04dfced2 Merge branch 'development_mirza' into 'master'
Development mirza

See merge request Cloud_Solution/mohemm-flutter-app!149
3 years ago
mirza.shafique d458e8ac45 Merge branch 'master' into development_mirza 3 years ago
Faiz Hashmi f72f49c719 Merge branch 'master' into faiz_cs 3 years ago
Sikander Saleem 550e26dce1 Attendance loader fix 3 years ago
Faiz Hashmi 580c7d62f5 some fixes while testing 3 years ago
Sikander Saleem 0e329e8e2b ticket balance value display fixed & infant added in value. 3 years ago
haroon amjad 0c7771dab9 updates 3 years ago
haroon amjad 7257fa88cc Merge branch 'master' into development_haroon 3 years ago
haroon amjad 9a2a85f848 updates 3 years ago
haroon amjad 6749074479 Merge branch 'master' into development_haroon 3 years ago
Sultan khan b227f11c7b Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
haroon amjad 59885b29f6 Merge branch 'development_aamir' into 'master'
notification to chat navigate

See merge request Cloud_Solution/mohemm-flutter-app!142
3 years ago
haroon amjad a07563e7b1 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 9dd53ad3ab Push notification fixes 3 years ago
Sultan khan 61904ca5f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
3 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
Sikander Saleem 787d6d7ab2 Merge branch 'development_mirza' into 'master'
Development mirza

See merge request Cloud_Solution/mohemm-flutter-app!140
3 years ago
mirza.shafique aa511f02ac Merge branch 'master' into development_mirza
# Conflicts:
#	lib/classes/consts.dart
#	pubspec.yaml
3 years ago
Aamir Muhammad 948689b67a Notification To Specific Screen 3 years ago
Faiz Hashmi 7e235c9d8c Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi 70861807c5 Resolved VideoPlayer Bug on IOS 3 years ago
Aamir Muhammad 75eab961ce Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
3 years ago