diff options
| author | Eole <EoleDev@outlook.fr> | 2016-04-27 16:42:28 +0200 |
|---|---|---|
| committer | Eole <EoleDev@outlook.fr> | 2016-04-27 16:42:28 +0200 |
| commit | 49f416dc5061032e0514ea0cfeceaca37d13e432 (patch) | |
| tree | 1202ac2a6fa860b8929afdc886c94fc50bd0a1de /server/config.inc.php | |
| parent | c7edd70b5e5b0f5159c78ce3d924d4e7f60db816 (diff) | |
| parent | c9202d9113210981ae47df40511645da2ee140df (diff) | |
Merge branch 'develop' into Eole_Graph
Conflicts:
client/index.html
client/js/controllers/home/home.js
client/partials/home/home.html
Diffstat (limited to 'server/config.inc.php')
| -rwxr-xr-x[-rw-r--r--] | server/config.inc.php | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/server/config.inc.php b/server/config.inc.php index 9767c72..71f0bb4 100644..100755 --- a/server/config.inc.php +++ b/server/config.inc.php @@ -1,10 +1,21 @@ <?php - date_default_timezone_set('Europe/Paris'); +/** +* File containing global config options for the API. +* +* @version 1.0 Initialisation of this file +* @since 1.0 Core application's file +* +* @author Eole 'eoledev at outlook . fr' +* +*/ - $config = Array(); - - $config["modules_enabled"] = ""; - $config["urlAuth"] = "http://148.60.11.31:5000/v3"; +date_default_timezone_set('Europe/Paris'); + +$config = Array(); + +$config["modules_enabled"] = ""; +$config["urlAuth"] = "http://148.60.11.31:5000/v3"; +$config["tokenTime"] = 60; //minutes ?> |