Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3f223415c990
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 80705c7e839f
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 14, 2013

  1. TRUNK-3910 Resolved. Please review

    @ArcTanSusan
    ArcTanSusan committed Jun 14, 2013
    Copy the full SHA
    7b4dee4 View commit details

Commits on Jun 27, 2013

  1. Added global property for mail.smtp.starttls.enable

    @ArcTanSusan
    ArcTanSusan committed Jun 27, 2013
    Copy the full SHA
    c01b78f View commit details

Commits on Jun 28, 2013

  1. Added a one-line description to new GP that enables TLS encrption to … 

    …be possible
    @ArcTanSusan
    ArcTanSusan committed Jun 28, 2013
    Copy the full SHA
    260514d View commit details

  2. Merge pull request #341 from onceuponatimeforever/TRUNK-3910 

    TRUNK-3910 Add additional global property for mail: mail.smtp.starttls.enable
    @dkayiwa
    dkayiwa committed Jun 28, 2013
    Copy the full SHA
    80705c7 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 api/src/main/java/org/openmrs/util/OpenmrsConstants.java
3 changes: 3 additions & 0 deletions api/src/main/java/org/openmrs/util/OpenmrsConstants.java
View file
Original file line number Diff line number Diff line change
@@ -1076,6 +1076,7 @@ public static final Collection<String> AUTO_ROLES() {

public static final String GP_CASE_SENSITIVE_NAMES_IN_CONCEPT_NAME_TABLE = "concept.caseSensitiveNamesInConceptNameTable";

public static final String GP_MAIL_SMTP_STARTTLS = "mail.smtp.starttls.enable";
/**
* At OpenMRS startup these global properties/default values/descriptions are inserted into the
* database if they do not exist yet.
@@ -1154,6 +1155,8 @@ public static final List<GlobalProperty> CORE_GLOBAL_PROPERTIES() {
props.add(new GlobalProperty(GLOBAL_PROPERTY_LOCATION_WIDGET_TYPE, "default",
"Type of widget to use for location fields"));

props.add(new GlobalProperty(GP_MAIL_SMTP_STARTTLS, "false", "Enable TLS encrption if wanted"));

String standardRegimens = "<list>" + " <regimenSuggestion>" + " <drugComponents>" + " <drugSuggestion>"
+ " <drugId>2</drugId>" + " <dose>1</dose>" + " <units>tab(s)</units>"
+ " <frequency>2/day x 7 days/week</frequency>" + " <instructions></instructions>"