Commit Graph

8 Commits (5b411c3120e32ea5d340fb059c472fdfbff48c61)

Author SHA1 Message Date
Mohammad Aljammal 4bc68c6afd merge sultan 4 years ago
Mohammad Aljammal 2d5b725818 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_merge
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal b2875fbce3 merge haroun 4 years ago
Mohammad Aljammal 3a68e0e092 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_haron
 Conflicts:
	lib/config/config.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Sultan Khan 5a08cb720c login changes 4 years ago
Sultan Khan f8d8e1c685 new pages added 4 years ago
Sultan Khan 192b21a7e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
# Conflicts:
#	lib/main.dart
#	lib/widgets/input/date_picker/button_actions.dart
#	lib/widgets/input/text_field.dart
#	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 4 years ago