aamir-csol
|
5e292544d7
|
Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir
# Conflicts:
# lib/main.dart
# lib/presentation/authentication/register.dart
# lib/providers/authentication_view_model.dart
|
2 months ago |
faizatflutter
|
89e9323d9e
|
merged master and updated structure
|
2 months ago |
|
faizatflutter
|
e2b0930dd1
|
Merge branch 'master' into faiz_dev1
# Conflicts:
# ios/Podfile.lock
# lib/core/app_state.dart
# lib/main.dart
# lib/presentation/authentication/login.dart
# lib/presentation/home/landing_page.dart
# pubspec.yaml
|
2 months ago |
|
faizatflutter
|
c1221e4970
|
pushed device api
|
2 months ago |
|
aamir-csol
|
6f98690929
|
register & changes
|
2 months ago |
Sultan khan
|
4e010bb2cf
|
initial commit
|
2 months ago |
|
aamir-csol
|
9c52a6122f
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/authantication/login.dart
|
2 months ago |
|
aamir-csol
|
a4da9db6c3
|
register & changes
|
2 months ago |
Haroon Amjad
|
0a39a00df5
|
Landing page updates
|
2 months ago |
|
Sultan khan
|
d3aff9f93d
|
updating structure
|
2 months ago |
|
aamir-csol
|
8ed8637108
|
Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
# lib/presentation/authantication/login.dart
|
2 months ago |
|
aamir-csol
|
ea15bd9152
|
bottom sheet
|
2 months ago |
|
Haroon Amjad
|
30fd99d122
|
android fixes
|
2 months ago |
|
Sultan khan
|
cbfb381615
|
Merge branch 'faiz_dev' into faiz_dev1
# Conflicts:
# ios/Podfile.lock
# lib/main.dart
# lib/routes/app_routes.dart
# pubspec.lock
|
2 months ago |
|
faizatflutter
|
45e868adba
|
pushed new API
|
2 months ago |
 Haroon6138
|
670feb55af
|
Merge pull request 'changes by Aamir' (#1) from dev_aamir into master
Reviewed-on: #1
|
2 months ago |
|
aamir-csol
|
4d76b34608
|
app bar & chip
|
2 months ago |
|
Faiz Hashmi
|
357cf4392e
|
Updated architecture
|
2 months ago |
|
aamir-csol
|
255d189ce1
|
widgets & fixes
|
2 months ago |
|
aamir-csol
|
4e3ba99280
|
widgets & fixes
|
2 months ago |
|
Faiz Hashmi
|
d65dc4ea89
|
initial commit
|
2 months ago |
|
aamir-csol
|
59054df238
|
android / ios folder push
|
2 months ago |
|
Haroon Amjad
|
4fcaea2993
|
updates
|
2 months ago |
|
Haroon Amjad
|
c65d44ae4d
|
updates
|
2 months ago |
|
Haroon Amjad
|
2293db00ea
|
updates
|
2 months ago |
|
Haroon Amjad
|
b6766654e0
|
initial commit
|
2 months ago |