Sultan Khan
|
82570b9ba6
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
49bc689351
|
Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
 Sikander Saleem
|
dec5ebe8fe
|
Merge branch 'development_sikander' into 'master'
my attendance working cont-1
See merge request mirza.shafique/mohem_flutter_app!21
|
2 years ago |
|
Sikander Saleem
|
bee716d77b
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
25d020441c
|
my attendance working cont-1
|
2 years ago |
Fatimah Alshammari
|
0e560558dc
|
Merge branch 'master' into Fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/extensions/widget_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard.dart
# pubspec.lock
# pubspec.yaml
|
2 years ago |
|
Fatimah Alshammari
|
4d9405a8db
|
fix
|
2 years ago |
|
Fatimah Alshammari
|
339b343c4c
|
fix calendar
|
2 years ago |
|
Sultan Khan
|
63eef4dea3
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
2f395f29df
|
Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
ff17adfd09
|
Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sikander Saleem
|
daf8849e37
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!20
|
2 years ago |
|
Sikander Saleem
|
9b5147b565
|
merge improvements
|
2 years ago |
|
Sultan Khan
|
06b3726d4a
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Sultan Khan
|
0974861463
|
updated menus
|
3 years ago |
|
Sikander Saleem
|
4817781fe1
|
Merge branch 'development_mirza' into development_sikander
# Conflicts:
# lib/provider/dashboard_provider_model.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# lib/ui/login/verify_last_login_screen.dart
|
3 years ago |
|
Sikander Saleem
|
97645f3e33
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!19
|
3 years ago |
|
Sikander Saleem
|
8ef02fe195
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
807d4b4046
|
item creation added.
|
3 years ago |
|
Sikander Saleem
|
9e0a598245
|
Merge branch 'development_sikander' into 'master'
purchase order & move order, item history & quotation analysis added.
See merge request mirza.shafique/mohem_flutter_app!18
|
3 years ago |
|
Sikander Saleem
|
a431913bb6
|
purchase order & move order, item history & quotation analysis added.
|
3 years ago |
devmirza121
|
b898481cf7
|
Merge branch 'Fatima' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/extensions/widget_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/landing/dashboard.dart
# pubspec.lock
# pubspec.yaml
|
3 years ago |
|
devmirza121
|
a4fb526b68
|
NFC Attendance implement 1.4
|
3 years ago |
|
Sikander Saleem
|
a2c8747d21
|
Merge branch 'development_sikander' into 'master'
wokrlist api's added & improvements
See merge request mirza.shafique/mohem_flutter_app!17
|
3 years ago |
|
Sikander Saleem
|
384aa8d9b4
|
wokrlist api's added & improvements
|
3 years ago |
|
Fatimah Alshammari
|
0cd37ce0fa
|
fix calendar
|
3 years ago |
|
devmirza121
|
eb3ddb3d9e
|
NFC Attendance implement 1.3
|
3 years ago |
|
devmirza121
|
35d683a8ae
|
NFC Attendance implement 1.0
|
3 years ago |
 Mirza Shafique
|
d173da5b07
|
Merge branch 'development_mirza' into 'main'
Development mirza
See merge request mirza.shafique/mohem_flutter_app!16
|
3 years ago |
|
devmirza121
|
68729ddbb9
|
NFC Attendance implement
|
3 years ago |
|
Sultan Khan
|
029f03f2bc
|
Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Sultan Khan
|
da6b935c0b
|
subpages changes
|
3 years ago |
|
devmirza121
|
681fe7fb38
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/ui/login/login_screen.dart
|
3 years ago |
|
devmirza121
|
48a261d674
|
Dashboard API's 1.4
|
3 years ago |
|
Sikander Saleem
|
9215307ac5
|
Merge branch 'development_sikander' into 'master'
work list api's added.
See merge request mirza.shafique/mohem_flutter_app!15
|
3 years ago |
|
Sikander Saleem
|
83b26c1f77
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
4b5ab2cd7f
|
wokrlist api's added & improvements
|
3 years ago |
|
devmirza121
|
a4465a8c23
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/ui/login/login_screen.dart
|
3 years ago |
|
devmirza121
|
c4b7046a90
|
Dashboard API's 1.3
|
3 years ago |
|
Sikander Saleem
|
9248db1f78
|
Merge branch 'development_sikander' into 'master'
login flow added
See merge request mirza.shafique/mohem_flutter_app!14
|
3 years ago |
|
Sikander Saleem
|
7027299a48
|
merge improvements
|
3 years ago |
|
Sikander Saleem
|
e7a67cc58d
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/locale_keys.g.dart
# lib/main.dart
# lib/models/generic_response_model.dart
# lib/ui/login/login_screen.dart
# lib/ui/login/verify_login_screen.dart
# pubspec.yaml
|
3 years ago |
|
Sikander Saleem
|
9c40878c4a
|
locale commited
|
3 years ago |
|
Sikander Saleem
|
6b9ea200ad
|
login flow added.
|
3 years ago |
|
Mirza Shafique
|
66e3427401
|
Merge branch 'development_mirza' into 'master'
Development mirza
See merge request mirza.shafique/mohem_flutter_app!13
|
3 years ago |
|
devmirza121
|
b6670289b1
|
Dashboard API's 1.2
|
3 years ago |
|
devmirza121
|
596ac1a875
|
Merge remote-tracking branch 'origin/development_mirza' into development_mirza
|
3 years ago |
|
devmirza121
|
fb8d6c7b20
|
Dashboard API's 1.1
|
3 years ago |
|
Mirza Shafique
|
be8044878c
|
Merge branch 'development_mirza' into 'main'
Development mirza
See merge request mirza.shafique/mohem_flutter_app!12
|
3 years ago |
|
Mirza Shafique
|
dab7688adb
|
Merge branch 'main' into 'development_mirza'
# Conflicts:
# README.md
|
3 years ago |