auto commit

coslib/shell/heroku.inc

@@ -74,7 +74,7 @@ function heroku_set_cleardb_conf () {
 function heroku_get_config_filename () {
     $config_file = _COS_PATH . "/config/config.ini";
     if (!file_exists($config_file)) {
-        $config_file = _COS_PATH . "/scripts/heroku.ini";
+        $config_file = _COS_PATH . "/scripts/config.ini-dist";
     }
     return $config_file;
 }
@@ -127,15 +127,10 @@ self::setCommand('heroku', array(
     'description' => 'Commands for heroku',
 ));
 
-self::setOption('heroku_set_servername', array(
-    'long_name'   => '--set-servername',
-    'description' => 'Sets correct servername in config/config.ini',
-    'action'      => 'StoreTrue'
-));
 
 self::setOption('heroku_prompt_install', array(
     'long_name'   => '--prompt-install',
-    'description' => 'Sets correct servername in config/config.ini',
+    'description' => 'Prompt install. Writes config/config.ini, and setup sendgrid',
     'action'      => 'StoreTrue'
 ));
 

profiles/default/account.ini-dist

@@ -1,12 +1,11 @@
 account_allow_edit = "super"
 account_show_menu = ""
 account_show_admin_link = "super"
-account_default_url = "/account/lightopenid/index"
+account_default_url = "/account/login/index"
 account_facebook_api_secret = ""
 account_facebook_api_appid = 269965633048607
 account_disable_admin_interface = 0
 account_admin_only = 0
-account_logins[0] = "lightopenid"
 account_logins[1] = "email"
 account_auto_merge[0] = "google.com"
 account_allow_create = "anon"

profiles/default/blog.ini-dist

@@ -5,7 +5,7 @@ blog_abstract_length = 250
 blog_allow = "admin"
 blog_view_sub_modules[0] = "files"
 blog_view_sub_modules[1] = "counter"
-blog_view_sub_modules[2] = "share"
+blog_view_sub_modules[2] = "disqus"
 blog_edit_sub_modules[0] = "image"
 blog_edit_sub_modules[1] = "files"
 blog_index_sub_modules[2] = "rss"

profiles/default/config.ini-dist

@@ -21,7 +21,7 @@ session_path = "/"
 session_host = ""
 cookie_time = -1
 frontpage_module = "content"
-profile_module = "account_profile"
+profile_module = "userinfo"
 blocks_top[0] = "/system/blocks/system_admin_menu_top.inc"
 blocks[0] = "/content/blocks/content_tree_keep_state.inc"
 blocks_all = "blocks,blocks_top"
@@ -31,4 +31,5 @@ captcha_image_chars = 4
 cached_assets = 1
 cached_assets_reload = 0
 media_width = 600
-
+server_name = "default"
+server_redirect = "default"

profiles/default/content.ini-dist

@@ -1,14 +1,15 @@
 content_allow_edit = "admin"
 content_article_crumb = 0
 content_show_menu = 1
-content_multi_book = 1
+content_multi_book = 0
 content_article_abstract = 1
 content_article_jquery_toc = 1
 content_article_filters[0] = "cosmarkdown"
 content_article_filters[1] = "cosmedia"
 content_view_sub_modules[0] = "files"
 content_view_sub_modules[1] = "counter"
 content_view_sub_modules[2] = "share"
+content_view_sub_modules[3] = "disqus"
 content_admin_sub_modules[0] = "image"
 content_admin_sub_modules[1] = "files"
 content_latest_sub_modules[0] = "rss"

profiles/default/profile.inc

@@ -58,7 +58,7 @@ $_PROFILE_MODULES = array (
     'id' => '5',
     'module_name' => 'account',
     'module_version' => '3.01',
-    'menu_item' => '1',
+    'menu_item' => '0',
     'run_level' => '0',
     'load_on' => NULL,
     'parent' => NULL,
@@ -107,7 +107,7 @@ $_PROFILE_MODULES = array (
   ),
   8 => 
   array (
-    'id' => '10',
+    'id' => '9',
     'module_name' => 'configdb',
     'module_version' => '3.01',
     'menu_item' => '0',
@@ -120,7 +120,7 @@ $_PROFILE_MODULES = array (
   ),
   9 => 
   array (
-    'id' => '12',
+    'id' => '10',
     'module_name' => 'jquerysort',
     'module_version' => '3.01',
     'menu_item' => '0',
@@ -133,7 +133,7 @@ $_PROFILE_MODULES = array (
   ),
   10 => 
   array (
-    'id' => '13',
+    'id' => '11',
     'module_name' => 'menus',
     'module_version' => '3.01',
     'menu_item' => '1',
@@ -146,10 +146,10 @@ $_PROFILE_MODULES = array (
   ),
   11 => 
   array (
-    'id' => '14',
+    'id' => '12',
     'module_name' => 'image',
     'module_version' => '3.01',
-    'menu_item' => '0',
+    'menu_item' => '1',
     'run_level' => '0',
     'load_on' => NULL,
     'parent' => NULL,
@@ -159,7 +159,7 @@ $_PROFILE_MODULES = array (
   ),
   12 => 
   array (
-    'id' => '15',
+    'id' => '13',
     'module_name' => 'locales',
     'module_version' => '3.01',
     'menu_item' => '1',
@@ -172,7 +172,7 @@ $_PROFILE_MODULES = array (
   ),
   13 => 
   array (
-    'id' => '16',
+    'id' => '14',
     'module_name' => 'block_manip',
     'module_version' => '3.01',
     'menu_item' => '1',
@@ -185,7 +185,7 @@ $_PROFILE_MODULES = array (
   ),
   14 => 
   array (
-    'id' => '18',
+    'id' => '15',
     'module_name' => 'tags',
     'module_version' => '3.01',
     'menu_item' => '1',
@@ -198,20 +198,7 @@ $_PROFILE_MODULES = array (
   ),
   15 => 
   array (
-    'id' => '21',
-    'module_name' => 'account_profile',
-    'module_version' => '3.01',
-    'menu_item' => '1',
-    'run_level' => '0',
-    'load_on' => NULL,
-    'parent' => NULL,
-    'is_shell' => NULL,
-    'public_clone_url' => 'git://github.com/diversen/account_profile.git',
-    'private_clone_url' => 'git@github.com:diversen/account_profile.git',
-  ),
-  16 => 
-  array (
-    'id' => '25',
+    'id' => '17',
     'module_name' => 'counter',
     'module_version' => '3.01',
     'menu_item' => '0',
@@ -222,9 +209,9 @@ $_PROFILE_MODULES = array (
     'public_clone_url' => 'git://github.com/diversen/counter.git',
     'private_clone_url' => 'git@github.com:diversen/counter.git',
   ),
-  17 => 
+  16 => 
   array (
-    'id' => '26',
+    'id' => '18',
     'module_name' => 'google_translate',
     'module_version' => '3.01',
     'menu_item' => '0',
@@ -235,9 +222,9 @@ $_PROFILE_MODULES = array (
     'public_clone_url' => 'git://github.com/diversen/google_translate.git',
     'private_clone_url' => 'git@github.com:diversen/google_translate.git',
   ),
-  18 => 
+  17 => 
   array (
-    'id' => '29',
+    'id' => '19',
     'module_name' => 'google_analytics',
     'module_version' => '3.01',
     'menu_item' => '1',
@@ -248,24 +235,24 @@ $_PROFILE_MODULES = array (
     'public_clone_url' => 'git://github.com/diversen/google_analytics.git',
     'private_clone_url' => 'git@github.com:diversen/google_analytics.git',
   ),
-  19 => 
+  18 => 
   array (
-    'id' => '30',
+    'id' => '20',
     'module_name' => 'share',
     'module_version' => '3.01',
-    'menu_item' => '1',
+    'menu_item' => '0',
     'run_level' => '0',
     'load_on' => NULL,
     'parent' => NULL,
     'is_shell' => NULL,
     'public_clone_url' => 'git://github.com/diversen/share.git',
     'private_clone_url' => 'git@github.com:diversen/share.git',
   ),
-  20 => 
+  19 => 
   array (
-    'id' => '32',
+    'id' => '21',
     'module_name' => 'content',
-    'module_version' => '3.01',
+    'module_version' => '3.012',
     'menu_item' => '1',
     'run_level' => '0',
     'load_on' => NULL,
@@ -274,19 +261,32 @@ $_PROFILE_MODULES = array (
     'public_clone_url' => 'git://github.com/diversen/content.git',
     'private_clone_url' => 'git@github.com:diversen/content.git',
   ),
-  21 => 
+  20 => 
   array (
-    'id' => '33',
+    'id' => '22',
     'module_name' => 'disqus',
     'module_version' => '3.01',
-    'menu_item' => '0',
+    'menu_item' => '1',
     'run_level' => '0',
     'load_on' => NULL,
     'parent' => NULL,
     'is_shell' => NULL,
     'public_clone_url' => 'git://github.com/diversen/disqus.git',
     'private_clone_url' => 'git@github.com:diversen/disqus.git',
   ),
+  21 => 
+  array (
+    'id' => '23',
+    'module_name' => 'userinfo',
+    'module_version' => '3.01',
+    'menu_item' => '1',
+    'run_level' => '0',
+    'load_on' => NULL,
+    'parent' => NULL,
+    'is_shell' => NULL,
+    'public_clone_url' => 'git://github.com/diversen/userinfo.git',
+    'private_clone_url' => 'git@github.com:diversen/userinfo.git',
+  ),
 );
 
 $_PROFILE_TEMPLATES = array (

profiles/default/zimpleza.ini-dist

@@ -1,2 +1 @@
 template_js[] = '/js/image.full_link.js'
-zimpleza_bg_image = 1

vendor/facebook/php-sdk-v4/.gitignore

@@ -0,0 +1,7 @@
+vendor/
+composer.lock
+composer.phar
+.DS_Store
+.idea/
+tests/FacebookTestCredentials.php
+

vendor/facebook/php-sdk-v4/CONTRIBUTING.md

@@ -0,0 +1,13 @@
+Contributing
+------------
+
+For us to accept contributions you will have to first have signed the
+[Contributor License Agreement](https://developers.facebook.com/opensource/cla).
+
+When committing, keep all lines to less than 80 characters, and try to
+follow the existing style.
+
+Before creating a pull request, squash your commits into a single commit.
+
+Add the comments where needed, and provide ample explanation in the
+commit message.

vendor/facebook/php-sdk-v4/LICENSE

@@ -0,0 +1,19 @@
+Copyright 2014 Facebook, Inc.
+
+You are hereby granted a non-exclusive, worldwide, royalty-free license to
+use, copy, modify, and distribute this software in source code or binary
+form for use in connection with the web services and APIs provided by
+Facebook.
+
+As with any software that integrates with the Facebook platform, your use
+of this software is subject to the Facebook Developer Principles and
+Policies [http://developers.facebook.com/policy/]. This copyright notice
+shall be included in all copies or substantial portions of the software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.