Merge remote-tracking branch 'origin/dev' into dev

whatahardchoice · May 7, 2019 · 7031931 · 7031931
2 parents b100fd1 + 8c3a516
commit 7031931
Show file tree

Hide file tree

Showing 126 changed files with 17,790 additions and 114 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,6 @@ storage/*.key
 .env.php
 .env
 
-wecenter/system/config/database.php
 
 .idea/
 

diff --git a/.idea/Phylab.iml b/.idea/Phylab.iml
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/Phylab/.env.example b/Phylab/.env.example
@@ -1,19 +1,17 @@
-APP_ENV=local
-APP_DEBUG=true
-APP_KEY=SomeRandomString
-
-DB_HOST=localhost
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
-
+APP_ENV=production
+APP_DEBUG=false
+APP_KEY=238GU1dVG7UciXXPWCmkxwgOKE8CoTS3
+DB_HOST=127.0.0.1
+DB_DATABASE=Phylab_db
+DB_USERNAME=
+DB_PASSWORD=
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
-
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+SERVER_PAGE=""
diff --git a/Phylab/composer.lock b/Phylab/composer.lock
diff --git a/Phylab/composer.phar b/Phylab/composer.phar
diff --git a/Phylab/public/css/summernote.css b/Phylab/public/css/summernote.css