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
base: 6648fd24baa9
Choose a base ref
...
head repository: openmrs/openmrs-core
compare: cbf33a00068d
Choose a head ref
  • 8 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 17, 2013

  1. TRUNK-4157 | Adding dosing_instructions property to drug order.

    @vinkesh
    vinkesh committed Dec 17, 2013
    Copy the full SHA
    d7ec52c View commit details
    Browse the repository at this point in the history

  2. TRUNK-4157 | adding documentations for getters and setters

    @vinkesh
    vinkesh committed Dec 17, 2013
    Copy the full SHA
    cbdac8d View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2013

  1. Merge remote-tracking branch 'upstream/1.10.x' into 1.10.x 

    Conflicts:
	api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
    @vinkesh
    vinkesh committed Dec 18, 2013
    Copy the full SHA
    588d4fc View commit details
    Browse the repository at this point in the history

  2. TRUNK-4157 | Removing dosing_instructions columns added in schema-onl… 

    …y liquibase file
    @vinkesh
    vinkesh committed Dec 18, 2013
    Copy the full SHA
    8d6b450 View commit details
    Browse the repository at this point in the history

  3. TRUNK-4157 | Adding length fro dosingInstructions property in drugOrd… 

    …er hibernate mapping
    @vinkesh
    vinkesh committed Dec 18, 2013
    Copy the full SHA
    09385a5 View commit details
    Browse the repository at this point in the history

  4. TRUNK-4157 | Updating copyHelper in drugOrder to take care of dosingI… 

    …nstructions property
    @vinkesh
    vinkesh committed Dec 18, 2013
    Copy the full SHA
    37687f2 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/1.10.x' into 1.10.x

    @vinkesh
    vinkesh committed Dec 18, 2013
    4
    Copy the full SHA
    f17b460 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #473 from vinkesh/1.10.x 

    TRUNK-4157 | Adding dosing_instructions property to drug order.
    @shruthidipali
    shruthidipali committed Dec 18, 2013
    Copy the full SHA
    cbf33a0 View commit details
    Browse the repository at this point in the history