Skip to content
Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 7 additions & 10 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php/$0 [L]
RewriteEngine on

# TODO: specific for main instance of OpenML site. Should do something better
#RewriteCond %{HTTP_HOST} ^api_new.openml.org
#RewriteRule ^(.*)$ http://www.openml.org/api_new/$1 [L,P]
RewriteCond %{HTTP_HOST} ^api_new.openml.org
RewriteRule ^(.*)$ http://www.openml.org/api_new/$1 [L,P]

#RewriteCond %{HTTPS_HOST} ^api_new.openml.org
#RewriteRule ^(.*)$ https://www.openml.org/api_new/$1 [L,P]
RewriteCond %{HTTPS_HOST} ^api_new.openml.org
RewriteRule ^(.*)$ https://www.openml.org/api_new/$1 [L,P]

#RewriteCond $1 !^(questions|SWF|img|docs|downloads|GFX|favicon\.ico|tiny_mce|index\.php|js|css|robots\.txt)
#RewriteRule ^(.*)$ index.php/$1 [L]
RewriteCond $1 !^(questions|SWF|img|docs|downloads|GFX|favicon\.ico|tiny_mce|index\.php|js|css|robots\.txt)
RewriteRule ^(.*)$ index.php/$1 [L]

RedirectMatch 301 ^/?$ http://api.openml.org/home

Expand Down
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
*
* NOTE: If you change these, also change the error_reporting() code below
*/
define('ENVIRONMENT', 'development');
define('ENVIRONMENT', 'production');

/*
*---------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions openml_OS/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
},
"require": {
"php": ">=5.2.4",
"elasticsearch/elasticsearch": "~6.7"
"elasticsearch/elasticsearch": "~6.0"
},
"suggest": {
"paragonie/random_compat": "Provides better randomness in PHP 5.x"
},
"require-dev": {
"mikey179/vfsstream": "1.1.*"
"mikey179/vfsStream": "1.1.*"
}
}
Loading