Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
/log/*
/local/log*
/local/UILog*
/logs

# OS generated files #
######################
Expand Down Expand Up @@ -57,3 +58,10 @@ Thumbs.db

# Wine prefix folder if using Wine to run the server on Linux with bin/wine-server
/wine/

# local folder exclusion
/local

# blis configuration exclusion
/blis_configuration_*

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"monolog/monolog": "^1.25",
"monolog/monolog": "^2.11",
"phpoffice/phpexcel": "= 1.8.2"
}
}
66 changes: 41 additions & 25 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions db/structure/blis_127.sql
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,8 @@ CREATE TABLE IF NOT EXISTS `patient` (
`partial_dob` varchar(45) DEFAULT NULL,
`surr_id` varchar(45) DEFAULT NULL,
`hash_value` varchar(100) DEFAULT NULL,
PRIMARY KEY (`patient_id`),
KEY `created_by` (`created_by`)
KEY `created_by` (`created_by`),
PRIMARY KEY (`patient_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand Down
Loading