Commit Graph

1551 Commits (56c0adaada69c6238892faceccb362075a99836e)
 

Author SHA1 Message Date
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Sikander Saleem bb9d1bfcd5 improvements 3 years ago
Sikander Saleem 80c50e29bf Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
3 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 3 years ago
Sultan Khan b1453b52e3 registration 3 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 3 years ago
Mirza.Shafique 1bea9d39b5 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 3 years ago
Sultan Khan 57864f949d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago
Sultan Khan bd85854fa4 changes 3 years ago
Sultan khan 1f52794185 Merge branch 'sultan-patientapp' into 'development'
package name changed

See merge request Cloud_Solution/diplomatic-quarter!345
3 years ago
Sultan Khan 97d7f9225e package name changed 3 years ago
haroon amjad b5f180f16c Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!344
3 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
3 years ago
haroon amjad cf32d9f0ff Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago
haroon amjad 90db04cee1 Jira Fixes 3 years ago
Sultan khan 69e957929d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!343
3 years ago
Sikander Saleem 2d64426cd4 Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 70614d3555 merge improvements-1. 3 years ago
haroon amjad 5007064105 Jira fixes 3 years ago
Mirza.Shafique 99c6318410 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 2d62822536 Medical Profile Page improvements 3 years ago
Sikander Saleem f482595d6b merge improvements. 3 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique 4ebf5f900b improvements. 3 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique e9e3b079b3 Medical Profile Complete 1.1 3 years ago
hussam al-habibeh 02df6f4d85 PAP-664 3 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
3 years ago
hussam al-habibeh 352fd912de PAP-664 3 years ago
hussam al-habibeh 29249dc9a9 PAP-664 3 years ago
Sultan khan b2349394ff Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!342
3 years ago
Sultan Khan e1750ce24c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan e5fb16ad69 langauge issue 3 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 3 years ago
Sikander Saleem 6575adda42 merge changes-5 3 years ago
Sikander Saleem f6ae7ed770 merge changes-4 3 years ago
Sikander Saleem 889ae24f07 merge changes-3 3 years ago
Sikander Saleem c07a8f54c7 merge changes-2 3 years ago
Sikander Saleem 14561d0ac6 merge changes-1 3 years ago
Sultan khan 08f7736030 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!341
3 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan khan 1898c12ec3 Merge branch 'fix_merge_issues' into 'development'
fix translate issues

See merge request Cloud_Solution/diplomatic-quarter!340
3 years ago
Sultan Khan 7c398ba40d bug fix 3 years ago
Sikander Saleem a5d40f090a improvements-test 3 years ago
hussam al-habibeh 146fc5d2b2 PAP-777 3 years ago
Mirza.Shafique 2665e4cd0c Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 3 years ago
Sikander Saleem 2cb59a286f Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
haroon amjad 037a887e5c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago