mxious · matteing · May 10, 2015 · May 9, 2015 · May 9, 2015 · May 9, 2015
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+src/*/avatars
+src/*/avatars/*
+src/app/config/database.php
+src/src/app/config/config.php
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Mxious
-[![Code Climate](https://codeclimate.com/github/Mxious/Mxious/badges/gpa.svg)](https://codeclimate.com/github/Mxious/Mxious)
+[![Build Status](https://travis-ci.org/Mxious/Mxious.svg)](https://travis-ci.org/Mxious/Mxious) [![Code Climate](https://codeclimate.com/github/Mxious/Mxious/badges/gpa.svg)](https://codeclimate.com/github/Mxious/Mxious) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Mxious/Mxious?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Source code for the Mxious social music application.
 

diff --git a/VERSION.json b/VERSION.json
@@ -0,0 +1,5 @@
+{  
+   "version":"1.0.1",
+   "type": "development",
+   "cycle": "development"
+}
diff --git a/install/Installer.sh b/install/Installer.sh
diff --git a/src/.gitignore b/src/.gitignore
diff --git a/src/application/.htaccess → src/app/.htaccess b/src/application/.htaccess → src/app/.htaccess
diff --git a/src/application/cache/.htaccess → src/app/cache/.htaccess b/src/application/cache/.htaccess → src/app/cache/.htaccess
diff --git a/src/application/cache/index.html → src/app/cache/index.html b/src/application/cache/index.html → src/app/cache/index.html
diff --git a/src/application/config/autoload.php → src/app/config/autoload.php b/src/application/config/autoload.php → src/app/config/autoload.php
diff --git a/src/application/config/config.php.sm → src/app/config/config.php.sm b/src/application/config/config.php.sm → src/app/config/config.php.sm
diff --git a/src/application/config/constants.php → src/app/config/constants.php b/src/application/config/constants.php → src/app/config/constants.php
@@ -10,7 +10,7 @@
 */
 
 // Page to go to when user first registers
-define('REGISTER_REDIRECT', 'dashboard');
+define('REGISTER_REDIRECT', '/');
 
 // Email address for sys emails
 define('SYS_EMAIL_FROM', 'noreply@alphasquare.us');

diff --git a/src/application/config/database.php.sm → src/app/config/database.php.sm b/src/application/config/database.php.sm → src/app/config/database.php.sm
diff --git a/src/application/config/doctypes.php → src/app/config/doctypes.php b/src/application/config/doctypes.php → src/app/config/doctypes.php
diff --git a/src/application/config/foreign_chars.php → src/app/config/foreign_chars.php b/src/application/config/foreign_chars.php → src/app/config/foreign_chars.php
diff --git a/src/application/config/hooks.php → src/app/config/hooks.php b/src/application/config/hooks.php → src/app/config/hooks.php
diff --git a/src/application/config/hybridauthlib.php → src/app/config/hybridauthlib.php b/src/application/config/hybridauthlib.php → src/app/config/hybridauthlib.php
diff --git a/src/application/config/index.html → src/app/config/index.html b/src/application/config/index.html → src/app/config/index.html
diff --git a/src/application/config/migration.php → src/app/config/migration.php b/src/application/config/migration.php → src/app/config/migration.php
diff --git a/src/application/config/mimes.php → src/app/config/mimes.php b/src/application/config/mimes.php → src/app/config/mimes.php
diff --git a/src/application/config/profiler.php → src/app/config/profiler.php b/src/application/config/profiler.php → src/app/config/profiler.php
diff --git a/src/application/config/recaptcha.php → src/app/config/recaptcha.php b/src/application/config/recaptcha.php → src/app/config/recaptcha.php
diff --git a/src/application/config/routes.php → src/app/config/routes.php b/src/application/config/routes.php → src/app/config/routes.php
diff --git a/src/application/config/smileys.php → src/app/config/smileys.php b/src/application/config/smileys.php → src/app/config/smileys.php
diff --git a/src/application/config/user_agents.php → src/app/config/user_agents.php b/src/application/config/user_agents.php → src/app/config/user_agents.php
diff --git a/src/application/controllers/account.php → src/app/controllers/account.php b/src/application/controllers/account.php → src/app/controllers/account.php
diff --git a/src/application/controllers/alerts.php → src/app/controllers/alerts.php b/src/application/controllers/alerts.php → src/app/controllers/alerts.php
diff --git a/src/application/controllers/comments.php → src/app/controllers/comments.php b/src/application/controllers/comments.php → src/app/controllers/comments.php
diff --git a/src/application/controllers/dashboard.php → src/app/controllers/dashboard.php b/src/application/controllers/dashboard.php → src/app/controllers/dashboard.php
diff --git a/src/application/controllers/index.html → src/app/controllers/index.html b/src/application/controllers/index.html → src/app/controllers/index.html
diff --git a/src/app/controllers/main.php b/src/app/controllers/main.php
@@ -0,0 +1,76 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Main Controller
+ * The index method on this is the homepage.
+ * This is also a dynamic homepage that switches
+ * to explore on loggedout or dashboard
+ * on loggedin.
+ *
+ * @package Controllers
+ */
+
+class Main extends CI_Controller {
+
+	public $loggedin;
+
+	function __construct() {
+		parent::__construct();
+		$this->load->model('post_model');
+		$this->load->model('people_model');
+		$this->load->model('comments_model');
+		$this->loggedin = $this->php_session->get('loggedin');
+	}
+
+	public function index() {
+
+		switch ($this->loggedin) {
+
+			case true:
+				// user is not logged in, explore page instead of dashboard.
+				$data['title'] = 'Explore';
+				// load some stylesheets
+				$data['stylesheets'] = array(
+					'assets/css/home.css',
+					'http://fonts.googleapis.com/css?family=Lato:700'
+				);
+
+				$posts = $this->post_model->get_posts('explore', 0);
+				// Turn $posts array into HTML
+				$data['posts'] = $this->post_model->post_html($posts, true);
+				// tell the JS that there is a feed here
+				$data['feed'] = true;
+				// set a container for the feed
+				$data['feed_container'] = '#feed';
+				$this->template->load('home', $data);
+
+				break;
+
+			case false:
+
+				// user is not logged in, explore page instead of dashboard.
+				$data['title'] = 'Explore';
+				// load some stylesheets
+				$data['stylesheets'] = array(
+					'assets/css/home.css',
+					'http://fonts.googleapis.com/css?family=Lato:700'
+				);
+
+				$posts = $this->post_model->get_posts('explore', 0);
+				// Turn $posts array into HTML
+				$data['posts'] = $this->post_model->post_html($posts, true);
+				// tell the JS that there is a feed here
+				$data['feed'] = true;
+				// set a container for the feed
+				$data['feed_container'] = '#feed';
+				$this->template->load('home', $data);
+				break;
+
+		}
+
+	}
+
+}
+
+/* End of file main.php */
+/* Location: ./application/controllers/main.php */
diff --git a/src/application/controllers/page.php → src/app/controllers/page.php b/src/application/controllers/page.php → src/app/controllers/page.php
diff --git a/src/application/controllers/people.php → src/app/controllers/people.php b/src/application/controllers/people.php → src/app/controllers/people.php
diff --git a/src/application/controllers/post.php → src/app/controllers/post.php b/src/application/controllers/post.php → src/app/controllers/post.php
diff --git a/src/application/controllers/search.php → src/app/controllers/search.php b/src/application/controllers/search.php → src/app/controllers/search.php
diff --git a/src/application/controllers/settings.php → src/app/controllers/settings.php b/src/application/controllers/settings.php → src/app/controllers/settings.php
diff --git a/src/application/core/index.html → src/app/core/index.html b/src/application/core/index.html → src/app/core/index.html
diff --git a/src/application/errors/error_404.php → src/app/errors/error_404.php b/src/application/errors/error_404.php → src/app/errors/error_404.php
diff --git a/src/application/errors/error_db.php → src/app/errors/error_db.php b/src/application/errors/error_db.php → src/app/errors/error_db.php
diff --git a/src/application/errors/error_general.php → src/app/errors/error_general.php b/src/application/errors/error_general.php → src/app/errors/error_general.php
diff --git a/src/application/errors/error_php.php → src/app/errors/error_php.php b/src/application/errors/error_php.php → src/app/errors/error_php.php
diff --git a/src/application/errors/index.html → src/app/errors/index.html b/src/application/errors/index.html → src/app/errors/index.html
diff --git a/src/application/helpers/MY_url_helper.php → src/app/helpers/MY_url_helper.php b/src/application/helpers/MY_url_helper.php → src/app/helpers/MY_url_helper.php
diff --git a/src/application/helpers/avatar_helper.php → src/app/helpers/avatar_helper.php b/src/application/helpers/avatar_helper.php → src/app/helpers/avatar_helper.php
diff --git a/src/application/helpers/bbcode_helper.php → src/app/helpers/bbcode_helper.php b/src/application/helpers/bbcode_helper.php → src/app/helpers/bbcode_helper.php
diff --git a/...pplication/helpers/format_post_helper.php → src/app/helpers/format_post_helper.php b/...pplication/helpers/format_post_helper.php → src/app/helpers/format_post_helper.php
diff --git a/src/application/helpers/index.html → src/app/helpers/index.html b/src/application/helpers/index.html → src/app/helpers/index.html
diff --git a/src/application/helpers/json_helper.php → src/app/helpers/json_helper.php b/src/application/helpers/json_helper.php → src/app/helpers/json_helper.php
diff --git a/src/application/helpers/msg_helper.php → src/app/helpers/msg_helper.php b/src/application/helpers/msg_helper.php → src/app/helpers/msg_helper.php
diff --git a/...pplication/helpers/php_session_helper.php → src/app/helpers/php_session_helper.php b/...pplication/helpers/php_session_helper.php → src/app/helpers/php_session_helper.php
diff --git a/src/application/helpers/validate_helper.php → src/app/helpers/validate_helper.php b/src/application/helpers/validate_helper.php → src/app/helpers/validate_helper.php
diff --git a/src/application/hooks/index.html → src/app/hooks/index.html b/src/application/hooks/index.html → src/app/hooks/index.html
diff --git a/src/application/hooks/user_hook.php → src/app/hooks/user_hook.php b/src/application/hooks/user_hook.php → src/app/hooks/user_hook.php
diff --git a/src/application/index.html → src/app/index.html b/src/application/index.html → src/app/index.html
diff --git a/src/application/language/english/index.html → src/app/language/english/index.html b/src/application/language/english/index.html → src/app/language/english/index.html
diff --git a/src/application/language/index.html → src/app/language/index.html b/src/application/language/index.html → src/app/language/index.html
diff --git a/src/application/libraries/HybridAuthLib.php → src/app/libraries/HybridAuthLib.php b/src/application/libraries/HybridAuthLib.php → src/app/libraries/HybridAuthLib.php
diff --git a/...lication/libraries/MY_form_validation.php → src/app/libraries/MY_form_validation.php b/...lication/libraries/MY_form_validation.php → src/app/libraries/MY_form_validation.php
diff --git a/src/application/libraries/Markdown.php → src/app/libraries/Markdown.php b/src/application/libraries/Markdown.php → src/app/libraries/Markdown.php
diff --git a/src/application/libraries/Recaptcha.php → src/app/libraries/Recaptcha.php b/src/application/libraries/Recaptcha.php → src/app/libraries/Recaptcha.php
diff --git a/src/application/libraries/alert.php → src/app/libraries/alert.php b/src/application/libraries/alert.php → src/app/libraries/alert.php
diff --git a/src/application/libraries/custom_email.php → src/app/libraries/custom_email.php b/src/application/libraries/custom_email.php → src/app/libraries/custom_email.php
diff --git a/src/application/libraries/events.php → src/app/libraries/events.php b/src/application/libraries/events.php → src/app/libraries/events.php
diff --git a/src/application/libraries/extras.php → src/app/libraries/extras.php b/src/application/libraries/extras.php → src/app/libraries/extras.php
diff --git a/src/application/libraries/index.html → src/app/libraries/index.html b/src/application/libraries/index.html → src/app/libraries/index.html
diff --git a/src/application/libraries/mentions.php → src/app/libraries/mentions.php b/src/application/libraries/mentions.php → src/app/libraries/mentions.php
diff --git a/src/application/libraries/php_session.php → src/app/libraries/php_session.php b/src/application/libraries/php_session.php → src/app/libraries/php_session.php
diff --git a/src/application/libraries/points.php → src/app/libraries/points.php b/src/application/libraries/points.php → src/app/libraries/points.php
diff --git a/src/application/libraries/template.php → src/app/libraries/template.php b/src/application/libraries/template.php → src/app/libraries/template.php
diff --git a/src/application/logs/hybridauth.log → src/app/logs/hybridauth.log b/src/application/logs/hybridauth.log → src/app/logs/hybridauth.log
diff --git a/src/application/logs/index.html → src/app/logs/index.html b/src/application/logs/index.html → src/app/logs/index.html
diff --git a/src/application/models/account_model.php → src/app/models/account_model.php b/src/application/models/account_model.php → src/app/models/account_model.php
diff --git a/src/application/models/alerts_model.php → src/app/models/alerts_model.php b/src/application/models/alerts_model.php → src/app/models/alerts_model.php
diff --git a/src/application/models/comments_model.php → src/app/models/comments_model.php b/src/application/models/comments_model.php → src/app/models/comments_model.php
diff --git a/src/application/models/employee_model.php → src/app/models/employee_model.php b/src/application/models/employee_model.php → src/app/models/employee_model.php
diff --git a/src/application/models/index.html → src/app/models/index.html b/src/application/models/index.html → src/app/models/index.html
diff --git a/src/application/models/oauth_model.php → src/app/models/oauth_model.php b/src/application/models/oauth_model.php → src/app/models/oauth_model.php
diff --git a/src/application/models/people_model.php → src/app/models/people_model.php b/src/application/models/people_model.php → src/app/models/people_model.php
diff --git a/src/application/models/post_model.php → src/app/models/post_model.php b/src/application/models/post_model.php → src/app/models/post_model.php
diff --git a/src/application/models/search_model.php → src/app/models/search_model.php b/src/application/models/search_model.php → src/app/models/search_model.php
diff --git a/...on/third_party/hybridauth/Hybrid/Auth.php → ...pp/third_party/hybridauth/Hybrid/Auth.php b/...on/third_party/hybridauth/Hybrid/Auth.php → ...pp/third_party/hybridauth/Hybrid/Auth.php
diff --git a/...hird_party/hybridauth/Hybrid/Endpoint.php → ...hird_party/hybridauth/Hybrid/Endpoint.php b/...hird_party/hybridauth/Hybrid/Endpoint.php → ...hird_party/hybridauth/Hybrid/Endpoint.php
diff --git a/...n/third_party/hybridauth/Hybrid/Error.php → ...p/third_party/hybridauth/Hybrid/Error.php b/...n/third_party/hybridauth/Hybrid/Error.php → ...p/third_party/hybridauth/Hybrid/Error.php
diff --git a/.../third_party/hybridauth/Hybrid/Logger.php → .../third_party/hybridauth/Hybrid/Logger.php b/.../third_party/hybridauth/Hybrid/Logger.php → .../third_party/hybridauth/Hybrid/Logger.php
diff --git a/...ty/hybridauth/Hybrid/Provider_Adapter.php → ...ty/hybridauth/Hybrid/Provider_Adapter.php b/...ty/hybridauth/Hybrid/Provider_Adapter.php → ...ty/hybridauth/Hybrid/Provider_Adapter.php
diff --git a/...arty/hybridauth/Hybrid/Provider_Model.php → ...arty/hybridauth/Hybrid/Provider_Model.php b/...arty/hybridauth/Hybrid/Provider_Model.php → ...arty/hybridauth/Hybrid/Provider_Model.php
diff --git a/...bridauth/Hybrid/Provider_Model_OAuth1.php → ...bridauth/Hybrid/Provider_Model_OAuth1.php b/...bridauth/Hybrid/Provider_Model_OAuth1.php → ...bridauth/Hybrid/Provider_Model_OAuth1.php
diff --git a/...bridauth/Hybrid/Provider_Model_OAuth2.php → ...bridauth/Hybrid/Provider_Model_OAuth2.php b/...bridauth/Hybrid/Provider_Model_OAuth2.php → ...bridauth/Hybrid/Provider_Model_OAuth2.php
diff --git a/...bridauth/Hybrid/Provider_Model_OpenID.php → ...bridauth/Hybrid/Provider_Model_OpenID.php b/...bridauth/Hybrid/Provider_Model_OpenID.php → ...bridauth/Hybrid/Provider_Model_OpenID.php
diff --git a/...party/hybridauth/Hybrid/Providers/AOL.php → ...party/hybridauth/Hybrid/Providers/AOL.php b/...party/hybridauth/Hybrid/Providers/AOL.php → ...party/hybridauth/Hybrid/Providers/AOL.php
diff --git a/.../hybridauth/Hybrid/Providers/Facebook.php → .../hybridauth/Hybrid/Providers/Facebook.php b/.../hybridauth/Hybrid/Providers/Facebook.php → .../hybridauth/Hybrid/Providers/Facebook.php
diff --git a/...ybridauth/Hybrid/Providers/Foursquare.php → ...ybridauth/Hybrid/Providers/Foursquare.php b/...ybridauth/Hybrid/Providers/Foursquare.php → ...ybridauth/Hybrid/Providers/Foursquare.php
diff --git a/...ty/hybridauth/Hybrid/Providers/Google.php → ...ty/hybridauth/Hybrid/Providers/Google.php b/...ty/hybridauth/Hybrid/Providers/Google.php → ...ty/hybridauth/Hybrid/Providers/Google.php
diff --git a/.../hybridauth/Hybrid/Providers/LinkedIn.php → .../hybridauth/Hybrid/Providers/LinkedIn.php b/.../hybridauth/Hybrid/Providers/LinkedIn.php → .../hybridauth/Hybrid/Providers/LinkedIn.php
diff --git a/...arty/hybridauth/Hybrid/Providers/Live.php → ...arty/hybridauth/Hybrid/Providers/Live.php b/...arty/hybridauth/Hybrid/Providers/Live.php → ...arty/hybridauth/Hybrid/Providers/Live.php
diff --git a/...y/hybridauth/Hybrid/Providers/MySpace.php → ...y/hybridauth/Hybrid/Providers/MySpace.php b/...y/hybridauth/Hybrid/Providers/MySpace.php → ...y/hybridauth/Hybrid/Providers/MySpace.php
diff --git a/...ty/hybridauth/Hybrid/Providers/OpenID.php → ...ty/hybridauth/Hybrid/Providers/OpenID.php b/...ty/hybridauth/Hybrid/Providers/OpenID.php → ...ty/hybridauth/Hybrid/Providers/OpenID.php
diff --git a/...y/hybridauth/Hybrid/Providers/Twitter.php → ...y/hybridauth/Hybrid/Providers/Twitter.php b/...y/hybridauth/Hybrid/Providers/Twitter.php → ...y/hybridauth/Hybrid/Providers/Twitter.php
diff --git a/...rty/hybridauth/Hybrid/Providers/Yahoo.php → ...rty/hybridauth/Hybrid/Providers/Yahoo.php b/...rty/hybridauth/Hybrid/Providers/Yahoo.php → ...rty/hybridauth/Hybrid/Providers/Yahoo.php
diff --git a/...third_party/hybridauth/Hybrid/Storage.php → ...third_party/hybridauth/Hybrid/Storage.php b/...third_party/hybridauth/Hybrid/Storage.php → ...third_party/hybridauth/Hybrid/Storage.php
diff --git a/...on/third_party/hybridauth/Hybrid/User.php → ...pp/third_party/hybridauth/Hybrid/User.php b/...on/third_party/hybridauth/Hybrid/User.php → ...pp/third_party/hybridauth/Hybrid/User.php
diff --git a/...party/hybridauth/Hybrid/User_Activity.php → ...party/hybridauth/Hybrid/User_Activity.php b/...party/hybridauth/Hybrid/User_Activity.php → ...party/hybridauth/Hybrid/User_Activity.php
diff --git a/..._party/hybridauth/Hybrid/User_Contact.php → ..._party/hybridauth/Hybrid/User_Contact.php b/..._party/hybridauth/Hybrid/User_Contact.php → ..._party/hybridauth/Hybrid/User_Contact.php
diff --git a/..._party/hybridauth/Hybrid/User_Profile.php → ..._party/hybridauth/Hybrid/User_Profile.php b/..._party/hybridauth/Hybrid/User_Profile.php → ..._party/hybridauth/Hybrid/User_Profile.php
diff --git a/.../third_party/hybridauth/Hybrid/index.html → .../third_party/hybridauth/Hybrid/index.html b/.../third_party/hybridauth/Hybrid/index.html → .../third_party/hybridauth/Hybrid/index.html
diff --git a/...ybridauth/Hybrid/resources/config.php.tpl → ...ybridauth/Hybrid/resources/config.php.tpl b/...ybridauth/Hybrid/resources/config.php.tpl → ...ybridauth/Hybrid/resources/config.php.tpl
diff --git a/...ty/hybridauth/Hybrid/resources/index.html → ...ty/hybridauth/Hybrid/resources/index.html b/...ty/hybridauth/Hybrid/resources/index.html → ...ty/hybridauth/Hybrid/resources/index.html
diff --git a/...dauth/Hybrid/resources/openid_policy.html → ...dauth/Hybrid/resources/openid_policy.html b/...dauth/Hybrid/resources/openid_policy.html → ...dauth/Hybrid/resources/openid_policy.html
diff --git a/...idauth/Hybrid/resources/openid_realm.html → ...idauth/Hybrid/resources/openid_realm.html b/...idauth/Hybrid/resources/openid_realm.html → ...idauth/Hybrid/resources/openid_realm.html
diff --git a/...bridauth/Hybrid/resources/openid_xrds.xml → ...bridauth/Hybrid/resources/openid_xrds.xml b/...bridauth/Hybrid/resources/openid_xrds.xml → ...bridauth/Hybrid/resources/openid_xrds.xml
diff --git a/...rid/thirdparty/Facebook/base_facebook.php → ...rid/thirdparty/Facebook/base_facebook.php b/...rid/thirdparty/Facebook/base_facebook.php → ...rid/thirdparty/Facebook/base_facebook.php
diff --git a/...h/Hybrid/thirdparty/Facebook/facebook.php → ...h/Hybrid/thirdparty/Facebook/facebook.php b/...h/Hybrid/thirdparty/Facebook/facebook.php → ...h/Hybrid/thirdparty/Facebook/facebook.php
diff --git a/...hirdparty/Facebook/fb_ca_chain_bundle.crt → ...hirdparty/Facebook/fb_ca_chain_bundle.crt b/...hirdparty/Facebook/fb_ca_chain_bundle.crt → ...hirdparty/Facebook/fb_ca_chain_bundle.crt
diff --git a/...h/Hybrid/thirdparty/LinkedIn/LinkedIn.php → ...h/Hybrid/thirdparty/LinkedIn/LinkedIn.php b/...h/Hybrid/thirdparty/LinkedIn/LinkedIn.php → ...h/Hybrid/thirdparty/LinkedIn/LinkedIn.php
diff --git a/...ridauth/Hybrid/thirdparty/OAuth/OAuth.php → ...ridauth/Hybrid/thirdparty/OAuth/OAuth.php b/...ridauth/Hybrid/thirdparty/OAuth/OAuth.php → ...ridauth/Hybrid/thirdparty/OAuth/OAuth.php
diff --git a/.../Hybrid/thirdparty/OAuth/OAuth1Client.php → .../Hybrid/thirdparty/OAuth/OAuth1Client.php b/.../Hybrid/thirdparty/OAuth/OAuth1Client.php → .../Hybrid/thirdparty/OAuth/OAuth1Client.php
diff --git a/.../Hybrid/thirdparty/OAuth/OAuth2Client.php → .../Hybrid/thirdparty/OAuth/OAuth2Client.php b/.../Hybrid/thirdparty/OAuth/OAuth2Client.php → .../Hybrid/thirdparty/OAuth/OAuth2Client.php
diff --git a/.../Hybrid/thirdparty/OpenID/LightOpenID.php → .../Hybrid/thirdparty/OpenID/LightOpenID.php b/.../Hybrid/thirdparty/OpenID/LightOpenID.php → .../Hybrid/thirdparty/OpenID/LightOpenID.php
diff --git a/...y/hybridauth/Hybrid/thirdparty/index.html → ...y/hybridauth/Hybrid/thirdparty/index.html b/...y/hybridauth/Hybrid/thirdparty/index.html → ...y/hybridauth/Hybrid/thirdparty/index.html
diff --git a/...lication/third_party/hybridauth/index.php → src/app/third_party/hybridauth/index.php b/...lication/third_party/hybridauth/index.php → src/app/third_party/hybridauth/index.php
diff --git a/src/application/third_party/index.html → src/app/third_party/index.html b/src/application/third_party/index.html → src/app/third_party/index.html
diff --git a/...ication/views/account/forgot_password.php → src/app/views/account/forgot_password.php b/...ication/views/account/forgot_password.php → src/app/views/account/forgot_password.php
diff --git a/src/application/views/account/login.php → src/app/views/account/login.php b/src/application/views/account/login.php → src/app/views/account/login.php
diff --git a/...plication/views/account/oauth_buttons.php → src/app/views/account/oauth_buttons.php b/...plication/views/account/oauth_buttons.php → src/app/views/account/oauth_buttons.php
diff --git a/src/application/views/account/register.php → src/app/views/account/register.php b/src/application/views/account/register.php → src/app/views/account/register.php
diff --git a/src/application/views/account/reset_password → src/app/views/account/reset_password b/src/application/views/account/reset_password → src/app/views/account/reset_password
diff --git a/src/application/views/dashboard.php → src/app/views/dashboard.php b/src/application/views/dashboard.php → src/app/views/dashboard.php
diff --git a/...plication/views/emails/reset_password.php → src/app/views/emails/reset_password.php b/...plication/views/emails/reset_password.php → src/app/views/emails/reset_password.php
diff --git a/src/application/views/emails/template.php → src/app/views/emails/template.php b/src/application/views/emails/template.php → src/app/views/emails/template.php
diff --git a/src/application/views/footer.php → src/app/views/footer.php b/src/application/views/footer.php → src/app/views/footer.php
diff --git a/src/application/views/header.php → src/app/views/header.php b/src/application/views/header.php → src/app/views/header.php
diff --git a/src/app/views/home.php b/src/app/views/home.php
@@ -0,0 +1,3 @@
+<div class="row" id="feed">
+	<?=$posts?>
+</div>
diff --git a/src/application/views/index.html → src/app/views/index.html b/src/application/views/index.html → src/app/views/index.html
diff --git a/src/application/views/navbar.php → src/app/views/navbar.php b/src/application/views/navbar.php → src/app/views/navbar.php
diff --git a/src/application/views/posts/comments.php → src/app/views/posts/comments.php b/src/application/views/posts/comments.php → src/app/views/posts/comments.php
diff --git a/...application/views/posts/html_template.php → src/app/views/posts/html_template.php b/...application/views/posts/html_template.php → src/app/views/posts/html_template.php
diff --git a/src/application/views/posts/loading.php → src/app/views/posts/loading.php b/src/application/views/posts/loading.php → src/app/views/posts/loading.php
diff --git a/src/application/views/posts/post_box.php → src/app/views/posts/post_box.php b/src/application/views/posts/post_box.php → src/app/views/posts/post_box.php
diff --git a/src/application/views/posts/report.php → src/app/views/posts/report.php b/src/application/views/posts/report.php → src/app/views/posts/report.php
diff --git a/src/application/views/posts/view.php → src/app/views/posts/view.php b/src/application/views/posts/view.php → src/app/views/posts/view.php
diff --git a/src/application/views/templates/hero.php → src/app/views/templates/hero.php b/src/application/views/templates/hero.php → src/app/views/templates/hero.php
diff --git a/src/application/views/templates/master.php → src/app/views/templates/master.php b/src/application/views/templates/master.php → src/app/views/templates/master.php
@@ -8,7 +8,7 @@
 </head>
 <body class="grey lighten-2">
 <?php $this->load->view('navbar'); echo "\n"; ?>
