Commit Graph

770 Commits (faiz_marathon_signalR_critical)
 

Author SHA1 Message Date
haroon amjad 2a65af9414 Merge branch 'sultan-dev' into 'master'
Sultan dev

See merge request Cloud_Solution/mohemm-flutter-app!65
3 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
3 years ago
Faiz Hashmi 35a4b780a7 Added initial APIs for Marathon 3 years ago
Aamir Muhammad dc9d1715d9 Chat Updates & Counter Event Modifications 3 years ago
Aamir Muhammad 622404896c Chat Updates & Counter Event Modifications 3 years ago
Aamir Muhammad 76fc093577 Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad f4f9b442c8 Chat Updates & Counter Event Modifications 3 years ago
Sultan khan 557a4c3737 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan bcf4a9ec42 my team probation issue fixed 3 years ago
haroon amjad c1527f5f0a Merge branch 'master' into development_haroon 3 years ago
haroon amjad 6114fe4708 Merge branch 'development_aamir' into 'master'
Chat Fix

See merge request Cloud_Solution/mohemm-flutter-app!64
3 years ago
Aamir Muhammad ab5de25c81 Chat Updates & Counter Event Modifications 3 years ago
Aamir Muhammad 32ee792041 Chat Updates & Counter Event Modifications 3 years ago
Aamir Muhammad 76169e5cb8 Chat Updates & Counter Event Modifications 3 years ago
Aamir Muhammad 2e88275285 Chat Updates & Counter Event Modifications 3 years ago
haroon amjad 7cf7824df7 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 2d8ee5a8eb Merge branch 'development_aamir' into 'master'
Chat Fix

See merge request Cloud_Solution/mohemm-flutter-app!62
3 years ago
Aamir Muhammad c1f3f17c89 Chat Updates & Counter Event Modifications 3 years ago
Aamir Muhammad fab16db8b3 Chat Updates & Counter Event Modifications 3 years ago
haroon amjad 42d2de2ec8 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 468555046b updates 3 years ago
haroon amjad fe36f12413 Merge branch 'development_aamir' into 'master'
Chat Updates & Counter Event Modifications

See merge request Cloud_Solution/mohemm-flutter-app!61
3 years ago
Sultan khan ee553ae476 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan aadc7203a6 no message 3 years ago
haroon amjad e8043f6980 Merge branch 'fatima' into 'master'
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!54
3 years ago
Fatimah Alshammari ba1a5c66ef fix issues 3 years ago
Aamir Muhammad 86ac29946f Chat Updates & Counter Event Modifications 3 years ago
haroon amjad 9d81a220b2 Merge branch 'development_haroon' into 'master'
Development haroon

See merge request Cloud_Solution/mohemm-flutter-app!60
3 years ago
haroon amjad 1ec45c35aa Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
3 years ago
haroon amjad 1361856213 Merge branch 'development_aamir' into 'master'
Chat Fixes

See merge request Cloud_Solution/mohemm-flutter-app!59
3 years ago
haroon amjad 4f88f30368 updates 3 years ago
Aamir Muhammad 5708c93ae5 Chat Updates 3 years ago
Aamir Muhammad a64ae80a4a Chat Updates 3 years ago
Aamir Muhammad 06e7a913da Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
haroon amjad 03c488c663 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
#	lib/widgets/app_bar_widget.dart
3 years ago
haroon amjad b7e4a6d149 Merge branch 'development_aamir' into 'master'
Revert "Chat Count Api / Chat Token Updates / Chat Call UI"

See merge request Cloud_Solution/mohemm-flutter-app!58
3 years ago
Aamir Muhammad 9720399fbf Revert "Chat Count Api / Chat Token Updates / Chat Call UI"
This reverts commit 42287f24d1
3 years ago
Aamir Muhammad 1fcb6250f5 Revert "Chat Fixes"
This reverts commit c6cd550dbc
3 years ago
Aamir Muhammad 42287f24d1 Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Aamir Muhammad 8cb5d9a061 Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Aamir Muhammad e2a1eb3c81 Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Aamir Muhammad 66e4d89b26 Merge remote-tracking branch 'origin/development_aamir' into development_aamir 3 years ago
Aamir Muhammad 4d35767784 Revert "Chat Count Api / Chat Token Updates / Chat Call UI"
This reverts commit 826c39bafc72f27eceb7a2fbb975740e2a18c7db.
3 years ago
Aamir Muhammad efce6dbd0f Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Aamir Muhammad 5913452a43 Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Aamir Muhammad 5d132206ba Merge branch 'development_aamir' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into development_aamir
 Conflicts:
	lib/api/chat/chat_provider_model.dart
3 years ago
Aamir Muhammad 2546fb52a9 Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Sikander Saleem c6cd550dbc Chat Fixes 3 years ago
Sikander Saleem 5ec6fbdf42 Chat Fixes 3 years ago
Aamir Muhammad 451b381acf Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago