Commit Graph

224 Commits (46acc4199519cfd5407eecfb70103ca0d4e2d8ca)

Author SHA1 Message Date
mirza.shafique 46acc41995 Merge branch 'master' into dev_mirza
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 years ago
mirza.shafique 12bfd034c9 fixes 1.2 3 years ago
Sultan khan b073399ef4 MOE bug fixes 3 years ago
mirza.shafique 7bbcaaf89f click fixes 1.0 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 add2b3a10f chat connection issue while logout fixed. 3 years ago
Sikander Saleem 24b09ed7f3 dashboard changes. 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
Aamir Muhammad 2303daa1ad Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 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
mirza.shafique d458e8ac45 Merge branch 'master' into development_mirza 3 years ago
Sikander Saleem 550e26dce1 Attendance loader fix 3 years ago
Sikander Saleem 0e329e8e2b ticket balance value display fixed & infant added in value. 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
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
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
Aamir Muhammad 75eab961ce Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
3 years ago
Aamir Muhammad ffd894ca28 Notification To Specific Screen 3 years ago
Sikander Saleem 84a07df310 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 0f84f9ae65 app life cycle added.
file attachment option added on dynamic form. & improvements
3 years ago
Aamir Muhammad 698aee3482 Notification 3 years ago
Sikander Saleem e10ea6b023 mark attendance session expire fixed 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
haroon amjad e685cf188c updates 3 years ago
haroon amjad 47a274b1d3 Merge branch 'master' into development_haroon 3 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 3 years ago
haroon amjad 0d2052346e updates 3 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 3 years ago
Sikander Saleem 5261f3e416 marathon placement change, worklist type list improvement. 3 years ago
Sikander Saleem 47732d67cb drawer item align issue fixed on arabic. 3 years ago
haroon amjad b522aab685 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad 08e0af8f64 Chat Bug's Fix 3 years ago
haroon amjad 631752cffa fixes 3 years ago
haroon amjad a39e6808d7 fixes & updates 3 years ago
Aamir Muhammad 76239d0077 Fixes 3 years ago
Aamir Muhammad feb5c5071c Fav Users Images Fix 3 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 3 years ago
Faiz Hashmi f31db58a76 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Faiz Hashmi 603ff1b19f Committing after API replacement from SignalR => InProgress 3 years ago
haroon amjad 915a7d208f Jira translation fix 3 years ago