 haroon amjad
|
609d3ca48a
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# ios/Runner.xcodeproj/project.pbxproj
# lib/app_state/app_state.dart
# pubspec.yaml
|
9 months ago |
Sikander Saleem
|
2cea45f0e1
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
|
9 months ago |
|
haroon amjad
|
43e1e4df6b
|
forgot password changes
|
9 months ago |
|
Sikander Saleem
|
d1e2d0f59b
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
|
10 months ago |
Faiz Hashmi
|
5723b64234
|
Join MarathonProviderFix
|
10 months ago |
|
Sikander Saleem
|
610d4788c2
|
parameter added in survey.
|
10 months ago |
|
Sikander Saleem
|
d44bc37681
|
marathon tutorial added.
|
10 months ago |
|
haroon amjad
|
2744eff281
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
# lib/ui/app_update_screen.dart
# lib/ui/chat/group_chat_detaied_screen.dart
# pubspec.yaml
|
11 months ago |
|
Faiz Hashmi
|
e585ab7a8c
|
added the text intimation to join the marathon
|
11 months ago |
|
haroon amjad
|
8c1f140b57
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
|
1 year ago |
 Sikander Saleem
|
58962ede03
|
CR-6273 implemented.
|
1 year ago |
|
haroon amjad
|
e433c011e4
|
Merge branch 'master_mohemm_flutter'
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/notifications.dart
# lib/generated_plugin_registrant.dart
# pubspec.yaml
|
1 year ago |
|
haroon amjad
|
a58d4753e4
|
Merge branch 'sultan-dev' into development_haroon
# Conflicts:
# assets/langs/en-US.json
# lib/classes/utils.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# pubspec.yaml
|
1 year ago |
|
Sikander Saleem
|
23b4e81170
|
my documents added.
|
1 year ago |
Sultan khan
|
608a8fcb97
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/app_state/app_state.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
|
1 year ago |
|
Sultan khan
|
790103bdc9
|
chat changes
|
1 year ago |
|
Sultan khan
|
fd6058e87d
|
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/app_state/app_state.dart
# lib/generated/locale_keys.g.dart
|
2 years ago |
haroon amjad
|
11d7e8bb8a
|
Merge branch 'master_mohemm_flutter' into development_haroon
|
2 years ago |
|
Sikander Saleem
|
571b8bd7af
|
itg active directory password change added.
|
2 years ago |
|
Sultan khan
|
9cb71b525e
|
group chat started
|
2 years ago |
|
haroon amjad
|
1eb6065ed8
|
Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
# lib/app_state/app_state.dart
|
2 years ago |
mirza.shafique
|
13d8aac22e
|
ERM fixes
|
2 years ago |
|
mirza.shafique
|
7d7acfa2df
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/main.dart
|
2 years ago |
|
haroon amjad
|
f39e40128e
|
Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
# lib/classes/notifications.dart
# lib/classes/utils.dart
|
2 years ago |
|
haroon amjad
|
1ebcbd1079
|
ERM Channel Audio playback implemented
|
2 years ago |
haroon amjad
|
d3c5fd1467
|
Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
|
2 years ago |
|
haroon amjad
|
6436062642
|
HMG Mohemm Setup
|
2 years ago |
|
mirza.shafique
|
2455e27595
|
hmg wifi implementation
|
2 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
|
2 years ago |
|
Sultan khan
|
3b2ef69f7c
|
Offers and discount and Item for sale changes done.
|
2 years ago |
|
Sikander Saleem
|
0f84f9ae65
|
app life cycle added.
file attachment option added on dynamic form. & improvements
|
2 years ago |
|
Faiz Hashmi
|
7f02dff689
|
Added the Sequence Number in Question Options and Removed isCorrectOption
|
2 years ago |
|
Faiz Hashmi
|
10ef069a06
|
Merge branch 'master' into faiz_cs
|
2 years ago |
|
Faiz Hashmi
|
c337b82676
|
Pushing before removing the isCorrectOption
|
2 years ago |
|
Faiz Hashmi
|
a72ac34122
|
Updated the text
|
2 years ago |
|
Sikander Saleem
|
a165ac2e91
|
Merge branch 'master' into development_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
2 years ago |
|
Faiz Hashmi
|
5592989b44
|
Added Demo Marathon Module
|
2 years ago |
 Aamir Muhammad
|
54961c875f
|
Ios Stream Audio
|
2 years ago |
|
Faiz Hashmi
|
24c118a66e
|
Removed GapTime for last question and some minor bugs fixed!
|
2 years ago |
|
Aamir Muhammad
|
35f814b74a
|
Merge branch 'master' into development_aamir
|
2 years ago |
|
Faiz Hashmi
|
5bb998a8d2
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/classes/utils.dart
# lib/ui/marathon/widgets/marathon_banner.dart
|
2 years ago |
|
Faiz Hashmi
|
d9749fc402
|
Updated NoWinnerFoundDesign and some Logical Up gradations
|
2 years ago |
|
Aamir Muhammad
|
12defa65ac
|
Merge branch 'master' into development_aamir
|
2 years ago |
|
haroon amjad
|
bcf67895b9
|
Dynamic forms & my team fixes
|
2 years ago |
|
Aamir Muhammad
|
abd1fa9375
|
chat voice message implementation
|
2 years ago |
|
Faiz Hashmi
|
4cb7bbee5d
|
Pushing while testing!
|
2 years ago |
|
Faiz Hashmi
|
3f7e1cd0be
|
Pushing before updating API Structure
|
2 years ago |
|
haroon amjad
|
660fdb63dd
|
Updates & fixes
|
2 years ago |
|
Faiz Hashmi
|
86d25d3ecc
|
Added Privileged logic for Marathon
|
2 years ago |
Fatimah Alshammari
|
dde200fd7a
|
Merge branch 'master' into fatima
|
2 years ago |