-<?php if($show_hero == true) { $this->load->view('templates/hero'); } ?>
+<?php if($show_hero == true and !$this->php_session->get('loggedin')) { $this->load->view('templates/hero'); } ?>
 
 <?php $this->load->view('templates/no_script'); echo "\n"; ?>
 

diff --git a/src/application/views/templates/msg_box.php → src/app/views/templates/msg_box.php b/src/application/views/templates/msg_box.php → src/app/views/templates/msg_box.php
diff --git a/...application/views/templates/no_script.php → src/app/views/templates/no_script.php b/...application/views/templates/no_script.php → src/app/views/templates/no_script.php
diff --git a/...ion/views/templates/validation_errors.php → ...app/views/templates/validation_errors.php b/...ion/views/templates/validation_errors.php → ...app/views/templates/validation_errors.php
diff --git a/src/application/views/welcome_message.php → src/app/views/welcome_message.php b/src/application/views/welcome_message.php → src/app/views/welcome_message.php
diff --git a/src/application/controllers/main.php b/src/application/controllers/main.php
diff --git a/src/application/views/home.php b/src/application/views/home.php
diff --git a/src/assets/js/dash.js b/src/assets/js/dash.js
@@ -16,6 +16,10 @@ var Dash = Dash || {
 		init: function (elem, type) {
 			Dash.feed_container = elem;
 
+			if($(window).height() >= $('#feed_measure').height()){
+				Dash.feed.ajax.load_more(type);
+			}
+
 			$(window).scroll(function(){
 				if ($(window).scrollTop() == $(document).height() - $(window).height()){
 					Dash.feed.ajax.load_more(type);

diff --git a/src/index.php b/src/index.php
@@ -73,7 +73,7 @@
  * NO TRAILING SLASH!
  *
  */
-	$application_folder = 'application';
+	$application_folder = 'app';
 
 /*
  * --------------------------------------------------------------------

diff --git a/mxious.sublime-project → utils/mxious.sublime-project b/mxious.sublime-project → utils/mxious.sublime-project
diff --git a/mxious.sublime-workspace → utils/mxious.sublime-workspace b/mxious.sublime-workspace → utils/mxious.sublime-workspace
diff --git a/install/sql/mxious.sql → utils/sql/mxious.sql b/install/sql/mxious.sql → utils/sql/mxious.sql
diff --git a/src/ci-license.txt → vendor/licenses/ci-license.txt b/src/ci-license.txt → vendor/licenses/ci-license.txt