Commit Graph

576 Commits (a212963ad7b102c943dd27a0b1828b791bcda2c0)

Author SHA1 Message Date
Sultan khan a212963ad7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Sultan khan 0f38825314 bug fix 3 years ago
Sultan khan d25e608565 bug fixes 3 years ago
haroon amjad d66f841ca4 App security implemented, Offers & discounts fixes 3 years ago
haroon amjad 1a3bf90b89 Merge branch 'master' into development_haroon 3 years ago
Aamir Muhammad 8433d594a2 Chat Sort On Messages, Scroll Fix, Search Improved 3 years ago
haroon amjad 25f4bd93bc Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Sikander Saleem ae64001e63 Chat Fixes 3 years ago
Sikander Saleem fb0dff48bc Chat Fixes 3 years ago
Sikander Saleem 80c97b0a65 Chat Fixes 3 years ago
Sikander Saleem 6d026a37ba Chat Fixes 3 years ago
Aamir Muhammad 616e35f2d3 Fixes 3 years ago
Aamir Muhammad 0f7afa911a Fixes 3 years ago
Aamir Muhammad 70ffb8afd8 Fixes 3 years ago
haroon amjad 6efc07fcab Jira fixes 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 6463dfc424 Reverting fatima changes 3 years ago
haroon amjad d80f93a6dc Revert "no message"
This reverts commit 323741ad06.
3 years ago
haroon amjad 323741ad06 no message 3 years ago
Fatimah Alshammari f43b4905c5 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into fatima
# Conflicts:
#	lib/ui/misc/request_submit_screen.dart
3 years ago
Sultan khan 86be7ccc5f Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan c500da9a18 bug fix 3 years ago
haroon amjad 915a7d208f Jira translation fix 3 years ago
haroon amjad de6652623c Merge branch 'master' into development_haroon 3 years ago
haroon amjad a949f15023 fixes 3 years ago
Aamir Muhammad e94a8d9a5e Hub Connection Fix 3 years ago
Aamir Muhammad 2d6ffff8be Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad ff7eb2ad6d Chat Fixes & User Chat Counter 3 years ago
haroon amjad d2de59bf6e Merge branch 'master' into development_haroon 3 years ago
Fatimah Alshammari 19ab49029f Merge branch 'master' into fatima 3 years ago
Fatimah Alshammari 581e6de897 fix issues 3 years ago
mirza.shafique 38c6acbd7d Merge branch 'master' into development_mirza 3 years ago
mirza.shafique 31fba1f8e6 worklist animation fix 3 years ago
haroon amjad 0fb4a749a4 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 8133542ae0 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad abc586b81e Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 8d5cc7ed23 Chat Fixes & User Chat Counter 3 years ago
haroon amjad 62acd531b0 fixes 3 years ago
haroon amjad f63e0e1e7c Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/work_list/worklist_detail_screen.dart
3 years ago
haroon amjad e505a9fa8c fixes 3 years ago
Aamir Muhammad 4e96108207 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 0f13ab65d6 Chat Fixes & User Chat Counter 3 years ago
Faiz Hashmi 3e1b24eb00 Committing before reverting from SignalR to Apis 3 years ago
Faiz Hashmi 96e52abbb9 Committing before reverting from SignalR to Apis 3 years ago
Fatimah Alshammari 85be372ad8 Merge branch 'master' into fatima
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/leave_balance/add_leave_balance_screen.dart
3 years ago
Fatimah Alshammari 9d0bf4fe7e fix issues 3 years ago
Aamir Muhammad 0db4a5a7cd Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad fb97319164 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 76c3c5c3ae Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/consts.dart
3 years ago