Commit Graph

51 Commits (ecfa1756d3cce5ee8eedaba059703d415263e20a)
 

Author SHA1 Message Date
Sultan Khan ecfa1756d3 login changes 4 years ago
Sultan Khan 0bc529f420 login changes 4 years ago
Sultan Khan 9d0a2e1e43 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 8d0834ff3e login inprogress 4 years ago
Sultan Khan 41b438fd74 login page changes 4 years ago
Mohammad Aljammal 20ab170e7a Merge branch 'medical_profile' into 'master'
Medical profile

See merge request Cloud_Solution/diplomatic-quarter!9
4 years ago
Mohammad Aljammal ec09721869 fix merge issues 4 years ago
Mohammad Aljammal 5874f4ba21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljammal 3e1311e8b8 Merge branch 'sultan' into 'master'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!7
4 years ago
Mohammad Aljammal 5a38479254 fix merge issues 4 years ago
Mohammad Aljammal 1ac420ef7c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 3a15c16883 login changes 4 years ago
Mohammad Aljammal 43349542da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile 4 years ago
Mohammad Aljammal 8de50bfe74 medical - my doctor and prescription services and pages 4 years ago
Mohammad Aljammal 392a5a57ed Merge branch 'SearchMedicineAndReturnMedicineList' into 'master'
Design and return Pharmacy List

See merge request Cloud_Solution/diplomatic-quarter!8
4 years ago
hussam al-habibeh e92cb2e1ac Design and return Pharmacy List 4 years ago
Sultan Khan 31fe444150 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan b0989d6ca0 login pages changes 4 years ago
Sultan Khan 76aeeffad7 login page changes 4 years ago
Mohammad Aljammal 93bfcbc20f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal ae2f9a077d Merge branch 'SearchMedicineAndReturnMedicineList' into 'master'
design for search medicine and return medicine list

See merge request Cloud_Solution/diplomatic-quarter!6
4 years ago
Mohammad Aljammal e147787be9 merge search and return medicine 4 years ago
Mohammad Aljammal 01b230accf Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/main.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
4 years ago
Sultan Khan 5b411c3120 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan c018597d90 confrim login page added 4 years ago
Mohammad Aljammal bbb6dcd913 Merge branch 'sultan_merge' into 'master'
Sultan merge

See merge request Cloud_Solution/diplomatic-quarter!5
4 years ago
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 b2b6ce1f76 Merge branch 'merge_haron' into 'master'
Merge haroon

See merge request Cloud_Solution/diplomatic-quarter!4
4 years ago
Mohammad Aljammal b2875fbce3 merge haroun 4 years ago
hussam al-habibeh 31d2816e64 design for search medicine and return medicine list 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
Mohammad Aljammal fc749de77e create doctor card and medical page 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
Sultan Khan 8dd38a8b3c no message 4 years ago
haroon amjad ca7b4534a8 Search By Clinic & Search By Doctor Name implemented 4 years ago
Haroon Amjad 9eb9f01dbd Get Clinic List API Implemented, Architecture for HTTP requests implemented 4 years ago
Mohammad Aljammal d02151bea8 fix import in main 4 years ago
haroon amjad a0173c5b4d Appointment Details page, ToDo List Page implemented 4 years ago
Mohammad Aljammal d13e7186a6 Merge branch 'mvvm_and_di' into 'master'
add MVVM and di Mohammad Aljammal and Elham Rababah

See merge request Cloud_Solution/diplomatic-quarter!1
4 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 4 years ago
haroon amjad 9842c3a0b1 Translation updates 4 years ago
haroon amjad 1554a6bdf5 Book Appointment Flow added 4 years ago
Sultan Khan d897463b42 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter 4 years ago
Sultan Khan 4a0cc17069 login module started 4 years ago
Mohammad Aljammal 198a1854a9 add documentation Mohammad Aljammal and Elham Rababah 4 years ago
Mohammad Aljammal 6d6c71655a add new widget by Elham Rababah and Mohammad Aljammal 4 years ago
Mohammad Aljammal 19676549e1 add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file 4 years ago