From 7930aef2e18cf5da4f69df61a4dcaf4f7fb66696 Mon Sep 17 00:00:00 2001
From: Amadeous <julien.biefer@heig-vd.ch>
Date: Tue, 4 Apr 2017 16:56:39 +0200
Subject: [PATCH 1/4] Add default admin user

---
 config.default.php  | 2 +-
 scripts/ulogger.sql | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config.default.php b/config.default.php
index 792ad5e..c3ee687 100755
--- a/config.default.php
+++ b/config.default.php
@@ -63,7 +63,7 @@ $public_tracks = 0;
 
 // admin user who has access to all users locations
 // none if empty
-$admin_user = "";
+$admin_user = "admin";
 
 // Default interval in seconds for live auto reload
 $interval = 10;
diff --git a/scripts/ulogger.sql b/scripts/ulogger.sql
index d3875a5..38883c1 100755
--- a/scripts/ulogger.sql
+++ b/scripts/ulogger.sql
@@ -92,4 +92,11 @@ ALTER TABLE `tracks`
 -- AUTO_INCREMENT for table `users`
 --
 ALTER TABLE `users`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
\ No newline at end of file
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- Content of table `users`
+--
+
+INSERT INTO `users` (`id`, `login`, `password`) VALUES
+(1, 'admin', '$2y$10$7OvZrKgonVZM9lkzrTbiou.CVhO3HjPk5y0W9L68fVwPs/osBRIMq'),
\ No newline at end of file

From e0c68a5c2224504abd1808afbf7974965183d905 Mon Sep 17 00:00:00 2001
From: Amadeous <julien.biefer@heig-vd.ch>
Date: Tue, 4 Apr 2017 17:03:58 +0200
Subject: [PATCH 2/4] Insert install process in README.md

---
 README.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 50e670e..07d5903 100755
--- a/README.md
+++ b/README.md
@@ -24,13 +24,21 @@ Together with a dedicated [μlogger mobile client](https://github.com/bfabiszews
 - user preferences stored in cookies
 - simple admin menu
 
+## Install
+1. Download the zip or clone the repository on your computer
+2. Move it to your web server directory
+3. Go to http://your_local_server/ulogger-server/
+4. Connect with username admin and password admin
+5. Change admin password (not available for now)
+6. Create other user if needed
+
 ## Todo
 - install script
 - custom icons
-- improve admin menu
+- improve admin menu (password or username change)
 - track editing
 - track display filters (accurracy, provider)
 
 ## License
 - GPL
-- μlogger is a fork of phpTrackme - tracks viewer I wrote for TrackMe app
\ No newline at end of file
+- μlogger is a fork of phpTrackme - tracks viewer I wrote for TrackMe app

From b345119674097f6fd86645ccd0f827eb3f3224a5 Mon Sep 17 00:00:00 2001
From: Amadeous <julien.biefer@heig-vd.ch>
Date: Sun, 9 Apr 2017 13:05:29 +0200
Subject: [PATCH 3/4] Add database install instructions to README

---
 README.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 07d5903..8af8c4d 100755
--- a/README.md
+++ b/README.md
@@ -27,10 +27,13 @@ Together with a dedicated [μlogger mobile client](https://github.com/bfabiszews
 ## Install
 1. Download the zip or clone the repository on your computer
 2. Move it to your web server directory
-3. Go to http://your_local_server/ulogger-server/
-4. Connect with username admin and password admin
-5. Change admin password (not available for now)
-6. Create other user if needed
+3. Import the script/ulogger.sql file into a mysql database (you can use a msql interface such as [PhpMyAdmin](https://www.phpmyadmin.net).)
+4. Create a copy of config.default.php and rename it config.php. Add database credentials in it.
+5. Make sure your web server is running (Apache, Php and Mysql)
+6. Go to http://your_local_server/ulogger-server/)
+7. Connect with admin/admin
+8. Change admin password (not available for now)
+9. Create other user if needed
 
 ## Todo
 - install script

From 403e423c81422725c6f7d6897f65d920f08599d1 Mon Sep 17 00:00:00 2001
From: Amadeous <julien.biefer@heig-vd.ch>
Date: Sun, 9 Apr 2017 13:29:46 +0200
Subject: [PATCH 4/4] Remove TODO improve admin menu and add availability for
 changing password

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8af8c4d..1ef2be6 100755
--- a/README.md
+++ b/README.md
@@ -32,13 +32,12 @@ Together with a dedicated [μlogger mobile client](https://github.com/bfabiszews
 5. Make sure your web server is running (Apache, Php and Mysql)
 6. Go to http://your_local_server/ulogger-server/)
 7. Connect with admin/admin
-8. Change admin password (not available for now)
+8. Change admin password
 9. Create other user if needed
 
 ## Todo
 - install script
 - custom icons
-- improve admin menu (password or username change)
 - track editing
 - track display filters (accurracy, provider)