Merge branch 'master' of github.com:vgmoose/hbas

vgmoose · Nov 13, 2016 · abf3a23 · abf3a23
2 parents 586087b + 4ad4040
commit abf3a23
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 136 deletions.
diff --git a/hbas.elf b/hbas.elf
diff --git a/hbas_dbg.elf b/hbas_dbg.elf
diff --git a/src/menu/MainWindow.cpp b/src/menu/MainWindow.cpp
@@ -73,7 +73,7 @@ MainWindow::MainWindow(int w, int h)
 void asyncRefreshHomebrewAppIcons(CThread* thread, void* args)
 {
     log_printf("NEW THREAD START: Icon async refresh");
-    homebrewWindow->populateIconCache();
+//    homebrewWindow->populateIconCache();
     log_printf("EXISTING THREAD END: Icon async refresh");
 }
 

diff --git a/web/gen.py b/web/gen.py
diff --git a/web/v1/404.html b/web/v1/404.html
diff --git a/web/v1/hbas.png b/web/v1/hbas.png
diff --git a/web/v1/missing.png b/web/v1/missing.png
diff --git a/webv1/.htaccess b/webv1/.htaccess
@@ -0,0 +1,8 @@
+Options +ExecCGI
+AddHandler cgi-script .py
+ErrorDocument 404 404
+<FilesMatch "\.(ttf|otf|eot|woff)$">
+  <IfModule mod_headers.c>
+    Header set Access-Control-Allow-Origin "*"
+  </IfModule>
+</FilesMatch>
diff --git a/web/v1/css/font-awesome.min.css → webv1/css/font-awesome.min.css b/web/v1/css/font-awesome.min.css → webv1/css/font-awesome.min.css
diff --git a/web/v1/css/tooltipster.bundle.min.css → webv1/css/tooltipster.bundle.min.css b/web/v1/css/tooltipster.bundle.min.css → webv1/css/tooltipster.bundle.min.css
diff --git a/web/v1/css/wiiubru.css → webv1/css/wiiubru.css b/web/v1/css/wiiubru.css → webv1/css/wiiubru.css
diff --git a/web/v1/gen.py → webv1/gen.py b/web/v1/gen.py → webv1/gen.py
diff --git a/web/v1/js/jquery-1.12.4.min.js → webv1/js/jquery-1.12.4.min.js b/web/v1/js/jquery-1.12.4.min.js → webv1/js/jquery-1.12.4.min.js
diff --git a/web/v1/js/sorttable.js → webv1/js/sorttable.js b/web/v1/js/sorttable.js → webv1/js/sorttable.js
diff --git a/web/v1/js/tooltipster.bundle.min.js → webv1/js/tooltipster.bundle.min.js b/web/v1/js/tooltipster.bundle.min.js → webv1/js/tooltipster.bundle.min.js
diff --git a/web/v1/refreshrepo.php → webv1/refreshrepo.php b/web/v1/refreshrepo.php → webv1/refreshrepo.php
diff --git a/web/v1/store-repo-conf.json → webv1/store-repo-conf.json b/web/v1/store-repo-conf.json → webv1/store-repo-conf.json
diff --git a/web/v1/store-repo-info.json → webv1/store-repo-info.json b/web/v1/store-repo-info.json → webv1/store-repo-info.json