Sikander Saleem
|
9314ea0514
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
|
3 years ago |
 Sikander Saleem
|
4e12c1899d
|
Merge branch 'Fatima' into 'master'
Fatima
See merge request mirza.shafique/mohem_flutter_app!58
|
3 years ago |
Fatimah Alshammari
|
89058f9e59
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
3 years ago |
|
Sikander Saleem
|
171735202b
|
leave balance cont3.
|
3 years ago |
|
Sikander Saleem
|
2278a1e98f
|
Merge remote-tracking branch 'origin/development_sikander' into development_sikander
# Conflicts:
# lib/ui/leave_balance/add_leave_balance_screen.dart
|
3 years ago |
|
Sikander Saleem
|
d5c8604f32
|
leave balance cont3.
|
3 years ago |
|
Sikander Saleem
|
a14103b859
|
leave balance cont3.
|
3 years ago |
|
Sikander Saleem
|
8855eb7622
|
leave balance cont2.
|
3 years ago |
|
Sikander Saleem
|
169a9bcc60
|
leave balance cont.
|
3 years ago |
|
Sikander Saleem
|
fbba3a93a8
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
c0ec2260e5
|
mark attendance improvement.
|
3 years ago |
|
Sikander Saleem
|
8ae09ce6b9
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!60
|
3 years ago |
|
Sikander Saleem
|
629de4d2b4
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
d6cc5fcc6c
|
pending transaction.
|
3 years ago |
|
Sikander Saleem
|
2d577dac3f
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!59
|
3 years ago |
|
Sikander Saleem
|
8ddf531f27
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
fc6b923fc4
|
mowadhafhi improvement.
|
3 years ago |
|
Fatimah Alshammari
|
8aa14618d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
|
3 years ago |
|
Sikander Saleem
|
a5e5284d69
|
Merge branch 'development_sikander' into 'master'
mark attendance improvement.
See merge request mirza.shafique/mohem_flutter_app!56
|
3 years ago |
|
Sikander Saleem
|
9b50c2cf31
|
mark attendance improvement.
|
3 years ago |
|
Fatimah Alshammari
|
dc880df35a
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/models/profile_menu.model.dart
|
3 years ago |
|
Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
3 years ago |
|
Sikander Saleem
|
1f88c531b9
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!55
|
3 years ago |
|
Sikander Saleem
|
9ac21395d7
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
8247032a52
|
profile options linked with home page personal information.
|
3 years ago |
|
Sikander Saleem
|
a7a6ea0c4f
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!54
|
3 years ago |
|
Sikander Saleem
|
bd73685bb4
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
20f7d98ce5
|
profile improvements
|
3 years ago |
|
Sikander Saleem
|
5339fe11cb
|
Merge branch 'development_sikander' into 'master'
improvements.
See merge request mirza.shafique/mohem_flutter_app!53
|
3 years ago |
|
Sikander Saleem
|
11bd7a7085
|
improvements.
|
3 years ago |
|
Sikander Saleem
|
6d4aa8051d
|
Merge branch 'development_sikander' into 'master'
services menu structure improvements.
See merge request mirza.shafique/mohem_flutter_app!52
|
3 years ago |
|
Sikander Saleem
|
18084ce29f
|
services menu structure improvements.
|
3 years ago |
|
Sikander Saleem
|
3b19609eae
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!51
|
3 years ago |
|
Sikander Saleem
|
1404715425
|
Vacation rule translation added.
|
3 years ago |
|
Sikander Saleem
|
3750f2c904
|
Vacation rule added complete.
|
3 years ago |
|
Sikander Saleem
|
4edb19c2bb
|
Vacation rule added cont.
|
3 years ago |
|
Sikander Saleem
|
60ed124873
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
065f10d440
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!50
|
3 years ago |
|
Sikander Saleem
|
55f1f792f9
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/models/profile_menu.model.dart
|
3 years ago |
|
Sikander Saleem
|
3fcbd9946a
|
configs for ios.
|
3 years ago |
|
Fatimah Alshammari
|
0820f87877
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
d1cc9bd468
|
fix issue
|
3 years ago |
|
Sikander Saleem
|
fabb847fd8
|
Merge branch 'development_sultan' into 'master'
Development sultan
See merge request mirza.shafique/mohem_flutter_app!49
|
3 years ago |
|
Sikander Saleem
|
ce2d374a74
|
Merge branch 'Fatima' into 'master'
fix translation
See merge request mirza.shafique/mohem_flutter_app!48
|
3 years ago |
Sultan Khan
|
ff4a546e5f
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Sultan Khan
|
1137e585e3
|
update button check
|
3 years ago |
|
Fatimah Alshammari
|
058e287b25
|
fix translation
|
3 years ago |
|
Sikander Saleem
|
d823824abe
|
Merge branch 'Fatima' into 'master'
Fatima
See merge request mirza.shafique/mohem_flutter_app!47
|
3 years ago |
|
Fatimah Alshammari
|
d52cc2d5cd
|
Merge branch 'master' into Fatima
|
3 years ago |