Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TRUNK-4156 - revised #483

Closed
wants to merge 3,619 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3619 commits
Select commit Hold shift + click to select a range
ad51da7
Fixed ConceptProposalFormControllerTest to extend
Dec 5, 2012
a997e29
TRUNK-2511: When creating a new patient, pre-populate the "Identifier…
rkorytkowski Dec 10, 2012
c22964c
TRUNK-2511: Added missing file
rkorytkowski Dec 10, 2012
ff038ca
TRUNK-2511: Corrected ordering
rkorytkowski Dec 10, 2012
a2bb67e
TRUNK-3820: PersonNameValidator appears to be validating voided perso…
rkorytkowski Dec 10, 2012
a0dd03b
TRUNK-3820: Fixed to avoid NPE
rkorytkowski Dec 10, 2012
14c55c8
Added config for travis-ci
rkorytkowski Dec 10, 2012
0938868
TRUNK-3837: ConceptValidatorChangeSet should not throw an Out of Memo…
rkorytkowski Dec 10, 2012
e9813cd
[maven-release-plugin] prepare release 1.9.2
rkorytkowski Dec 10, 2012
077186b
[maven-release-plugin] prepare for next development iteration
rkorytkowski Dec 10, 2012
385ad53
TRUNK-3014: Applying patch to propagate attrs to obs.groupMembers whe…
acbarbosa Dec 10, 2012
c346de8
@StartModule does not work - TRUNK-3508(cherry picked from commit 332…
dkayiwa Nov 29, 2012
31950f6
New visit save errors should not clear new encounter rows - TRUNK-296…
dkayiwa Dec 13, 2012
9b87551
Adding missing imports for: New visit save errors should not clear new
dkayiwa Dec 14, 2012
75cad5f
Merge branch '1.9.x' of https://github.com/dkayiwa/openmrs-core into …
dkayiwa Dec 14, 2012
445459f
TRUNK-3847(cherry picked from commit 07316639d4c52fd8c2935f6733afdf6f…
lluismf Dec 16, 2012
323f379
TRUNK-3853 and TRUNK-3414
rkorytkowski Dec 24, 2012
56a1f03
DrugOrderValidator should allow a drug order with either a concept or
ishara-p Dec 25, 2012
c2d9590
Back ported, Encounter.patientId should be deprecated as it leads to
surangak Jan 2, 2013
64d3345
Patient search don't work on IE8 - TRUNK-3817
lluismf Jan 2, 2013
b0fdde8
Removed loading of module specific log4j configuration files
k-joseph Jan 5, 2013
5969f92
Backporting TRUNK-3851 - Modules should be able to define message cod…
djazayeri Jan 5, 2013
06bb383
TRUNK-3867: getPatientIdentifiers(String identifier, List<PatientIden…
mogoodrich Jan 8, 2013
2d0db8a
TRUNK-3851 - removing some commented code
djazayeri Jan 9, 2013
b841383
Missing Validators for relationship_type - TRUNK-3814
k-joseph Jan 4, 2013
42d61cc
Applied auto fromat changes
Jan 9, 2013
0ceec9f
backporting TRUNK-3741 - Missing Manage HL7Messages and Purge HL7 Mes…
jlkeiper Jan 9, 2013
0758208
TRUNK-3875: Upgrade xstream to 1.4.3
rkorytkowski Jan 16, 2013
b23ed5f
Attempting to save an alert without text should display a more user f…
k-joseph Jan 18, 2013
3deb9b2
Fix error message for visit attribute types - TRUNK-3230
lluismf Jan 19, 2013
7a456ba
UserContext should store locationId instead of the Location object - …
k-joseph Jan 25, 2013
23911fa
Concept form and ConceptProposal form should use the same list of
Dec 3, 2012
a9040d2
TRUNK-3892: providerDAO.getProvidersByPerson(person, false) returns o…
mogoodrich Feb 1, 2013
fbea3b7
Retired concepts aren't showed as retired when listed as set members -
Feb 5, 2013
0dc9fb0
Erroneous/Incomplete Validators for program - TRUNK-3816
lluismf Feb 6, 2013
62c5efd
Fixed failing tests in ProgramValidatorTest - TRUNK-3816
Feb 6, 2013
bb71cbd
Back porting to 1.9.x: Erasing a short name in the edit concepts page
Feb 13, 2013
0df51b4
TRUNK-3658: FormService.saveFormResouce doesn't effectively replace
lluismf Jan 18, 2013
8d39599
Back porting to 1.9.x: Encounter autocomplete should filter results by
dkayiwa Feb 18, 2013
af1732e
Install from Module Repository feature does not work under maven+jetty -
dkayiwa Feb 18, 2013
b75519d
update all of these types of extension point links to use c:url so that
Feb 18, 2013
840e55c
TRUNK-3846(cherry picked from commit cda25d93e01904bd7d3f2e2bd93ed6c5…
lluismf Dec 16, 2012
c81a72c
Back porting to 1.9.x: Handle complex observations (ED) in ORUR01Handler
Feb 19, 2013
6974111
TRUNK-3449 - settings page using textarea(cherry picked from commit e…
sunbiz Aug 19, 2012
2906c95
Back porting to 1.9.x: Using initialization wizard with db on separate
dkayiwa Feb 19, 2013
131314b
TRUNK-3900: Add ProviderByPersonNameComparator
mogoodrich Feb 21, 2013
8965539
fixed a comment
mogoodrich Feb 21, 2013
096ac4f
TRUNK-3768: drugOrder.drug should not be a mandatory field for drug o…
rowanseymour Feb 26, 2013
cf2d378
Retrieving a ProgramWorkflow by name in a the ModuleActivator started
dkayiwa Dec 7, 2012
85c1255
Merge pull request #223 from rowanseymour/1.9.x
mseaton Feb 27, 2013
8616f05
Bad error message is displayed when reference term validation fails -
DraggonZ Feb 27, 2013
ac3cc3c
Revert "Retired concepts aren't showed as retired when listed as set …
wluyima Feb 27, 2013
a402549
TRUNK-3551 Merging Person and Address. Cherry-picking Tom Ryan's com…
tommunist Aug 24, 2012
2d8af36
TRUNK-3551 Merging Person and Address. Remove references to commons …
mseaton Feb 27, 2013
aaee716
Merge pull request #228 from mseaton/1.9.x
mseaton Feb 28, 2013
945d5c6
When you open the edit page for a scheduled task, if you leave the page
Dec 13, 2012
ae0957e
TRUNK-3190: add unit test for HibernateConceptDAO.getConceptsByAnswer
Sep 5, 2012
73cd1cb
Revert "update all of these types of extension point links to use c:u…
wluyima Mar 1, 2013
4a532a5
Merge pull request #219 from rowanseymour/master
dkayiwa Feb 27, 2013
f535e97
[maven-release-plugin] prepare release 1.9.3
mseaton Mar 2, 2013
4b223f4
[maven-release-plugin] prepare for next development iteration
mseaton Mar 2, 2013
b4f1df4
backport for TRUNK-3170 getProviders(String query, Integer start, Int…
mogoodrich Mar 5, 2013
051b565
reverted unintented deletion of logic omod
mogoodrich Mar 5, 2013
059c287
Manage Providers spinning status wheel turns before entering search
wluyima Oct 19, 2012
63d84ba
Updated obs did not get displayed correctly on dashboard - TRUNK-3609
Mar 7, 2013
8928bd8
Fixed @since value for drug.displayName - TRUNK-3609
wluyima Mar 7, 2013
5410b7e
Fixed compilation error - TRUNK-3609
wluyima Mar 7, 2013
58ac620
When a module activator's started() method throws an exception, the
wluyima Feb 28, 2013
ca2960a
Show the first provider fields automatically without clicking "Add
lluismf Mar 8, 2013
48a68e6
Back porting to 1.9.x: View Logged In Users" visible to all users under
dkayiwa Mar 13, 2013
8b270f2
Response to review comments for: Address layout management is mislabeled
dkayiwa Mar 13, 2013
0fe4760
ORUR01Handler should load patient and concept from the datatabase -
dkayiwa Mar 21, 2013
4991eac
Fixing failing unit test for: ORUR01Handler should load patient and
dkayiwa Mar 21, 2013
a692ed5
ORUR01Handler should load an encounter's location from the database -
dkayiwa Feb 8, 2013
914c3c3
Plugging in dependency on javax.validation api JSR-303 definition.
nutsiepully Mar 24, 2013
323cf78
Merge pull request #258 from nutsiepully/1.9.x
djazayeri Mar 27, 2013
1fa7ebd
formatting
djazayeri Mar 27, 2013
0a53179
TRUNK-3944: Incorrect mockito, hamcrest and junit dependencies
rkorytkowski Mar 26, 2013
b2889f1
TRUNK-3944: Updated junit to 4.11 and fixed tests
rkorytkowski Mar 28, 2013
e37a2e9
TRUNK-3944: Created OpenmrsMatchers
rkorytkowski Mar 28, 2013
8c9ef17
TRUNK-3772: Should be able to define EncounterVisitHandlers as spring…
akolodziejski Feb 19, 2013
df9ab34
TRUNK-3772: Post review fixes
rkorytkowski Mar 28, 2013
2ff133f
TRUNK-3142: Fixed LocaleUtility to work with JDK 7
rkorytkowski Mar 29, 2013
36cff71
TRUNK-1: Testing Bamboo and JIRA integration!
rkorytkowski Mar 29, 2013
8896b02
Testing Bamboo and JIRA integration!
rkorytkowski Mar 29, 2013
09948bb
TRUNK-3949: Do not commit with validation errors
rkorytkowski Apr 2, 2013
7297fb3
TRUNK-3949: Fixing build
rkorytkowski Apr 2, 2013
f033255
TRUNK-3949: Removed flushing from WebTestHelper
rkorytkowski Apr 2, 2013
2427210
TRUNK-3952: Enable openmrs:require tag attribute value expressions
akmad Apr 3, 2013
63d880b
Program state change displays wrong date in IE8 TRUNK-3482
DraggonZ Feb 28, 2013
3e493ca
TRUNK-3904: Concept(Integer) constructer doesn't call this()
rkorytkowski Apr 4, 2013
a397104
TRUNK-3142: Made isValid to be more permissive
rkorytkowski Apr 25, 2013
ab39d63
TRUNK-3944: Downgraded powermock and mockito due to OOM issues
rkorytkowski Apr 26, 2013
4e778ab
TRUNK-3142: Fixed build for Oracle JDK 1.7 which is more permissive a…
rkorytkowski Apr 26, 2013
5e05a37
added transactional annotation back on notifyPrivilegeListener impl
mogoodrich Apr 26, 2013
616f552
temporarily ignoring a test in an attempt to fix broken bamboo build
mogoodrich Apr 26, 2013
7219493
reverting temporary testing changes in previous 2 commits
mogoodrich Apr 26, 2013
c7014f9
TRUNK-3944: Reverting back downgrade
rkorytkowski Apr 26, 2013
ef3aac6
back porting to 1.9.x: Patient Dashboard - Allergy shows as year 3912 in
dkayiwa Apr 30, 2013
22b2d36
Move jackson library to the api sub project - TRUNK-3978
wluyima Apr 30, 2013
e6d1632
Revert "Move jackson library to the api sub project - TRUNK-3978"
wluyima Apr 30, 2013
cc853a9
TRUNK-2651: Ugly stacktrace when trying to upload a non-image file as a
lluismf Jan 6, 2013
98c22c0
TRUNK-3567 Add Observation without Question Concept throws NullPointe…
apien Apr 29, 2013
eb72811
Location hierarchy should not allow loops, description should not be …
Fahv May 1, 2013
0ca7ace
Automated Error Report: NumberFormatException on AddPersonController -
wluyima May 10, 2013
2ed08d1
NonUniqueObjectException: a different object with the same identifier…
dkayiwa Dec 20, 2012
f9804f5
TRUNK-3979: LoggingAdvice should also log which user is performing an…
DraggonZ May 3, 2013
960cb16
Search for patient by identifier fails when identifier is made of on…
Feb 6, 2013
57525b1
Applying auto format change
wluyima May 15, 2013
539307a
reverting TRUNK-3822: Search for patient by identifier fails when ide…
mogoodrich May 15, 2013
14914f9
reverting backport for TRUNK-3822: Search for patient by identifier f…
mogoodrich May 15, 2013
0a9f662
reapplying TRUNK-3822: Search for patient by identifier fails when id…
mogoodrich May 16, 2013
3d2266e
fixes to trunk 3991
surangak May 16, 2013
c5c4876
TRUNK-3992: PersonByNameComparator should be case-insensitive
mogoodrich May 23, 2013
887190c
TRUNK-3811: On successful save of Concept one should go to View Conce…
saramirza14 Mar 13, 2013
80ab000
TRUNK-3811: On successful save of Concept one should go to View Conce…
saramirza14 Mar 28, 2013
a102fc8
TRUNK-3811: On successful save of Concept one should go to View Conce…
saramirza14 Apr 2, 2013
b449b95
TRUNK-3811: On successful save of Concept one should go to View Conce…
saramirza14 Apr 3, 2013
af9a9f3
Revert "TRUNK-3811: On successful save of Concept one should go to Vi…
dkayiwa May 24, 2013
7e5083e
Back porting to 1.9.x: Home Key doesn't work in the search boxes -
dkayiwa May 24, 2013
2785f88
Back porting wyclif's changes for including tests to improve the logic
dkayiwa May 28, 2013
38c528e
Trunk-3839: Support for future dates in jQuery calendar
bhashitha Jan 3, 2013
46bdca0
TRUNK-3829: Code improvements for calendar.js
bhashitha May 23, 2013
9830c6e
TRUNK-3811: On successful save of Concept one should go to View Conce…
saramirza14 Apr 3, 2013
466cd8b
OpenMRS crashes irrecoverably if particular errors occur during modul…
wluyima May 8, 2013
9542a04
Not started required modules error message should not include modules
dkayiwa May 31, 2013
3509391
Retired Visit types should be available for selection on the New Visi…
sindur Dec 12, 2012
8e3096c
Retired Visit types should be available for selection on the New Visi…
wluyima May 31, 2013
f757782
Applying auto format changes
wluyima May 31, 2013
0be5408
TRUNK-3944: Responded to review comments
rkorytkowski Jun 4, 2013
788f17b
TRUNK-3944: Fixed the build (different dataset)
rkorytkowski Jun 4, 2013
171f0cf
TRUNK-3944: Responded to more review comments
rkorytkowski Jun 5, 2013
2475297
Delete other order stuff before deleting current order - TRUNK-3289
wluyima Jun 11, 2013
7aded68
Added @since value to OrderService.purgeOrder(Order, boolean) - TRUNK…
wluyima Jun 11, 2013
7eefb75
Back porting to 1.9.x: Refactor InitializationFilter so that first-time
dkayiwa Jun 11, 2013
20d9055
Concept Map Types in the standard test dataset have the wrong uuids -…
wluyima Jun 11, 2013
e76fc6b
Fixed class comparison in ServiceContext and upated DataExportReportO…
gordonbr Apr 17, 2013
e0a7c2b
TRUNK-3915 Resolved and successfully tested.
ArcTanSusan Jun 16, 2013
4764752
TRUNK-3915 Corrected back port
rkorytkowski Jun 17, 2013
3616c7e
Revert "TRUNK-3915 Corrected back port"
rkorytkowski Jun 17, 2013
9c146da
Revert "TRUNK-3915 Resolved and successfully tested."
rkorytkowski Jun 17, 2013
77b80d9
TRUNK-3884 Relationships missing for encounter_provider table
ArcTanSusan Jun 15, 2013
3eb8123
Applying auto format changes
wluyima Jun 26, 2013
4ceecfb
TRUNK-3970: Fix NPE
LeeBreisacher Jun 27, 2013
140dd61
Back porting to 1.9.x the unit test for: Error when adding a task in
dkayiwa Jun 27, 2013
89cef52
Ignoring failing unit test untill when it gets fixed - TRUNK-3970
dkayiwa Jun 28, 2013
46d1bfb
Cannot find concept by id in concept auto complete - TRUNK-3893(cherr…
dkayiwa Jul 1, 2013
769bf7d
Add SerializableComplexObsHandler interface for form processing methods
Feb 4, 2013
b08423c
Fixing failing unit tests for: Encounter autocomplete should filter
dkayiwa Feb 12, 2013
b8cf6eb
forward porting to 1.9.x: EL functions defined in modules are not
dkayiwa Jul 3, 2013
eddf9f6
TRUNK-3589: Add LocationService method to search for a location by a …
rowanseymour Jul 9, 2013
5ad405c
Removed the previously deprecated getLocations methods from the DAO l…
rowanseymour Jul 9, 2013
4dae610
Merge pull request #357 from rowanseymour/1.9.x
dkayiwa Jul 18, 2013
fbdf978
Back porting to 1.9.x: Changing login password deletes secret answer -
dkayiwa Aug 1, 2013
aa251cd
Corrected handling multiple handlers
rkorytkowski Aug 1, 2013
a436b40
Corrected formatting
rkorytkowski Aug 1, 2013
85be21f
TRUNK-4012: Support H2 Database
Jun 18, 2013
b33b5e2
TRUNK-4012 Improved installation script
rkorytkowski Aug 4, 2013
08b59cc
TRUNK-4012 Exlcluded h2 from war by default
rkorytkowski Aug 5, 2013
32c2dc8
Fixed formatting
rkorytkowski Aug 5, 2013
0b7dd75
TRUNK-3960 Reload log4j.xml configuration without server restart (bac…
rkorytkowski Aug 5, 2013
a423159
TRUNK-4012 Tweaked install-h2 profile
rkorytkowski Aug 5, 2013
f77b88d
TRUNK-4040 Preferred concept name tags converted improperly
rkorytkowski Aug 12, 2013
91c2dc9
TRUNK-4040 Fixed formatting for checksum to be valid
rkorytkowski Aug 12, 2013
b53948c
TRUNK-4042 Application Data directory location read from system property
Aug 8, 2013
8c10360
TRUNK-4043 Rename installation.script system property
Aug 8, 2013
55d85e8
[TRUNK-3652] Natural ordering of Patient State is not consistent with…
k-joseph Aug 15, 2013
fd7cffc
Made change to use pre generated uuid in tests - TRUNK-3652
wluyima Aug 16, 2013
67c9f03
TRUNK-3738 Fixed stopping module
rkorytkowski Aug 20, 2013
e8dca61
TRUNK-4049 Daemon cannot assing System Developer role
rkorytkowski Aug 20, 2013
9037467
Concept.getName(Locale) and Concept.getName(Locale, false) are broken…
akolodziejski Aug 6, 2013
07e19c3
locking mechanism for encounter_type - TRUNK-4033
k-joseph Aug 17, 2013
5a15636
Fixing Problems with ClassCast Exception - TRUNK-4053(cherry picked f…
dkayiwa Sep 2, 2013
b7c6b44
First attempt at fixing failures which do not happen locally, but only
dkayiwa Sep 2, 2013
4d30b5e
Putting on hold the fix for: Problems with ClassCast Exception -
dkayiwa Sep 3, 2013
c022c55
Backporting to 1.9.x: In context-sensitive tests, @SkipBaseSetup
dkayiwa Sep 9, 2013
ee8e44d
Back porting to 1.9.x:
dkayiwa Sep 10, 2013
3f43fd6
Back porting to 1.9.x: Error when adding a task in version 1.9.3 -
dkayiwa Sep 11, 2013
b80eb73
TRUNK-3956 ~ caught the DataIntegrityViolationException error
k-joseph Jul 18, 2013
0f81346
Back porting to 1.9.x: Locally Exposed Database Credentials - TRUNK-3936
dkayiwa Sep 12, 2013
a66acae
Back porting to 1.9.x: webapp's web.xml has two <display-name> tags -
dkayiwa Sep 12, 2013
97f38e2
Back porting to 1.9.x: Forgot password form IP-based lockout locks
dkayiwa Sep 12, 2013
a28af06
Doing some file code formatting
dkayiwa Sep 17, 2013
7388d92
[maven-release-plugin] prepare release 1.9.4
dkayiwa Sep 17, 2013
5d5afb7
[maven-release-plugin] rollback the release of 1.9.4
dkayiwa Sep 17, 2013
90eb610
[maven-release-plugin] prepare release 1.9.4
dkayiwa Sep 17, 2013
01c1162
[maven-release-plugin] rollback the release of 1.9.4
dkayiwa Sep 17, 2013
dbd7c5e
[maven-release-plugin] prepare release 1.9.4
dkayiwa Sep 17, 2013
a14c942
[maven-release-plugin] prepare for next development iteration
dkayiwa Sep 17, 2013
62fcb20
TRUNK-4099 Daemon user cannot save a user
rkorytkowski Sep 23, 2013
57e40e3
Back porting to 1.9.x: The uuid of Unknown location in test data is
dkayiwa Sep 30, 2013
2911563
Module activator started methods not called in correct order for requ…
wluyima Sep 30, 2013
2c3d4ee
TRUNK-4005: Form schema drop-down encounter type menu should not display
lluismf Sep 24, 2013
9837497
TRUNK-4038: Location tree widget truncates location names with an
lluismf Sep 23, 2013
83e84ce
Back porting to 1.9.x: Complete spanish translation of core - TRUNK-4001
dkayiwa Oct 3, 2013
936c85b
SchedulerServiceTest.saveTask_shouldSaveTaskToTheDatabase fails randomly
dkayiwa Oct 3, 2013
b3f0481
TRUNK-2553
LeeBreisacher Jul 10, 2013
b28754c
Back porting to 1.9.x: Possible XXE attacks when parsing downloaded xml
dkayiwa Oct 3, 2013
b5a0eec
Back porting to 1.9.x: Add Indonesian Language Support - TRUNK-3461
dkayiwa Oct 3, 2013
13c1292
[maven-release-plugin] prepare release 1.9.5
dkayiwa Oct 3, 2013
0b21b13
[maven-release-plugin] rollback the release of 1.9.5
dkayiwa Oct 3, 2013
e61a112
[maven-release-plugin] prepare release 1.9.5
dkayiwa Oct 3, 2013
8426929
[maven-release-plugin] prepare for next development iteration
dkayiwa Oct 3, 2013
085fb5b
Follow up to fix bug where a module can't be stopped or reinstalled -…
wluyima Oct 6, 2013
df71737
Fixed formatting
rkorytkowski Oct 18, 2013
ecec564
Updated release plugin
rkorytkowski Oct 18, 2013
2542d46
[maven-release-plugin] prepare release 1.9.6
rkorytkowski Oct 18, 2013
97d2afa
[maven-release-plugin] prepare for next development iteration
rkorytkowski Oct 18, 2013
f3bcad8
Setting version to 1.10.0-SNAPSHOT
djazayeri Oct 24, 2013
617152d
Rename drug_order.prn to drug_order.as_needed and add drug_order.as_n…
wluyima Nov 5, 2013
32aeffc
Add orderNumber property to Order class - TRUNK-4122
wluyima Nov 13, 2013
4f64fff
TRUNK-4105: Add index for code column on the concept_reference_term t…
mogoodrich Nov 18, 2013
dc478de
Added previous_order, action to orders, also converted drug_order.com…
mujir Oct 29, 2013
699d808
Follow up to - TRUNK-4123, TRUNK-4124, TRUNK-4125
wluyima Nov 26, 2013
f2b359c
Back porting module life cycle tests - TRUNK-4134
dkayiwa Nov 28, 2013
a0a573f
Follow up to fix failing changeset - TRUNK-4125
wluyima Dec 3, 2013
bbae7bf
Back porting to 1.10.x: N+1 select issue with Obs and ObsGroup -
dkayiwa Dec 5, 2013
38d51ce
Follow up to split up the changeset that modifies the datatype and up…
wluyima Dec 5, 2013
82a1d30
The API should assign order numbers to new orders - TRUNK-4163
dkayiwa Dec 16, 2013
985baae
Removing commented out lines for: The API should assign order numbers to
dkayiwa Dec 16, 2013
b66bc5c
Changing order number incrementing strategy from memory to database for:
dkayiwa Dec 16, 2013
6360b0e
Cleared all methods from OrderService
wluyima Dec 17, 2013
fc41dd2
[#TRUNK-4130] Add numedRefills and administrationInstructions propert…
k-joseph Dec 10, 2013
d7ec52c
TRUNK-4157 | Adding dosing_instructions property to drug order.
vinkesh Dec 17, 2013
cbdac8d
TRUNK-4157 | adding documentations for getters and setters
vinkesh Dec 17, 2013
62d6759
Fix failing unit tests on 1.10.x - TRUNK-4182
dkayiwa Dec 17, 2013
39be2c3
Revert "Fix failing unit tests on 1.10.x - TRUNK-4182"
wluyima Dec 17, 2013
ac741be
Set the length for administrationInstructions to 65535 in the hbm fil…
wluyima Dec 17, 2013
3d895da
Revert "Cleared all methods from OrderService"
wluyima Dec 18, 2013
ea18c31
Deleted all web files for managing orders
wluyima Dec 18, 2013
588d4fc
Merge remote-tracking branch 'upstream/1.10.x' into 1.10.x
vinkesh Dec 18, 2013
6648fd2
Deleted deprecated methods in OrderService
wluyima Dec 18, 2013
8d6b450
TRUNK-4157 | Removing dosing_instructions columns added in schema-onl…
vinkesh Dec 18, 2013
09385a5
TRUNK-4157 | Adding length fro dosingInstructions property in drugOrd…
vinkesh Dec 18, 2013
37687f2
TRUNK-4157 | Updating copyHelper in drugOrder to take care of dosingI…
vinkesh Dec 18, 2013
f17b460
Merge remote-tracking branch 'upstream/1.10.x' into 1.10.x
vinkesh Dec 18, 2013
cbf33a0
Merge pull request #473 from vinkesh/1.10.x
shruthidipali Dec 18, 2013
b30ddfc
TRUNK-4142 | Adding commentToFulfiller column in orders table.
vinkesh Dec 18, 2013
3de1cb6
Responding to review comments for: The API should assign order numbers
dkayiwa Dec 18, 2013
ced8f8d
formatting DrugOrder
dkayiwa Dec 18, 2013
f7ebacb
Merge pull request #477 from vinkesh/1.10.x
shruthidipali Dec 18, 2013
9fe1fe6
Removed OrderStatus from OrderService
wluyima Dec 18, 2013
eddd540
Removed OrderType
wluyima Dec 18, 2013
13f0fce
Removed un necessary methods from order service or that will get redo…
wluyima Dec 18, 2013
f3b4bb7
Changed usage of the deprecated Expression to Restrictions HibernateO…
wluyima Dec 18, 2013
560b09e
half way though: Add API methods for retrieving active orders -
dkayiwa Dec 18, 2013
571a944
Follow up to add @since annotation and clean up the javadocs for Orde…
wluyima Dec 18, 2013
c40f3d9
TRUNK-4159 Add Orded OrderFrequency to the data model
k-joseph Dec 17, 2013
b426919
Throwing exceptions for invalid next order number global property -
dkayiwa Dec 19, 2013
2bc1af0
TRUNK-4156 - Add care_setting to orders table.
Dec 18, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Unsetting the text attribute on a path to tell git not to attempt any end-of-line conversion upon checkin or checkout.
* -text
74 changes: 74 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# Copied from https://github.com/github/gitignore

### IntelliJ Idea ###
*.iml
*.ipr
*.iws
.idea/

### Maven ###
target/
#############

### Eclipse ###
*.pydevproject
.project
.metadata
bin/**
tmp/**
tmp/**/*
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath
###############

### Java ###
*.class

# Java Package Files #
*.jar
*.war
*.ear
############

### Netbeans ###
nbproject/private/
build/
nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml
################

### Linux ###
.*
!.gitignore
!.gitattributes
!.travis.yml
*~
#############

### OpenMRS Files ###
/webapp/activemq-data
/webapp/src/main/webapp/WEB-INF/tags/module
/webapp/src/main/webapp/WEB-INF/dwr-modules.xml
/webapp/src/main/webapp/WEB-INF/module_messages*
#############
17 changes: 0 additions & 17 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

282 changes: 0 additions & 282 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.jdt.ui.prefs

This file was deleted.

69 changes: 0 additions & 69 deletions .settings/org.maven.ide.eclipse.prefs

This file was deleted.

18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: java
jdk:
- openjdk6
- oraclejdk7
script: mvn clean install --batch-mode
matrix:
allow_failures:
- jdk: oraclejdk7
branches:
only:
- master
notifications:
email: false
irc:
channels:
- "irc.freenode.org#OpenMRS"
template:
- "[%{repository}] [%{commit}] [%{author}] %{message} - %{build_url}"