diff --git a/Credits.txt b/Credits.txt index 1cd5c3ff..9d9601d0 100644 --- a/Credits.txt +++ b/Credits.txt @@ -6,7 +6,7 @@ has been used throughout Invision Community to add style, flair and functionalit to our product. NULLING - Last Updated: 09 June 2021 + Last Updated: 07 July 2022 Author: IPBMafia.ru AES implementation in PHP @@ -33,7 +33,7 @@ Clipboard CKEditor Description: Provides the editor functionality for submitting content. Location: In development: applications/core/dev/ckeditor (custom build with additional plugins) - Included version: 4.16 + Included version: 4.19.0 Website: http://ckeditor.com License: http://www.gnu.org/copyleft/lesser.html @@ -114,7 +114,7 @@ Howler HTMLPurifier Description: Validates and cleans submitted HTML for content Location: system/3rd_party/HTMLPurifier - Included version: 4.12.0 + Included version: 4.14.0 Website: http://htmlpurifier.org License: http://www.gnu.org/copyleft/lesser.html @@ -176,8 +176,8 @@ jQuery Migrate jQuery.nestedSortable.js Description: Extends jqueryui's sortable with nested support Location: applications/core/interface/jquery/jquery.nestedSortable.js - Included version: 2.0 - Website: http://mjsarfatti.com/sandbox/nestedSortable/ + Included version: 2.1a + Website: https://github.com/ilikenwf/nestedSortable License: http://opensource.org/licenses/MIT jQuery.rangyinputs.js @@ -197,7 +197,7 @@ jQuery.transform.js jQuery UI Description: Javascript library for drag+drop, resizing, date polyfill Location: applications/core/interface/jquery/jquery-ui.js - Included version: 1.12.1 + Included version: 1.13.1 Website: http://jqueryui.com License: http://jquery.org/license @@ -315,7 +315,7 @@ PHP User Agent Parser Plupload Description: Facilitates uploading files Location: applications/core/interface/plupload - Included version: 2.3.1 + Included version: 2.3.9 Website: http://www.plupload.com License: http://www.plupload.com/license/plupload_commercial_oem.txt @@ -327,7 +327,7 @@ Preloaders.net Spectrum Description: Color selector polyfill Location: applications/core/interface/spectrum - Included version: 2.0.0 + Included version: 2.0.8 Website: https://seballot.github.io/spectrum/ License: https://github.com/seballot/spectrum/blob/master/LICENSE @@ -361,7 +361,7 @@ Web Push Library for PHP Whoops Description: Provides error handling for development mode Location: dev/Whoops - Included Version: 2.9.1 + Included Version: 2.14.5 Website: http://filp.github.io/whoops/ License: https://github.com/filp/whoops/blob/master/LICENSE.md diff --git a/admin/convertutf8/system/Convert/Convert.php b/admin/convertutf8/system/Convert/Convert.php index cac569e1..1aca9e5f 100644 --- a/admin/convertutf8/system/Convert/Convert.php +++ b/admin/convertutf8/system/Convert/Convert.php @@ -549,7 +549,7 @@ class Convert } /* If we have moved the only row from $batch to $nextbatch, then process that now */ - if ( \count( $nextBatch ) and ! \count( $batch ) ) + if ( \is_array( $batch ) and \count( $nextBatch ) and ! \count( $batch ) ) { $batch = $nextBatch; $nextBatch = array(); diff --git a/admin/convertutf8/system/Db/Db.php b/admin/convertutf8/system/Db/Db.php index 8de000fa..504f422e 100644 --- a/admin/convertutf8/system/Db/Db.php +++ b/admin/convertutf8/system/Db/Db.php @@ -183,7 +183,7 @@ class Db extends \mysqli * @see mysqli::query * @throws \IPS\Db\Exception */ - public function query( $query ) + public function query( string $query, int $result_mode = MYSQLI_STORE_RESULT ) { /* Should we return the query instead of executing it? */ if( $this->returnQuery === TRUE ) diff --git a/admin/install/eula.txt b/admin/install/eula.txt index bab8ea82..abe550e9 100644 --- a/admin/install/eula.txt +++ b/admin/install/eula.txt @@ -3,7 +3,7 @@ Nulled by IPBMafia.ru Buy license at https://www.invisionpower.com/buy/self-hosted ================================================================ - IPS 4.6.0 (106107) + IPS 4.7.0 (107014) =============================[NOTE]============================= Invision Community End User License Agreement diff --git a/admin/install/html/forms/number.phtml b/admin/install/html/forms/number.phtml index 399f3aa7..4c462223 100644 --- a/admin/install/html/forms/number.phtml +++ b/admin/install/html/forms/number.phtml @@ -1,4 +1,4 @@ - + + {lang="welcome_banner"}

{{if $initError}} + {lang="beforestart" sprintf="$path"} {{else}} {lang="beforestarto"} @@ -89,6 +90,9 @@ {{endif}}

Nulled by IPBMafia.ru

+
+ {lang="server_ip"} {expression="$_SERVER['SERVER_ADDR'] ?? ( $_SERVER['LOCAL_ADDR'] ?? 'unavailable' )"} +
\ No newline at end of file diff --git a/admin/install/lang.php b/admin/install/lang.php index 8bced895..df0d6e91 100644 --- a/admin/install/lang.php +++ b/admin/install/lang.php @@ -198,6 +198,7 @@ $lang = array( 'admin' => "Admin", 'beforestart' => "Before we can begin, please rename conf_global.dist.php to conf_global.php in %s and ensure it is writable (usually CHMOD 0777).", 'beforestarto' => "This process will install your software for you. Be sure you have your license key and MySQL database details to hand.", +'server_ip' => "IP: ", 'install_guide' => "Install Guide", diff --git a/admin/upgrade/extract.php b/admin/upgrade/extract.php index 97ce2fe2..50061e24 100644 --- a/admin/upgrade/extract.php +++ b/admin/upgrade/extract.php @@ -2,7 +2,7 @@ Invision Community Update Extractor - + 0755, 'FILE_PERMISSION_NO_WRITE' => 0644, 'IPS_FILE_PERMISSION' => 0666, 'TEMP_DIRECTORY' => sys_get_temp_dir() ) as $k => $v ) +foreach ( [ 'FOLDER_PERMISSION_NO_WRITE' => 0755, 'FILE_PERMISSION_NO_WRITE' => 0644, 'IPS_FILE_PERMISSION' => 0666, 'TEMP_DIRECTORY' => sys_get_temp_dir(), 'TEXT_ENCRYPTION_KEY' => NULL ] as $k => $v ) { if ( !\defined( $k ) ) { @@ -80,6 +80,16 @@ class Extractor * @brief SFTP Directory */ private $sftpDir; + + /** + * @brief Database connection + */ + public $db; + + /** + * @brief Database prefix + */ + public $dbPrefix; /** * Constructor @@ -109,7 +119,8 @@ class Extractor { require "../../conf_global.php"; - $db = new mysqli( $INFO['sql_host'], $INFO['sql_user'], $INFO['sql_pass'], $INFO['sql_database'], !empty( $INFO['sql_port'] ) ? $INFO['sql_port'] : null, !empty( $INFO['sql_socket'] ) ? $INFO['sql_socket'] : null ); + $this->db = new mysqli( $INFO['sql_host'], $INFO['sql_user'], $INFO['sql_pass'], $INFO['sql_database'], !empty( $INFO['sql_port'] ) ? $INFO['sql_port'] : null, !empty( $INFO['sql_socket'] ) ? $INFO['sql_socket'] : null ); + $this->dbPrefix = $INFO['sql_tbl_prefix'] ?? ''; /* If the connection failed, do not continue */ if( $error = mysqli_connect_error() ) @@ -118,7 +129,7 @@ class Extractor } /* Check that there is an upgrade in progress */ - $query = $db->query( "SELECT conf_value FROM {$INFO['sql_tbl_prefix']}core_sys_conf_settings WHERE conf_key='setup_in_progress'" ); + $query = $this->db->query( "SELECT conf_value FROM {$this->dbPrefix}core_sys_conf_settings WHERE conf_key='setup_in_progress'" ); if( !$query ) { return FALSE; @@ -378,6 +389,176 @@ class Extractor } } +/** + * Encrypted - code from \IPS\Text\Encrypt + */ +class Encrypt +{ + /** + * Get Key + * + * @return void + */ + public static function key() + { + require "../../conf_global.php"; + return \TEXT_ENCRYPTION_KEY ?: md5( $INFO['sql_pass'] . $INFO['sql_database'] ); + } + + /** + * @brief Cipher + */ + public $cipher; + + /** + * @brief IV + */ + protected $iv = NULL; + + /** + * @brief Tag + */ + protected $tag = NULL; + + /** + * @brief Hash of cipher + */ + protected $hmac = NULL; + + /** + * From plaintext + * + * @param string $plaintext Plaintext + * @return static + */ + public static function fromPlaintext( $plaintext ) + { + $obj = new static; + + /* Try to use OpenSSL if it's available... */ + if ( \function_exists( 'openssl_get_cipher_methods' ) ) + { + /* If GCM is available (PHP 7.1+), use that as if provides authenticated encryption natively */ + if ( \in_array( 'aes-128-gcm', openssl_get_cipher_methods() ) ) + { + $obj->iv = openssl_random_pseudo_bytes( openssl_cipher_iv_length( 'aes-128-gcm' ) ); + $obj->cipher = openssl_encrypt( $plaintext, 'aes-128-gcm', static::key(), 0, $obj->iv, $obj->tag ); + return $obj; + } + + /* Otherwise, use CBC and store the hash so we can do our own authentication when decrypting */ + elseif ( \in_array( 'aes-128-cbc', openssl_get_cipher_methods() ) ) + { + $obj->iv = openssl_random_pseudo_bytes( openssl_cipher_iv_length( 'aes-128-cbc' ) ); + $obj->cipher = openssl_encrypt( $plaintext, 'aes-128-cbc', static::key(), OPENSSL_RAW_DATA, $obj->iv ); + $obj->hmac = hash_hmac( 'sha256', $obj->cipher, static::key(), TRUE ); + return $obj; + } + } + + /* If we're still here, fallback to the PHP library */ + require_once '../../system/3rd_party/AES/AES.php'; + $obj->cipher = \AesCtr::encrypt( $plaintext, static::key(), 256 ); + return $obj; + } + + /** + * From plaintext + * + * @param string $cipher Cipher + * @param string|null $iv The IV, or if null, will use the PHP library rather than built-in openssl_*() methods + * @param string|null $tag The tag if using AES-128-GCM + * @param string|null $hash The hash if using AES-128-CBC + * @return static + */ + public static function fromCipher( $cipher, $iv = NULL, $tag = NULL, $hash = NULL ) + { + $obj = new static; + $obj->cipher = $cipher; + $obj->iv = $iv; + $obj->tag = $tag; + $obj->hmac = $hash; + return $obj; + } + + /** + * From tag + * + * @param string $tag Tag + * @return static + */ + public static function fromTag( $tag ) + { + if ( preg_match( '/^\[\!AES128GCM\[(.+?)\]\[(.+?)\]\[(.+?)\]\]/', $tag, $matches ) ) + { + return static::fromCipher( $matches[1], hex2bin( $matches[2] ), hex2bin( $matches[3] ) ); + } + elseif ( preg_match( '/^\[\!AES128CBC\[(.+?)\]\]/', $tag, $matches ) ) + { + $cipher = base64_decode( $matches[1] ); + $ivLength = openssl_cipher_iv_length('aes-128-cbc'); + + return static::fromCipher( \substr( $cipher, $ivLength + 32 ), \substr( $cipher, 0, $ivLength ), NULL, \substr( $cipher, $ivLength, 32 ) ); + } + elseif ( preg_match( '/^\[\!AES\[(.+?)\]\]/', $tag, $matches ) ) + { + return static::fromCipher( $matches[1] ); + } + else + { + return static::fromPlaintext( $tag ); + } + } + + /** + * Wrap in a tag to use later with fromTag + * + * @return string + */ + public function tag() + { + if ( $this->tag ) + { + return '[!AES128GCM[' . $this->cipher . '][' . bin2hex( $this->iv ) . '][' . bin2hex( $this->tag ) . ']]'; + } + elseif ( $this->hmac ) + { + return '[!AES128CBC[' . base64_encode( $this->iv . $this->hmac . $this->cipher ) . ']]'; + } + else + { + return '[!AES[' . $this->cipher . ']]'; + } + } + + /** + * Decript + * + * @return string + */ + public function decrypt() + { + if ( $this->tag ) + { + return openssl_decrypt( $this->cipher, 'aes-128-gcm', static::key(), 0, $this->iv, $this->tag ); + } + elseif ( $this->hmac ) + { + $decrypted = openssl_decrypt( $this->cipher, 'aes-128-cbc', static::key(), OPENSSL_RAW_DATA, $this->iv ); + if ( hash_equals( $this->hmac, hash_hmac( 'sha256', $this->cipher, static::key(), TRUE ) ) ) + { + return $decrypted; + } + return ''; + } + else + { + require_once '../../system/3rd_party/AES/AES.php'; + return \AesCtr::decrypt( $this->cipher, static::key(), 256 ); + } + } +} + /** * Function to write a log file to disk * @@ -432,7 +613,29 @@ try /* Establish an FTP connection if necessary */ if ( $_GET['ftp'] ) { - $extractor->connectToFtp( $_GET['ftp'] ); + /* Get encrypted FTP credentials */ + $query = $extractor->db->query( "SELECT conf_value FROM " . $extractor->dbPrefix . "core_sys_conf_settings WHERE conf_key='upgrade_ftp_details'" ); + if( !$query ) + { + throw new \RuntimeException('Cannot find (S)FTP credentials'); + } + + $ftpCredentials = $query->fetch_assoc()['conf_value']; + if( empty( $ftpCredentials ) ) + { + throw new \RuntimeException('Cannot load (S)FTP credentials'); + } + + if ( \substr( $ftpCredentials, 0, 5 ) === '[!AES' ) + { + $decodedFtpDetails = Encrypt::fromTag( $ftpCredentials )->decrypt(); + } + else + { + $decodedFtpDetails = Encrypt::fromCipher( $ftpCredentials )->decrypt(); + } + + $extractor->connectToFtp( json_decode( $decodedFtpDetails, TRUE ) ); } /* Extract a batch of files */ diff --git a/admin/upgrade/html/forms/number.phtml b/admin/upgrade/html/forms/number.phtml index 399f3aa7..4c462223 100644 --- a/admin/upgrade/html/forms/number.phtml +++ b/admin/upgrade/html/forms/number.phtml @@ -1,4 +1,4 @@ - + + member AND \IPS\Request::i()->key ) { $member = \IPS\Member::load( \IPS\Request::i()->member ); - if( !\IPS\Login::compareHashes( md5( ( $member->members_pass_hash ?: $member->email ) . $member->members_pass_salt ), (string) \IPS\Request::i()->key ) ) + if( !\IPS\Login::compareHashes( $member->getUniqueMemberHash(), (string) \IPS\Request::i()->key ) ) { $member = NULL; } @@ -155,14 +155,14 @@ class _Application extends \IPS\Application } /** - * Return an array of specific links to add to the sitemap + * Returns a list of all existing webhooks and their payload in this app. * - * @return array + * @return array */ - public function sitemapLinks() + public function getWebhooks() : array { - return array( - \IPS\Http\Url::internal( 'app=blog&module=blogs&controller=browse', 'front', 'blogs' ), - ); + return array_merge( [ + 'blogBlog_create' => \IPS\blogs\Blog::class + ], parent::getWebhooks()); } } \ No newline at end of file diff --git a/applications/blog/api/comments.php b/applications/blog/api/comments.php index ca4313f3..77cc96a5 100644 --- a/applications/blog/api/comments.php +++ b/applications/blog/api/comments.php @@ -106,6 +106,7 @@ class _comments extends \IPS\Content\Api\CommentController * @apiparam datetime date The date/time that should be used for the comment date. If not provided, will use the current date/time. Ignored for requests using an OAuth Access Token for a particular member * @apiparam string ip_address The IP address that should be stored for the comment. If not provided, will use the IP address from the API request. Ignored for requests using an OAuth Access Token for a particular member * @apiparam int hidden 0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator) + * @apiparam bool anonymous If 1, the item will be posted anonymously. * @throws 2B301/2 INVALID_ID The comment ID does not exist * @throws 1B301/3 NO_AUTHOR The author ID does not exist * @throws 1B301/4 NO_CONTENT No content was supplied @@ -145,8 +146,15 @@ class _comments extends \IPS\Content\Api\CommentController } else { - $author = new \IPS\Member; - $author->name = \IPS\Request::i()->author_name; + if ( \IPS\Request::i()->author === 0 ) + { + $author = new \IPS\Member; + $author->name = \IPS\Request::i()->author_name; + } + else + { + throw new \IPS\Api\Exception( 'NO_AUTHOR', '1B301/3', 400 ); + } } } @@ -234,4 +242,57 @@ class _comments extends \IPS\Content\Api\CommentController throw new \IPS\Api\Exception( 'INVALID_ID', '2B301/7', 404 ); } } + + /** + * POST /blog/comments/{id}/react + * Add a reaction + * + * @param int $id ID Number + * @apiparam int id ID of the reaction to add + * @apiparam int author ID of the member reacting + * @return \IPS\blog\Entry\Comment + * @throws 1S425/2 NO_REACTION The reaction ID does not exist + * @throws 1S425/3 NO_AUTHOR The author ID does not exist + * @throws 1S425/4 REACT_ERROR Error adding the reaction + * @throws 1S425/5 INVALID_ID Object ID does not exist + * @note If the author has already reacted to this content, any existing reaction will be removed first + */ + public function POSTitem_react( $id ) + { + return $this->_reactAdd( $id ); + } + + /** + * DELETE /blog/comments/{id}/react + * Delete a reaction + * + * @param int $id ID Number + * @apiparam int author ID of the member who reacted + * @return \IPS\blog\Entry\Comment + * @throws 1S425/6 NO_AUTHOR The author ID does not exist + * @throws 1S425/7 REACT_ERROR Error adding the reaction + * @throws 1S425/8 INVALID_ID Object ID does not exist + * @note If the author has already reacted to this content, any existing reaction will be removed first + */ + public function DELETEitem_react( $id ) + { + return $this->_reactRemove( $id ); + } + + /** + * POST /blog/comments/{id}/report + * Reports a post + * + * @param int $id ID Number + * @apiparam int author ID of the member reporting + * @apiparam int report_type Report type (0 is default and is for letting CMGR team know, more options via core_automatic_moderation_types) + * @apiparam string message Optional message + * @return \IPS\blog\Entry\Comment + * @throws 1S425/B NO_AUTHOR The author ID does not exist + * @throws 1S425/C REPORTED_ALREADY The member has reported this item in the past 24 hours + */ + public function POSTitem_report( $id ) + { + return $this->_report( $id ); + } } \ No newline at end of file diff --git a/applications/blog/api/entries.php b/applications/blog/api/entries.php index c6f4a76f..cfce7ed3 100644 --- a/applications/blog/api/entries.php +++ b/applications/blog/api/entries.php @@ -130,6 +130,7 @@ class _entries extends \IPS\Content\Api\ItemController * @apiparam bool poll_public Make the poll public * @apiparam bool poll_only Make this a poll-only topic * @apiparam array poll_options Array of objects with keys 'title' (string), 'answers' (array of objects with key 'value' set to the choice) and 'multichoice' (bool) + * @apiparam bool anonymous If 1, the item will be posted anonymously. * @throws 1B300/2 NO_BLOG The blog ID does not exist * @throws 1B300/3 NO_AUTHOR The author ID does not exist * @throws 1B300/4 NO_TITLE No title was supplied @@ -170,7 +171,14 @@ class _entries extends \IPS\Content\Api\ItemController } else { - $author = new \IPS\Member; + if ( \IPS\Request::i()->author === 0 ) + { + $author = new \IPS\Member; + } + else + { + throw new \IPS\Api\Exception( 'NO_AUTHOR', '1B300/3', 400 ); + } } } diff --git a/applications/blog/data/javascript.xml b/applications/blog/data/javascript.xml index 2653f891..1534067f 100644 --- a/applications/blog/data/javascript.xml +++ b/applications/blog/data/javascript.xml @@ -1,6 +1,6 @@ - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -66,7 +66,7 @@ } }); }(jQuery, _)); - - {{#lang}}manage_cats_new_row{{/lang}}\ "); diff --git a/applications/blog/data/lang.xml b/applications/blog/data/lang.xml index a4e6f4e8..932380ff 100644 --- a/applications/blog/data/lang.xml +++ b/applications/blog/data/lang.xml @@ -1,6 +1,6 @@ - + Blogs Blogs a comment on a blog entry @@ -22,6 +22,7 @@ Blog Overview Blogs Blog Entries + Blog Categories Checks RSS/Atom feeds for new articles and imports into Blogs. Blog Cover Photos Blog @@ -89,6 +90,7 @@ No Blog Author selected Deleted Blog %s Are you sure you want to delete this blog? + This will permanently delete the blog and all its entries. Submit New Blog Entry Title Tags @@ -311,6 +313,7 @@ There are no entries in this category Entry Categories Subcategories + Fired when a blog is created Are you sure you want to delete this category? Existing entries in this category will be updated so that they are no longer in a category. Add New Category diff --git a/applications/blog/data/theme.xml b/applications/blog/data/theme.xml index 869158cf..7f8e970a 100644 --- a/applications/blog/data/theme.xml +++ b/applications/blog/data/theme.xml @@ -104,7 +104,7 @@ {{else}} {{foreach $blogs as $blog}} {{if $blog->disabled != 1}} - id}" seoTemplate="blog_submit"}"> + id}" seoTemplate="blog_submit"}" rel='nofollow noindex'> {lang="add_entry"} {{endif}} @@ -809,20 +809,20 @@ {{if ( isset( $table->sortOptions ) and !empty( $table->sortOptions ) ) OR $table->advancedSearch}}
  • {{if isset($table->sortOptions) }} - {lang="sort_by"} + {lang="sort_by"} {{elseif $table->advancedSearch}} - '1', 'filter' => $table->filter, 'sortby' => $table->sortBy, 'sortdirection' => $table->sortDirection ) )}' data-ipsDialog data-ipsDialog-title='{lang="custom_sort"}'>{lang="custom"} + '1', 'filter' => $table->filter, 'sortby' => $table->sortBy, 'sortdirection' => $table->sortDirection ) )}' data-ipsDialog data-ipsDialog-title='{lang="custom_sort"}' rel="nofollow">{lang="custom"} {{endif}}
    • {{endif}} @@ -831,11 +831,11 @@ {lang="filter_by"} @@ -1512,9 +1512,9 @@ {{if \IPS\blog\Entry::canCreate( \IPS\Member::loggedIn(), $blog )}}
  • {{if $category}} - id}&cat={$category->_id}" seoTemplate="blog_submit"}">{lang="add_blog_entry"} + id}&cat={$category->_id}" seoTemplate="blog_submit"}" rel='nofollow noindex'>{lang="add_blog_entry"} {{else}} - id}" seoTemplate="blog_submit"}">{lang="add_blog_entry"} + id}" seoTemplate="blog_submit"}" rel='nofollow noindex'>{lang="add_blog_entry"} {{endif}}
    • {{endif}} @@ -1567,7 +1567,7 @@ {{if $blog->canDelete() }}
  • - 'deleteBlog', 'csrfKey' => \IPS\Session::i()->csrfKey ) )}' data-confirm title="{lang="delete_blog"}" data-confirmMessage="{lang="delete_blog_confirm"}" >{lang="delete_blog"} + 'deleteBlog', 'csrfKey' => \IPS\Session::i()->csrfKey ) )}' data-confirm title="{lang="delete_blog"}" data-confirmMessage="{lang="delete_blog_confirm"}" data-confirmSubMessage="{lang="delete_blog_warning"}" >{lang="delete_blog"}
    • {{endif}} @@ -2041,8 +2041,8 @@ html[dir="ltr"] .cBlogCatManage .ipsDataItem_size3 a[data-action="edit"] { margin-right:5px; } -html[dir="rtl"] .cBlogCatManage .ipsDataItem_size3 a[data-action="edit"]s { - margin-left:5px; +html[dir="rtl"] .cBlogCatManage .ipsDataItem_size3 a[data-action="edit"] { + margin-left:5px; } .cBlogCatManage span.ipsDataItem_title { diff --git a/applications/blog/data/versions.json b/applications/blog/data/versions.json index b5e22261..ded7012d 100644 --- a/applications/blog/data/versions.json +++ b/applications/blog/data/versions.json @@ -413,5 +413,80 @@ "106104": "4.6.0 Beta 3", "106105": "4.6.0 Beta 3.1", "106106": "4.6.0 Beta 4", - "106107": "4.6.0" + "106107": "4.6.0", + "106108": "4.6.0", + "106109": "4.6.0", + "106110": "4.6.1", + "106111": "4.6.1", + "106112": "4.6.1", + "106113": "4.6.2", + "106114": "4.6.2", + "106115": "4.6.2", + "106116": "4.6.3", + "106117": "4.6.3", + "106118": "4.6.4", + "106119": "4.6.4", + "106120": "4.6.4", + "106121": "4.6.4", + "106122": "4.6.5", + "106123": "4.6.5.1", + "106125": "4.6.5.1", + "106126": "4.6.5.1", + "106127": "4.6.5.1", + "106128": "4.6.5.1", + "106129": "4.6.5.1", + "106130": "4.6.5.1", + "106131": "4.6.5.1", + "106132": "4.6.6", + "106133": "4.6.6", + "106134": "4.6.7 Beta 1", + "106135": "4.6.7 Beta 2", + "106136": "4.6.7", + "106137": "4.6.7", + "106138": "4.6.8 Beta 1", + "106139": "4.6.8 Beta 2", + "106140": "4.6.8", + "106141": "4.6.8", + "106142": "4.6.8", + "106143": "4.6.8", + "106144": "4.6.9 Beta 1", + "106145": "4.6.9 Beta 2", + "106146": "4.6.9 Beta 3", + "106147": "4.6.9", + "106148": "4.6.9", + "106149": "4.6.10 Beta 1", + "106150": "4.6.10 Beta 2", + "106151": "4.6.10", + "106152": "4.6.10", + "106153": "4.6.10", + "106154": "4.6.10", + "106155": "4.6.10", + "106156": "4.6.11 Beta 1", + "106157": "4.6.11 Beta 1", + "106158": "4.6.11 Beta 2", + "106159": "4.6.11", + "106160": "4.6.11", + "106161": "4.6.12 Beta 1", + "106162": "4.6.12 Beta 1", + "106163": "4.6.12 Beta 2", + "106164": "4.6.12", + "106165": "4.6.12", + "106166": "4.6.12", + "106167": "4.6.12.1", + "106168": "4.6.13 Beta 1", + "107000": "4.7.0 Beta 1", + "107001": "4.7.0 Beta 1", + "107002": "4.7.0 Beta 2", + "107003": "4.7.0 Beta 2", + "107004": "4.7.0 Beta 3", + "107005": "4.7.0 Beta 4", + "107006": "4.7.0 Beta 4.1", + "107007": "4.7.0 Beta 5", + "107008": "4.7.0 Beta 6", + "107009": "4.7.0 Beta 7", + "107010": "4.7.0 Beta 8", + "107011": "4.7.0 Beta 9", + "107012": "4.7.0 Beta 10", + "107013": "4.7.0", + "107014": "4.7.0" } \ No newline at end of file diff --git a/applications/blog/extensions/core/EditorLocations/Blogs.php b/applications/blog/extensions/core/EditorLocations/Blogs.php index 34f346e1..4fd16a9c 100644 --- a/applications/blog/extensions/core/EditorLocations/Blogs.php +++ b/applications/blog/extensions/core/EditorLocations/Blogs.php @@ -46,6 +46,34 @@ class _Blogs return NULL; } + /** + * Can whatever is posted in this editor be moderated? + * If this returns TRUE, we must ensure the content is ran through word, link and image filters + * + * @param \IPS\Member $member The member + * @param \IPS\Helpers\Form\Editor $field The editor field + * @return bool + */ + public function canBeModerated( $member, $field ) + { + if ( preg_match( '/^blogs\-(?:new-blog|blog|new-blog-group\d+)$/', $field->options['autoSaveKey'] ) ) + { + return FALSE; + } + elseif ( preg_match( '/^(?:reply|editComment)\-blog\/blogs-\d+$/', $field->options['autoSaveKey'] ) ) + { + return TRUE; + } + else + { + if ( \IPS\IN_DEV ) + { + throw new \RuntimeException( 'Unknown canBeModerated: ' . $field->options['autoSaveKey'] ); + } + return FALSE; + } + } + /** * Permission check for attachments * diff --git a/applications/blog/extensions/core/EditorLocations/Entries.php b/applications/blog/extensions/core/EditorLocations/Entries.php index dae589bf..b2121f37 100644 --- a/applications/blog/extensions/core/EditorLocations/Entries.php +++ b/applications/blog/extensions/core/EditorLocations/Entries.php @@ -45,6 +45,30 @@ class _Entries { return NULL; } + + /** + * Can whatever is posted in this editor be moderated? + * If this returns TRUE, we must ensure the content is ran through word, link and image filters + * + * @param \IPS\Member $member The member + * @param \IPS\Helpers\Form\Editor $field The editor field + * @return bool + */ + public function canBeModerated( $member, $field ) + { + if ( preg_match( '/^blog\-(?:entry|edit)\-\d+$/', $field->options['autoSaveKey'] ) ) + { + return TRUE; + } + else + { + if ( \IPS\IN_DEV ) + { + throw new \RuntimeException( 'Unknown canBeModerated: ' . $field->options['autoSaveKey'] ); + } + return FALSE; + } + } /** * Permission check for attachments diff --git a/applications/blog/modules/front/blogs/browse.php b/applications/blog/modules/front/blogs/browse.php index dd8b740f..90902ec3 100644 --- a/applications/blog/modules/front/blogs/browse.php +++ b/applications/blog/modules/front/blogs/browse.php @@ -91,11 +91,17 @@ class _browse extends \IPS\Dispatcher\Controller $count = \IPS\blog\Entry::getItemsWithPermission( $where, 'entry_date desc', NULL, 'read', \IPS\Content\Hideable::FILTER_AUTOMATIC, 0, NULL, TRUE, FALSE, FALSE, TRUE ); $entries = \IPS\blog\Entry::getItemsWithPermission( $where, 'entry_date desc', array( ( $perpage * ( $page - 1 ) ), $perpage ), 'read', \IPS\Content\Hideable::FILTER_AUTOMATIC, 0, NULL, TRUE ); + $queryString = 'app=blog&module=blogs&controller=browse'; + if( $category ) + { + $queryString .= '&id=' . $category->_id; + } + $paginationUrl = \IPS\Http\Url::internal( $queryString, 'front', ( $category ) ? 'blog_category' : 'blogs' ); $pagination = array( 'page' => $page, 'pages' => ceil( $count / $perpage ), 'perpage' => $perpage, - 'url' => \IPS\Http\Url::internal( 'app=blog&module=blogs&controller=browse', 'front', 'blogs' ) + 'url' => $paginationUrl ); \IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'grid.css', 'blog', 'front' ) ); diff --git a/applications/blog/modules/front/blogs/entry.php b/applications/blog/modules/front/blogs/entry.php index abad9fdf..1b5d95a9 100644 --- a/applications/blog/modules/front/blogs/entry.php +++ b/applications/blog/modules/front/blogs/entry.php @@ -120,7 +120,8 @@ class _entry extends \IPS\Content\Controller '@type' => "Blog", 'url' => (string) $this->entry->container()->url(), 'name' => $this->entry->container()->_title, - 'description' => strip_tags( $this->entry->container()->description ), + 'description' => \IPS\Member::loggedIn()->language()->addToStack( \IPS\blog\Blog::$titleLangPrefix . $this->entry->container()->_id . \IPS\blog\Blog::$descriptionLangSuffix, TRUE, array( 'striptags' => TRUE, 'escape' => TRUE ) ), + 'commentCount' => $this->entry->container()->_comments, 'interactionStatistic' => array( array( @@ -255,7 +256,19 @@ class _entry extends \IPS\Content\Controller /* Breadcrumb */ \IPS\Output::i()->breadcrumb = array(); - \IPS\Output::i()->breadcrumb['module'] = array( \IPS\Http\Url::internal( 'app=blog', 'front', 'blogs' ), \IPS\Member::loggedIn()->language()->addToStack( '__app_blog' ) ); + if ( $club = $this->entry->container()->club() ) + { + \IPS\core\FrontNavigation::$clubTabActive = TRUE; + \IPS\Output::i()->breadcrumb = array(); + \IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal( 'app=core&module=clubs&controller=directory', 'front', 'clubs_list' ), \IPS\Member::loggedIn()->language()->addToStack('module__core_clubs') ); + \IPS\Output::i()->breadcrumb[] = array( $club->url(), $club->name ); + + } + else + { + \IPS\Output::i()->breadcrumb['module'] = array( \IPS\Http\Url::internal( 'app=blog', 'front', 'blogs' ), \IPS\Member::loggedIn()->language()->addToStack( '__app_blog' ) ); + } + try { diff --git a/applications/blog/modules/front/blogs/view.php b/applications/blog/modules/front/blogs/view.php index fc4b9b22..e93fa213 100644 --- a/applications/blog/modules/front/blogs/view.php +++ b/applications/blog/modules/front/blogs/view.php @@ -128,7 +128,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller if ( \IPS\Member::loggedIn()->member_id ) { - $key = md5( ( \IPS\Member::loggedIn()->members_pass_hash ?: \IPS\Member::loggedIn()->email ) . \IPS\Member::loggedIn()->members_pass_salt ); + $key = \IPS\Member::loggedIn()->getUniqueMemberHash(); \IPS\Output::i()->rssFeeds['blog_rss_title'] = \IPS\Output::i()->rssFeeds['blog_rss_title']->setQueryString( array( 'member' => \IPS\Member::loggedIn()->member_id , 'key' => $key ) ); } @@ -140,7 +140,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller '@type' => "Blog", 'url' => (string) $this->blog->url(), 'name' => $this->blog->_title, - 'description' => strip_tags( $this->blog->description ), + 'description' => $this->blog->member_id ? $this->blog->desc : \IPS\Member::loggedIn()->language()->addToStack( \IPS\blog\Blog::$titleLangPrefix . $this->blog->_id . \IPS\blog\Blog::$descriptionLangSuffix, TRUE, array( 'striptags' => TRUE, 'escape' => TRUE ) ), 'commentCount' => $this->blog->_comments, 'interactionStatistic' => array( array( @@ -187,7 +187,19 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller } \IPS\Output::i()->breadcrumb = array(); - \IPS\Output::i()->breadcrumb['module'] = array( \IPS\Http\Url::internal( 'app=blog', 'front', 'blogs' ), \IPS\Member::loggedIn()->language()->addToStack( '__app_blog' ) ); + if ( $club = $this->blog->club() ) + { + \IPS\core\FrontNavigation::$clubTabActive = TRUE; + \IPS\Output::i()->breadcrumb = array(); + \IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal( 'app=core&module=clubs&controller=directory', 'front', 'clubs_list' ), \IPS\Member::loggedIn()->language()->addToStack('module__core_clubs') ); + \IPS\Output::i()->breadcrumb[] = array( $club->url(), $club->name ); + + } + else + { + \IPS\Output::i()->breadcrumb['module'] = array( \IPS\Http\Url::internal( 'app=blog', 'front', 'blogs' ), \IPS\Member::loggedIn()->language()->addToStack( '__app_blog' ) ); + } + try { diff --git a/applications/blog/setup/upg_106108/data.json b/applications/blog/setup/upg_106108/data.json new file mode 100644 index 00000000..bd0e6c8e --- /dev/null +++ b/applications/blog/setup/upg_106108/data.json @@ -0,0 +1,24 @@ +{ + "id": 106108, + "name": "4.6.0", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106109/data.json b/applications/blog/setup/upg_106109/data.json new file mode 100644 index 00000000..b42f4f16 --- /dev/null +++ b/applications/blog/setup/upg_106109/data.json @@ -0,0 +1,24 @@ +{ + "id": 106109, + "name": "4.6.0", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106110/data.json b/applications/blog/setup/upg_106110/data.json new file mode 100644 index 00000000..e318d8c0 --- /dev/null +++ b/applications/blog/setup/upg_106110/data.json @@ -0,0 +1,24 @@ +{ + "id": 106110, + "name": "4.6.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106111/data.json b/applications/blog/setup/upg_106111/data.json new file mode 100644 index 00000000..5c0715a7 --- /dev/null +++ b/applications/blog/setup/upg_106111/data.json @@ -0,0 +1,24 @@ +{ + "id": 106111, + "name": "4.6.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106112/data.json b/applications/blog/setup/upg_106112/data.json new file mode 100644 index 00000000..5ad3efa5 --- /dev/null +++ b/applications/blog/setup/upg_106112/data.json @@ -0,0 +1,24 @@ +{ + "id": 106112, + "name": "4.6.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106113/data.json b/applications/blog/setup/upg_106113/data.json new file mode 100644 index 00000000..29b524dd --- /dev/null +++ b/applications/blog/setup/upg_106113/data.json @@ -0,0 +1,24 @@ +{ + "id": 106113, + "name": "4.6.2", + "steps": { + "queries": false, + "lang": true, + "theme": true, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106113/lang.json b/applications/blog/setup/upg_106113/lang.json new file mode 100644 index 00000000..70d4c42c --- /dev/null +++ b/applications/blog/setup/upg_106113/lang.json @@ -0,0 +1,14 @@ +{ + "normal": { + "added": [ + "delete_blog_warning" + ], + "edited": [], + "removed": [] + }, + "js": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106113/theme.json b/applications/blog/setup/upg_106113/theme.json new file mode 100644 index 00000000..9b49a4d1 --- /dev/null +++ b/applications/blog/setup/upg_106113/theme.json @@ -0,0 +1,19 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/view\/view" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106114/data.json b/applications/blog/setup/upg_106114/data.json new file mode 100644 index 00000000..916ee2c1 --- /dev/null +++ b/applications/blog/setup/upg_106114/data.json @@ -0,0 +1,24 @@ +{ + "id": 106114, + "name": "4.6.2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106115/data.json b/applications/blog/setup/upg_106115/data.json new file mode 100644 index 00000000..ea4159e2 --- /dev/null +++ b/applications/blog/setup/upg_106115/data.json @@ -0,0 +1,24 @@ +{ + "id": 106115, + "name": "4.6.2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106116/data.json b/applications/blog/setup/upg_106116/data.json new file mode 100644 index 00000000..0c1d3935 --- /dev/null +++ b/applications/blog/setup/upg_106116/data.json @@ -0,0 +1,24 @@ +{ + "id": 106116, + "name": "4.6.3", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106117/data.json b/applications/blog/setup/upg_106117/data.json new file mode 100644 index 00000000..1931c170 --- /dev/null +++ b/applications/blog/setup/upg_106117/data.json @@ -0,0 +1,24 @@ +{ + "id": 106117, + "name": "4.6.3", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106118/data.json b/applications/blog/setup/upg_106118/data.json new file mode 100644 index 00000000..e2390c0a --- /dev/null +++ b/applications/blog/setup/upg_106118/data.json @@ -0,0 +1,24 @@ +{ + "id": 106118, + "name": "4.6.4", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106119/data.json b/applications/blog/setup/upg_106119/data.json new file mode 100644 index 00000000..80deeb47 --- /dev/null +++ b/applications/blog/setup/upg_106119/data.json @@ -0,0 +1,24 @@ +{ + "id": 106119, + "name": "4.6.4", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106120/data.json b/applications/blog/setup/upg_106120/data.json new file mode 100644 index 00000000..fcfb2e60 --- /dev/null +++ b/applications/blog/setup/upg_106120/data.json @@ -0,0 +1,24 @@ +{ + "id": 106120, + "name": "4.6.4", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106121/data.json b/applications/blog/setup/upg_106121/data.json new file mode 100644 index 00000000..578c19d9 --- /dev/null +++ b/applications/blog/setup/upg_106121/data.json @@ -0,0 +1,24 @@ +{ + "id": 106121, + "name": "4.6.4", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106122/data.json b/applications/blog/setup/upg_106122/data.json new file mode 100644 index 00000000..e6f5a16d --- /dev/null +++ b/applications/blog/setup/upg_106122/data.json @@ -0,0 +1,24 @@ +{ + "id": 106122, + "name": "4.6.5", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106123/data.json b/applications/blog/setup/upg_106123/data.json new file mode 100644 index 00000000..1c12db6d --- /dev/null +++ b/applications/blog/setup/upg_106123/data.json @@ -0,0 +1,24 @@ +{ + "id": 106123, + "name": "4.6.5.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106123/emailTemplates.json b/applications/blog/setup/upg_106123/emailTemplates.json new file mode 100644 index 00000000..95fd62cb --- /dev/null +++ b/applications/blog/setup/upg_106123/emailTemplates.json @@ -0,0 +1,8 @@ +{ + "added": [], + "edited": [ + "digests__item", + "digests__comment" + ], + "removed": [] +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106123/javascript.json b/applications/blog/setup/upg_106123/javascript.json new file mode 100644 index 00000000..a74207a5 --- /dev/null +++ b/applications/blog/setup/upg_106123/javascript.json @@ -0,0 +1,22 @@ +{ + "files": { + "added": [], + "edited": [ + "blog\/front\/controllers\/browse\/ips.browse.grid.js", + "blog\/front\/controllers\/browse\/ips.browse.list.js", + "blog\/front\/controllers\/view\/ips.view.manageCategories.js", + "blog\/front\/templates\/ips.templates.view.js" + ], + "removed": [] + }, + "orders": { + "added": [], + "edited": [ + "global\/\/dev\/js\/\/framework\/", + "global\/\/dev\/js\/\/library\/", + "global\/\/dev\/js\/\/library\/\/jquery", + "global\/\/dev\/js\/\/library\/\/linkify" + ], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106123/theme.json b/applications/blog/setup/upg_106123/theme.json new file mode 100644 index 00000000..eb88b3e0 --- /dev/null +++ b/applications/blog/setup/upg_106123/theme.json @@ -0,0 +1,63 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/browse\/categories", + "front\/browse\/featuredEntries", + "front\/browse\/index", + "front\/browse\/indexButtons", + "front\/browse\/indexGrid", + "front\/browse\/indexGridEntry", + "front\/browse\/rows", + "admin\/dashboard\/overview", + "front\/global\/commentTableHeader", + "front\/global\/embedBlogs", + "front\/global\/embedEntry", + "front\/global\/embedEntryComment", + "front\/global\/embedEntryItemSnippet", + "front\/global\/profileBlogRows", + "front\/global\/profileBlogTable", + "front\/global\/rows", + "admin\/livesearch\/blog", + "front\/submit\/blogSelector", + "front\/submit\/createBlog", + "front\/submit\/submit", + "front\/submit\/submitFormTemplate", + "front\/view\/blogHeader", + "front\/view\/blogSidebar", + "front\/view\/blogTable", + "front\/view\/blogViewLarge", + "front\/view\/blogViewMedium", + "front\/view\/categories", + "front\/view\/comments", + "front\/view\/coverPhotoOverlay", + "front\/view\/entry", + "front\/view\/manageCategories", + "front\/view\/noEntries", + "front\/view\/rows", + "front\/view\/rowsGrid", + "front\/view\/view", + "front\/widgets\/blogCommentFeed", + "front\/widgets\/blogs", + "front\/widgets\/blogStatistics", + "front\/widgets\/entryFeed", + "front\/widgets\/entryRow" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [ + "front\/blog.css", + "front\/embed.css", + "front\/grid.css", + "front\/profile.css" + ], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106125/data.json b/applications/blog/setup/upg_106125/data.json new file mode 100644 index 00000000..bc40575f --- /dev/null +++ b/applications/blog/setup/upg_106125/data.json @@ -0,0 +1,24 @@ +{ + "id": 106125, + "name": "4.6.5.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106125/emailTemplates.json b/applications/blog/setup/upg_106125/emailTemplates.json new file mode 100644 index 00000000..95fd62cb --- /dev/null +++ b/applications/blog/setup/upg_106125/emailTemplates.json @@ -0,0 +1,8 @@ +{ + "added": [], + "edited": [ + "digests__item", + "digests__comment" + ], + "removed": [] +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106125/javascript.json b/applications/blog/setup/upg_106125/javascript.json new file mode 100644 index 00000000..5dfbae2f --- /dev/null +++ b/applications/blog/setup/upg_106125/javascript.json @@ -0,0 +1,16 @@ +{ + "files": { + "added": [], + "edited": [ + "blog\/front\/controllers\/browse\/ips.browse.grid.js", + "blog\/front\/controllers\/view\/ips.view.manageCategories.js", + "blog\/front\/templates\/ips.templates.view.js" + ], + "removed": [] + }, + "orders": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106125/theme.json b/applications/blog/setup/upg_106125/theme.json new file mode 100644 index 00000000..5e5d3c15 --- /dev/null +++ b/applications/blog/setup/upg_106125/theme.json @@ -0,0 +1,62 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/browse\/categories", + "front\/browse\/featuredEntries", + "front\/browse\/index", + "front\/browse\/indexButtons", + "front\/browse\/indexGrid", + "front\/browse\/indexGridEntry", + "front\/browse\/rows", + "admin\/dashboard\/overview", + "front\/global\/commentTableHeader", + "front\/global\/embedBlogs", + "front\/global\/embedEntry", + "front\/global\/embedEntryComment", + "front\/global\/embedEntryItemSnippet", + "front\/global\/profileBlogRows", + "front\/global\/profileBlogTable", + "front\/global\/rows", + "admin\/livesearch\/blog", + "front\/submit\/blogSelector", + "front\/submit\/createBlog", + "front\/submit\/submit", + "front\/submit\/submitFormTemplate", + "front\/view\/blogHeader", + "front\/view\/blogSidebar", + "front\/view\/blogTable", + "front\/view\/blogViewLarge", + "front\/view\/blogViewMedium", + "front\/view\/categories", + "front\/view\/comments", + "front\/view\/coverPhotoOverlay", + "front\/view\/entry", + "front\/view\/manageCategories", + "front\/view\/noEntries", + "front\/view\/rows", + "front\/view\/rowsGrid", + "front\/view\/view", + "front\/widgets\/blogCommentFeed", + "front\/widgets\/blogs", + "front\/widgets\/blogStatistics", + "front\/widgets\/entryFeed", + "front\/widgets\/entryRow" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [ + "front\/blog.css", + "front\/grid.css", + "front\/profile.css" + ], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106126/data.json b/applications/blog/setup/upg_106126/data.json new file mode 100644 index 00000000..27629fee --- /dev/null +++ b/applications/blog/setup/upg_106126/data.json @@ -0,0 +1,24 @@ +{ + "id": 106126, + "name": "4.6.5.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106126/emailTemplates.json b/applications/blog/setup/upg_106126/emailTemplates.json new file mode 100644 index 00000000..95fd62cb --- /dev/null +++ b/applications/blog/setup/upg_106126/emailTemplates.json @@ -0,0 +1,8 @@ +{ + "added": [], + "edited": [ + "digests__item", + "digests__comment" + ], + "removed": [] +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106126/javascript.json b/applications/blog/setup/upg_106126/javascript.json new file mode 100644 index 00000000..5dfbae2f --- /dev/null +++ b/applications/blog/setup/upg_106126/javascript.json @@ -0,0 +1,16 @@ +{ + "files": { + "added": [], + "edited": [ + "blog\/front\/controllers\/browse\/ips.browse.grid.js", + "blog\/front\/controllers\/view\/ips.view.manageCategories.js", + "blog\/front\/templates\/ips.templates.view.js" + ], + "removed": [] + }, + "orders": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106126/theme.json b/applications/blog/setup/upg_106126/theme.json new file mode 100644 index 00000000..5e5d3c15 --- /dev/null +++ b/applications/blog/setup/upg_106126/theme.json @@ -0,0 +1,62 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/browse\/categories", + "front\/browse\/featuredEntries", + "front\/browse\/index", + "front\/browse\/indexButtons", + "front\/browse\/indexGrid", + "front\/browse\/indexGridEntry", + "front\/browse\/rows", + "admin\/dashboard\/overview", + "front\/global\/commentTableHeader", + "front\/global\/embedBlogs", + "front\/global\/embedEntry", + "front\/global\/embedEntryComment", + "front\/global\/embedEntryItemSnippet", + "front\/global\/profileBlogRows", + "front\/global\/profileBlogTable", + "front\/global\/rows", + "admin\/livesearch\/blog", + "front\/submit\/blogSelector", + "front\/submit\/createBlog", + "front\/submit\/submit", + "front\/submit\/submitFormTemplate", + "front\/view\/blogHeader", + "front\/view\/blogSidebar", + "front\/view\/blogTable", + "front\/view\/blogViewLarge", + "front\/view\/blogViewMedium", + "front\/view\/categories", + "front\/view\/comments", + "front\/view\/coverPhotoOverlay", + "front\/view\/entry", + "front\/view\/manageCategories", + "front\/view\/noEntries", + "front\/view\/rows", + "front\/view\/rowsGrid", + "front\/view\/view", + "front\/widgets\/blogCommentFeed", + "front\/widgets\/blogs", + "front\/widgets\/blogStatistics", + "front\/widgets\/entryFeed", + "front\/widgets\/entryRow" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [ + "front\/blog.css", + "front\/grid.css", + "front\/profile.css" + ], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106127/data.json b/applications/blog/setup/upg_106127/data.json new file mode 100644 index 00000000..0e6618af --- /dev/null +++ b/applications/blog/setup/upg_106127/data.json @@ -0,0 +1,24 @@ +{ + "id": 106127, + "name": "4.6.5.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106128/data.json b/applications/blog/setup/upg_106128/data.json new file mode 100644 index 00000000..9339d3ef --- /dev/null +++ b/applications/blog/setup/upg_106128/data.json @@ -0,0 +1,24 @@ +{ + "id": 106128, + "name": "4.6.5.1", + "steps": { + "queries": false, + "lang": false, + "theme": true, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106128/theme.json b/applications/blog/setup/upg_106128/theme.json new file mode 100644 index 00000000..fbdd1456 --- /dev/null +++ b/applications/blog/setup/upg_106128/theme.json @@ -0,0 +1,19 @@ +{ + "html": { + "added": [], + "edited": [], + "removed": [] + }, + "css": { + "added": [], + "edited": [ + "front\/embed.css" + ], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106129/data.json b/applications/blog/setup/upg_106129/data.json new file mode 100644 index 00000000..5c3c64cd --- /dev/null +++ b/applications/blog/setup/upg_106129/data.json @@ -0,0 +1,24 @@ +{ + "id": 106129, + "name": "4.6.5.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106130/data.json b/applications/blog/setup/upg_106130/data.json new file mode 100644 index 00000000..07270ae0 --- /dev/null +++ b/applications/blog/setup/upg_106130/data.json @@ -0,0 +1,24 @@ +{ + "id": 106130, + "name": "4.6.5.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106131/data.json b/applications/blog/setup/upg_106131/data.json new file mode 100644 index 00000000..9a849201 --- /dev/null +++ b/applications/blog/setup/upg_106131/data.json @@ -0,0 +1,24 @@ +{ + "id": 106131, + "name": "4.6.5.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106132/data.json b/applications/blog/setup/upg_106132/data.json new file mode 100644 index 00000000..9399ebab --- /dev/null +++ b/applications/blog/setup/upg_106132/data.json @@ -0,0 +1,24 @@ +{ + "id": 106132, + "name": "4.6.6", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106133/data.json b/applications/blog/setup/upg_106133/data.json new file mode 100644 index 00000000..b5590803 --- /dev/null +++ b/applications/blog/setup/upg_106133/data.json @@ -0,0 +1,24 @@ +{ + "id": 106133, + "name": "4.6.6", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106134/data.json b/applications/blog/setup/upg_106134/data.json new file mode 100644 index 00000000..8b924bcb --- /dev/null +++ b/applications/blog/setup/upg_106134/data.json @@ -0,0 +1,24 @@ +{ + "id": 106134, + "name": "4.6.7 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106135/data.json b/applications/blog/setup/upg_106135/data.json new file mode 100644 index 00000000..4dbd7e19 --- /dev/null +++ b/applications/blog/setup/upg_106135/data.json @@ -0,0 +1,24 @@ +{ + "id": 106135, + "name": "4.6.7 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106136/data.json b/applications/blog/setup/upg_106136/data.json new file mode 100644 index 00000000..d195dc1d --- /dev/null +++ b/applications/blog/setup/upg_106136/data.json @@ -0,0 +1,24 @@ +{ + "id": 106136, + "name": "4.6.7", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106137/data.json b/applications/blog/setup/upg_106137/data.json new file mode 100644 index 00000000..6b84daaf --- /dev/null +++ b/applications/blog/setup/upg_106137/data.json @@ -0,0 +1,24 @@ +{ + "id": 106137, + "name": "4.6.7", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106138/data.json b/applications/blog/setup/upg_106138/data.json new file mode 100644 index 00000000..13fbd904 --- /dev/null +++ b/applications/blog/setup/upg_106138/data.json @@ -0,0 +1,24 @@ +{ + "id": 106138, + "name": "4.6.8 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": true, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106138/theme.json b/applications/blog/setup/upg_106138/theme.json new file mode 100644 index 00000000..4d72af93 --- /dev/null +++ b/applications/blog/setup/upg_106138/theme.json @@ -0,0 +1,19 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/view\/blogTable" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106139/data.json b/applications/blog/setup/upg_106139/data.json new file mode 100644 index 00000000..6aaf8d17 --- /dev/null +++ b/applications/blog/setup/upg_106139/data.json @@ -0,0 +1,24 @@ +{ + "id": 106139, + "name": "4.6.8 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106140/data.json b/applications/blog/setup/upg_106140/data.json new file mode 100644 index 00000000..7530b998 --- /dev/null +++ b/applications/blog/setup/upg_106140/data.json @@ -0,0 +1,24 @@ +{ + "id": 106140, + "name": "4.6.8", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106141/data.json b/applications/blog/setup/upg_106141/data.json new file mode 100644 index 00000000..679e06da --- /dev/null +++ b/applications/blog/setup/upg_106141/data.json @@ -0,0 +1,24 @@ +{ + "id": 106141, + "name": "4.6.8", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106142/data.json b/applications/blog/setup/upg_106142/data.json new file mode 100644 index 00000000..d6759827 --- /dev/null +++ b/applications/blog/setup/upg_106142/data.json @@ -0,0 +1,24 @@ +{ + "id": 106142, + "name": "4.6.8", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106143/data.json b/applications/blog/setup/upg_106143/data.json new file mode 100644 index 00000000..2744f0f9 --- /dev/null +++ b/applications/blog/setup/upg_106143/data.json @@ -0,0 +1,24 @@ +{ + "id": 106143, + "name": "4.6.8", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106144/data.json b/applications/blog/setup/upg_106144/data.json new file mode 100644 index 00000000..b48f8ad9 --- /dev/null +++ b/applications/blog/setup/upg_106144/data.json @@ -0,0 +1,24 @@ +{ + "id": 106144, + "name": "4.6.9 Beta 1", + "steps": { + "queries": false, + "lang": true, + "theme": true, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106144/lang.json b/applications/blog/setup/upg_106144/lang.json new file mode 100644 index 00000000..280f415b --- /dev/null +++ b/applications/blog/setup/upg_106144/lang.json @@ -0,0 +1,14 @@ +{ + "normal": { + "added": [ + "editor__blog_Categories" + ], + "edited": [], + "removed": [] + }, + "js": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106144/theme.json b/applications/blog/setup/upg_106144/theme.json new file mode 100644 index 00000000..36ef8fff --- /dev/null +++ b/applications/blog/setup/upg_106144/theme.json @@ -0,0 +1,20 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/browse\/indexButtons", + "front\/view\/view" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106145/data.json b/applications/blog/setup/upg_106145/data.json new file mode 100644 index 00000000..e9da8d80 --- /dev/null +++ b/applications/blog/setup/upg_106145/data.json @@ -0,0 +1,24 @@ +{ + "id": 106145, + "name": "4.6.9 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106146/data.json b/applications/blog/setup/upg_106146/data.json new file mode 100644 index 00000000..798818b9 --- /dev/null +++ b/applications/blog/setup/upg_106146/data.json @@ -0,0 +1,24 @@ +{ + "id": 106146, + "name": "4.6.9 Beta 3", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106147/data.json b/applications/blog/setup/upg_106147/data.json new file mode 100644 index 00000000..1402f6fc --- /dev/null +++ b/applications/blog/setup/upg_106147/data.json @@ -0,0 +1,24 @@ +{ + "id": 106147, + "name": "4.6.9", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106148/data.json b/applications/blog/setup/upg_106148/data.json new file mode 100644 index 00000000..e21e26f3 --- /dev/null +++ b/applications/blog/setup/upg_106148/data.json @@ -0,0 +1,24 @@ +{ + "id": 106148, + "name": "4.6.9", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106149/data.json b/applications/blog/setup/upg_106149/data.json new file mode 100644 index 00000000..066fee3d --- /dev/null +++ b/applications/blog/setup/upg_106149/data.json @@ -0,0 +1,24 @@ +{ + "id": 106149, + "name": "4.6.10 Beta 1", + "steps": { + "queries": false, + "lang": true, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106149/lang.json b/applications/blog/setup/upg_106149/lang.json new file mode 100644 index 00000000..214edd26 --- /dev/null +++ b/applications/blog/setup/upg_106149/lang.json @@ -0,0 +1,14 @@ +{ + "normal": { + "added": [ + "webhook_blogBlog_create" + ], + "edited": [], + "removed": [] + }, + "js": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106150/data.json b/applications/blog/setup/upg_106150/data.json new file mode 100644 index 00000000..33c33b54 --- /dev/null +++ b/applications/blog/setup/upg_106150/data.json @@ -0,0 +1,24 @@ +{ + "id": 106150, + "name": "4.6.10 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106151/data.json b/applications/blog/setup/upg_106151/data.json new file mode 100644 index 00000000..51b4493c --- /dev/null +++ b/applications/blog/setup/upg_106151/data.json @@ -0,0 +1,24 @@ +{ + "id": 106151, + "name": "4.6.10", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106152/data.json b/applications/blog/setup/upg_106152/data.json new file mode 100644 index 00000000..ff032303 --- /dev/null +++ b/applications/blog/setup/upg_106152/data.json @@ -0,0 +1,24 @@ +{ + "id": 106152, + "name": "4.6.10", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106153/data.json b/applications/blog/setup/upg_106153/data.json new file mode 100644 index 00000000..0e73587c --- /dev/null +++ b/applications/blog/setup/upg_106153/data.json @@ -0,0 +1,24 @@ +{ + "id": 106153, + "name": "4.6.10", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106154/data.json b/applications/blog/setup/upg_106154/data.json new file mode 100644 index 00000000..34aed906 --- /dev/null +++ b/applications/blog/setup/upg_106154/data.json @@ -0,0 +1,24 @@ +{ + "id": 106154, + "name": "4.6.10", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106155/data.json b/applications/blog/setup/upg_106155/data.json new file mode 100644 index 00000000..124e8a55 --- /dev/null +++ b/applications/blog/setup/upg_106155/data.json @@ -0,0 +1,24 @@ +{ + "id": 106155, + "name": "4.6.10", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106156/data.json b/applications/blog/setup/upg_106156/data.json new file mode 100644 index 00000000..33d35339 --- /dev/null +++ b/applications/blog/setup/upg_106156/data.json @@ -0,0 +1,24 @@ +{ + "id": 106156, + "name": "4.6.11 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106157/data.json b/applications/blog/setup/upg_106157/data.json new file mode 100644 index 00000000..963512e0 --- /dev/null +++ b/applications/blog/setup/upg_106157/data.json @@ -0,0 +1,24 @@ +{ + "id": 106157, + "name": "4.6.11 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106158/data.json b/applications/blog/setup/upg_106158/data.json new file mode 100644 index 00000000..6726feef --- /dev/null +++ b/applications/blog/setup/upg_106158/data.json @@ -0,0 +1,24 @@ +{ + "id": 106158, + "name": "4.6.11 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106159/data.json b/applications/blog/setup/upg_106159/data.json new file mode 100644 index 00000000..de4784fb --- /dev/null +++ b/applications/blog/setup/upg_106159/data.json @@ -0,0 +1,24 @@ +{ + "id": 106159, + "name": "4.6.11", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106160/data.json b/applications/blog/setup/upg_106160/data.json new file mode 100644 index 00000000..bfe182fb --- /dev/null +++ b/applications/blog/setup/upg_106160/data.json @@ -0,0 +1,24 @@ +{ + "id": 106160, + "name": "4.6.11", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106161/data.json b/applications/blog/setup/upg_106161/data.json new file mode 100644 index 00000000..57881f58 --- /dev/null +++ b/applications/blog/setup/upg_106161/data.json @@ -0,0 +1,24 @@ +{ + "id": 106161, + "name": "4.6.12", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106162/data.json b/applications/blog/setup/upg_106162/data.json new file mode 100644 index 00000000..0437d134 --- /dev/null +++ b/applications/blog/setup/upg_106162/data.json @@ -0,0 +1,24 @@ +{ + "id": 106162, + "name": "4.6.12 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106163/data.json b/applications/blog/setup/upg_106163/data.json new file mode 100644 index 00000000..f112f968 --- /dev/null +++ b/applications/blog/setup/upg_106163/data.json @@ -0,0 +1,24 @@ +{ + "id": 106163, + "name": "4.6.12 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106164/data.json b/applications/blog/setup/upg_106164/data.json new file mode 100644 index 00000000..1d2f3fbd --- /dev/null +++ b/applications/blog/setup/upg_106164/data.json @@ -0,0 +1,24 @@ +{ + "id": 106164, + "name": "4.6.12", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106165/data.json b/applications/blog/setup/upg_106165/data.json new file mode 100644 index 00000000..56ccc46a --- /dev/null +++ b/applications/blog/setup/upg_106165/data.json @@ -0,0 +1,24 @@ +{ + "id": 106165, + "name": "4.6.12", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106166/data.json b/applications/blog/setup/upg_106166/data.json new file mode 100644 index 00000000..cc308a0c --- /dev/null +++ b/applications/blog/setup/upg_106166/data.json @@ -0,0 +1,24 @@ +{ + "id": 106166, + "name": "4.6.12", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106167/data.json b/applications/blog/setup/upg_106167/data.json new file mode 100644 index 00000000..51cecc15 --- /dev/null +++ b/applications/blog/setup/upg_106167/data.json @@ -0,0 +1,24 @@ +{ + "id": 106167, + "name": "4.6.12.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_106168/data.json b/applications/blog/setup/upg_106168/data.json new file mode 100644 index 00000000..a8174382 --- /dev/null +++ b/applications/blog/setup/upg_106168/data.json @@ -0,0 +1,24 @@ +{ + "id": 106168, + "name": "4.6.13 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107000/data.json b/applications/blog/setup/upg_107000/data.json new file mode 100644 index 00000000..95e0b2be --- /dev/null +++ b/applications/blog/setup/upg_107000/data.json @@ -0,0 +1,24 @@ +{ + "id": 107000, + "name": "4.7.0 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107001/data.json b/applications/blog/setup/upg_107001/data.json new file mode 100644 index 00000000..ea57690a --- /dev/null +++ b/applications/blog/setup/upg_107001/data.json @@ -0,0 +1,24 @@ +{ + "id": 107001, + "name": "4.7.0 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107002/data.json b/applications/blog/setup/upg_107002/data.json new file mode 100644 index 00000000..bba7aacc --- /dev/null +++ b/applications/blog/setup/upg_107002/data.json @@ -0,0 +1,24 @@ +{ + "id": 107002, + "name": "4.7.0 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": true, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107002/theme.json b/applications/blog/setup/upg_107002/theme.json new file mode 100644 index 00000000..5256a054 --- /dev/null +++ b/applications/blog/setup/upg_107002/theme.json @@ -0,0 +1,19 @@ +{ + "html": { + "added": [], + "edited": [], + "removed": [] + }, + "css": { + "added": [], + "edited": [ + "front\/blog.css" + ], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107003/data.json b/applications/blog/setup/upg_107003/data.json new file mode 100644 index 00000000..6e1f72c1 --- /dev/null +++ b/applications/blog/setup/upg_107003/data.json @@ -0,0 +1,24 @@ +{ + "id": 107003, + "name": "4.7.0 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107004/data.json b/applications/blog/setup/upg_107004/data.json new file mode 100644 index 00000000..f788d204 --- /dev/null +++ b/applications/blog/setup/upg_107004/data.json @@ -0,0 +1,24 @@ +{ + "id": 107004, + "name": "4.7.0 Beta 3", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107005/data.json b/applications/blog/setup/upg_107005/data.json new file mode 100644 index 00000000..c08ad065 --- /dev/null +++ b/applications/blog/setup/upg_107005/data.json @@ -0,0 +1,24 @@ +{ + "id": 107005, + "name": "4.7.0 Beta 4", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107006/data.json b/applications/blog/setup/upg_107006/data.json new file mode 100644 index 00000000..05b190ce --- /dev/null +++ b/applications/blog/setup/upg_107006/data.json @@ -0,0 +1,24 @@ +{ + "id": 107006, + "name": "4.7.0 Beta 4.1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107007/data.json b/applications/blog/setup/upg_107007/data.json new file mode 100644 index 00000000..234d638f --- /dev/null +++ b/applications/blog/setup/upg_107007/data.json @@ -0,0 +1,24 @@ +{ + "id": 107007, + "name": "4.7.0 Beta 5", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107008/data.json b/applications/blog/setup/upg_107008/data.json new file mode 100644 index 00000000..cdec86cc --- /dev/null +++ b/applications/blog/setup/upg_107008/data.json @@ -0,0 +1,24 @@ +{ + "id": 107008, + "name": "4.7.0 Beta 6", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107009/data.json b/applications/blog/setup/upg_107009/data.json new file mode 100644 index 00000000..6588bc9e --- /dev/null +++ b/applications/blog/setup/upg_107009/data.json @@ -0,0 +1,24 @@ +{ + "id": 107009, + "name": "4.7.0 Beta 7", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107010/data.json b/applications/blog/setup/upg_107010/data.json new file mode 100644 index 00000000..21765b43 --- /dev/null +++ b/applications/blog/setup/upg_107010/data.json @@ -0,0 +1,24 @@ +{ + "id": 107010, + "name": "4.7.0 Beta 8", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107011/data.json b/applications/blog/setup/upg_107011/data.json new file mode 100644 index 00000000..583dea34 --- /dev/null +++ b/applications/blog/setup/upg_107011/data.json @@ -0,0 +1,24 @@ +{ + "id": 107011, + "name": "4.7.0 Beta 9", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107012/data.json b/applications/blog/setup/upg_107012/data.json new file mode 100644 index 00000000..5e5fa2dd --- /dev/null +++ b/applications/blog/setup/upg_107012/data.json @@ -0,0 +1,24 @@ +{ + "id": 107012, + "name": "4.7.0 Beta 10", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107013/data.json b/applications/blog/setup/upg_107013/data.json new file mode 100644 index 00000000..dc037749 --- /dev/null +++ b/applications/blog/setup/upg_107013/data.json @@ -0,0 +1,24 @@ +{ + "id": 107013, + "name": "4.7.0", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107014/data.json b/applications/blog/setup/upg_107014/data.json new file mode 100644 index 00000000..dbc05476 --- /dev/null +++ b/applications/blog/setup/upg_107014/data.json @@ -0,0 +1,24 @@ +{ + "id": 107014, + "name": "4.7.0", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "whatsnew": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/sources/Blog/Blog.php b/applications/blog/sources/Blog/Blog.php index dc1ef963..3eea49c7 100644 --- a/applications/blog/sources/Blog/Blog.php +++ b/applications/blog/sources/Blog/Blog.php @@ -245,6 +245,10 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E case 'view': case 'read': default: + if( $this->isPublic() ) + { + return TRUE; + } return $club->canRead( $member ); } } @@ -1183,7 +1187,7 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E public function coverPhoto() { $photo = parent::coverPhoto(); - $photo->overlay = \IPS\Theme::i()->getTemplate( 'view', 'blog' )->coverPhotoOverlay( $this ); + $photo->overlay = \IPS\Theme::i()->getTemplate('view', 'blog')->coverPhotoOverlay($this); return $photo; } @@ -1305,7 +1309,7 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E * @param \IPS\Helpers\Form $form Form object * @return void */ - public function clubForm( \IPS\Helpers\Form $form ) + public function clubForm( \IPS\Helpers\Form $form, \IPS\Member\Club $club ) { \IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'front_view.js', 'blog', 'front' ) ); @@ -1317,6 +1321,11 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E { $form->add( new \IPS\Helpers\Form\YesNo( 'blog_enable_rss', $this->id ? $this->settings['allowrss'] : TRUE ) ); } + + if( $club->type == 'closed' ) + { + $form->add( new \IPS\Helpers\Form\YesNo( 'club_node_public', $this->id ? $this->isPublic() : FALSE ) ); + } /* Categories */ if ( $this->id ) @@ -1432,4 +1441,36 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E { return $this->last_edate ? \IPS\DateTime::ts( $this->last_edate ) : NULL; } -} \ No newline at end of file + + /** + * @brief The class of the ACP \IPS\Node\Controller that manages this node type + */ + protected static $acpController = "IPS\\calendar\\modules\\admin\\calendars\\calendars"; + + + /** + * Get the URL of the AdminCP page for this node + * + * @param string|NULL $do The "do" query parameter of the url (e.g. 'form', 'permissions', etc). + * + * @return \IPS\Http\Url | NULL + */ + public function acpUrl( $do="form" ) + { + try + { + $parentCol = static::$parentNodeColumnId; + $parent = \IPS\blog\Category::load( $this->$parentCol ); + $url = parent::acpUrl( $do ); + if ( $url !== NULL ) + { + $this->_acpUrls[$do] = $url->setQueryString([ 'subnode' => $this->$parentCol ]); + } + } + catch ( \OutOfRangeException $e ) + { + $this->_acpUrls[$do] = NULL; + } + return $this->_acpUrls[$do]; + } +} diff --git a/applications/blog/sources/Category/Category.php b/applications/blog/sources/Category/Category.php index ba59aaeb..db7b1c32 100644 --- a/applications/blog/sources/Category/Category.php +++ b/applications/blog/sources/Category/Category.php @@ -100,6 +100,11 @@ class _Category extends \IPS\Node\Model 'prefix' => 'categories_', ); + /** + * @brief The class of the ACP \IPS\Node\Controller that manages this node type + */ + protected static $acpController = "IPS\\blog\\modules\\admin\\blogs\\blogs"; + /** * [Node] Add/Edit Form * @@ -250,6 +255,11 @@ class _Category extends \IPS\Node\Model 'class' => \get_class( $this ), ); + if ( \IPS\IPS::classUsesTrait( \get_called_class(), 'IPS\Content\ClubContainer' ) AND $this->club() ) + { + $return['public'] = ( $this->isPublic() ) ? 1 : 0; + } + return $return; } diff --git a/applications/blog/sources/Entry/Comment.php b/applications/blog/sources/Entry/Comment.php index f4310fb0..962eb72c 100644 --- a/applications/blog/sources/Entry/Comment.php +++ b/applications/blog/sources/Entry/Comment.php @@ -81,6 +81,11 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory, * @brief [Content] Key for hide reasons */ public static $hideLogKey = 'blog-entries'; + + /** + * @brief Whether to track the sentiment scores in cloud_sentiment_scores for this content + */ + public $trackSentimentScore = true; /** * Get items with permission check diff --git a/applications/blog/sources/Entry/Entry.php b/applications/blog/sources/Entry/Entry.php index 3ada0a8e..191bfe27 100644 --- a/applications/blog/sources/Entry/Entry.php +++ b/applications/blog/sources/Entry/Entry.php @@ -155,6 +155,11 @@ class _Entry extends \IPS\Content\Item implements * @brief Use a default cover photo */ public static $coverPhotoDefault = true; + + /** + * @brief Whether to track the sentiment scores in cloud_sentiment_scores for this content + */ + public $trackSentimentScore = true; /** * Set the title @@ -450,7 +455,7 @@ class _Entry extends \IPS\Content\Item implements } $return['blog_entry_new_category'] = new \IPS\Helpers\Form\Text( 'blog_entry_new_category', NULL, TRUE, array(), NULL, NULL, NULL, "blog_entry_new_category" ); - $return['image'] = new \IPS\Helpers\Form\Upload( 'blog_entry_cover_photo', ( ( $item AND $item->cover_photo ) ? \IPS\File::get( 'blog_Entries', $item->cover_photo ) : NULL ), FALSE, array( 'storageExtension' => 'blog_Entries', 'allowStockPhotos' => TRUE, 'image' => array( 'maxWidth' => 4800, 'maxHeight' => 4800 ) ) ); + $return['image'] = new \IPS\Helpers\Form\Upload( 'blog_entry_cover_photo', ( ( $item AND $item->cover_photo ) ? \IPS\File::get( 'blog_Entries', $item->cover_photo ) : NULL ), FALSE, array( 'storageExtension' => 'blog_Entries', 'allowStockPhotos' => TRUE, 'image' => array( 'maxWidth' => 4800, 'maxHeight' => 4800 ), 'canBeModerated' => TRUE ) ); $return['publish'] = new \IPS\Helpers\Form\YesNo( 'blog_entry_publish', $item ? $item->status : TRUE, FALSE, array( 'togglesOn' => array( 'blog_entry_date' ) ) ); @@ -496,7 +501,7 @@ class _Entry extends \IPS\Content\Item implements } $this->content = $values['blog_entry_content']; - $sendFilterNotifications = $this->checkProfanityFilters( FALSE, $new ); + $sendFilterNotifications = $this->checkProfanityFilters( FALSE, !$new, NULL, NULL, 'blog_Entries', $new ? ['blog-entry-' . $this->container()->id] : NULL, $values['blog_entry_cover_photo'] ? [ $values['blog_entry_cover_photo'] ] : [] ); if ( !$new AND $sendFilterNotifications === FALSE ) { @@ -525,6 +530,7 @@ class _Entry extends \IPS\Content\Item implements if ( $this->date > time() ) { $this->status = 'draft'; + $this->publish_date = $this->date; } if( $values['entry_category_choice'] == 1 and $values['entry_category_id'] ) @@ -962,7 +968,7 @@ class _Entry extends \IPS\Content\Item implements $attachments[] = array( 'core_Clubs' => $club->cover_photo ); } - return \count( $attachments ) ? $attachments : NULL; + return \count( $attachments ) ? \array_slice( $attachments, 0, $limit ) : NULL; } /** diff --git a/applications/calendar/Application.php b/applications/calendar/Application.php index 1c935d4b..b748e48f 100644 --- a/applications/calendar/Application.php +++ b/applications/calendar/Application.php @@ -30,7 +30,7 @@ class _Application extends \IPS\Application if( \IPS\Request::i()->member ) { $member = \IPS\Member::load( \IPS\Request::i()->member ); - if( !\IPS\Login::compareHashes( md5( ( $member->members_pass_hash ?: $member->email ) . $member->members_pass_salt ), (string) \IPS\Request::i()->key ) ) + if( !\IPS\Login::compareHashes( $member->getUniqueMemberHash(), (string) \IPS\Request::i()->key ) ) { \IPS\Output::i()->error( 'node_error', '2L217/1', 404, '' ); } @@ -189,14 +189,18 @@ class _Application extends \IPS\Application } /** - * Return an array of specific links to add to the sitemap + * Returns a list of all existing webhooks and their payload in this app. * - * @return array + * @return array */ - public function sitemapLinks() + public function getWebhooks() : array { - return array( - \IPS\Http\Url::internal( 'app=calendar&module=calendar&controller=view', 'front', 'calendar' ), - ); + return array_merge( [ + 'calendarEvent_rsvp' => [ + 'event' => \IPS\calendar\Event::class, + 'action' => "string with the state (attending/etc..)", + 'attendee' => \IPS\Member::class + ] + ],parent::getWebhooks()); } } \ No newline at end of file diff --git a/applications/calendar/api/comments.php b/applications/calendar/api/comments.php index 87e3069a..1c6f0f9a 100644 --- a/applications/calendar/api/comments.php +++ b/applications/calendar/api/comments.php @@ -91,6 +91,7 @@ class _comments extends \IPS\Content\Api\CommentController * @apiparam datetime date The date/time that should be used for the comment date. If not provided, will use the current date/time. Ignored for requests using an OAuth Access Token for a particular member * @apiparam string ip_address The IP address that should be stored for the comment. If not provided, will use the IP address from the API request. Ignored for requests using an OAuth Access Token for a particular member * @apiparam int hidden 0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator) + * @apiparam bool anonymous If 1, the item will be posted anonymously. * @throws 2L297/3 INVALID_ID The comment ID does not exist * @throws 1L297/4 NO_AUTHOR The author ID does not exist * @throws 1L297/5 NO_CONTENT No content was supplied @@ -130,8 +131,15 @@ class _comments extends \IPS\Content\Api\CommentController } else { - $author = new \IPS\Member; - $author->name = \IPS\Request::i()->author_name; + if ( \IPS\Request::i()->author === 0 ) + { + $author = new \IPS\Member; + $author->name = \IPS\Request::i()->author_name; + } + else + { + throw new \IPS\Api\Exception( 'NO_AUTHOR', '1L297/4', 400 ); + } } } @@ -155,6 +163,7 @@ class _comments extends \IPS\Content\Api\CommentController * @apiparam string author_name If author is 0, the guest name that should be used * @apiparam string content The comment content as HTML (e.g. "

    This is a comment.

    "). Will be sanatized for requests using an OAuth Access Token for a particular member; will be saved unaltered for requests made using an API Key or the Client Credentials Grant Type. * @apiparam int hidden 1/0 indicating if the topic should be hidden + * @apiparam bool anonymous If 1, the item will be posted anonymously. * @throws 2L297/6 INVALID_ID The comment ID does not exist or the authorized user does not have permission to view it * @throws 1L297/7 NO_AUTHOR The author ID does not exist * @throws 2L297/9 NO_PERMISSION The authorized user does not have permission to edit the comment @@ -219,4 +228,57 @@ class _comments extends \IPS\Content\Api\CommentController throw new \IPS\Api\Exception( 'INVALID_ID', '2L297/2', 404 ); } } + + /** + * POST /calendar/comments/{id}/react + * Add a reaction + * + * @param int $id ID Number + * @apiparam int id ID of the reaction to add + * @apiparam int author ID of the member reacting + * @return \IPS\calendar\Event\Comment + * @throws 1S425/2 NO_REACTION The reaction ID does not exist + * @throws 1S425/3 NO_AUTHOR The author ID does not exist + * @throws 1S425/4 REACT_ERROR Error adding the reaction + * @throws 1S425/5 INVALID_ID Object ID does not exist + * @note If the author has already reacted to this content, any existing reaction will be removed first + */ + public function POSTitem_react( $id ) + { + return $this->_reactAdd( $id ); + } + + /** + * DELETE /calendar/comments/{id}/react + * Delete a reaction + * + * @param int $id ID Number + * @apiparam int author ID of the member who reacted + * @return \IPS\calendar\Event\Comment + * @throws 1S425/6 NO_AUTHOR The author ID does not exist + * @throws 1S425/7 REACT_ERROR Error adding the reaction + * @throws 1S425/8 INVALID_ID Object ID does not exist + * @note If the author has already reacted to this content, any existing reaction will be removed first + */ + public function DELETEitem_react( $id ) + { + return $this->_reactRemove( $id ); + } + + /** + * POST /calendar/comments/{id}/report + * Reports a post + * + * @param int $id ID Number + * @apiparam int author ID of the member reporting + * @apiparam int report_type Report type (0 is default and is for letting CMGR team know, more options via core_automatic_moderation_types) + * @apiparam string message Optional message + * @return \IPS\calendar\Event\Comment + * @throws 1S425/B NO_AUTHOR The author ID does not exist + * @throws 1S425/C REPORTED_ALREADY The member has reported this item in the past 24 hours + */ + public function POSTitem_report( $id ) + { + return $this->_report( $id ); + } } \ No newline at end of file diff --git a/applications/calendar/api/events.php b/applications/calendar/api/events.php index d504e870..e33551c8 100644 --- a/applications/calendar/api/events.php +++ b/applications/calendar/api/events.php @@ -152,6 +152,7 @@ class _events extends \IPS\Content\Api\ItemController * @apiparam int locked 1/0 indicating if the event should be locked * @apiparam int hidden 0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator) * @apiparam int featured 1/0 indicating if the event should be featured + * @apiparam bool anonymous If 1, the item will be posted anonymously. * @throws 1L296/6 NO_CALENDAR The calendar ID does not exist * @throws 1L296/7 NO_AUTHOR The author ID does not exist * @throws 1L296/8 NO_TITLE No title was supplied @@ -194,7 +195,14 @@ class _events extends \IPS\Content\Api\ItemController } else { - $author = new \IPS\Member; + if ( \IPS\Request::i()->author === 0 ) + { + $author = new \IPS\Member; + } + else + { + throw new \IPS\Api\Exception( 'NO_AUTHOR', '1L296/7', 400 ); + } } } @@ -254,7 +262,7 @@ class _events extends \IPS\Content\Api\ItemController * @apiparam int locked 1/0 indicating if the event should be locked * @apiparam int hidden 0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator) * @apiparam int featured 1/0 indicating if the event should be featured - * @param int $id ID Number + * @apiparam bool anonymous If 1, the item will be posted anonymously. * @throws 1L296/I INVALID_ID The event ID is invalid or the authorized user does not have permission to view it * @throws 1L296/D NO_CALENDAR The calendar ID does not exist or the authorized user does not have permission to post in it * @throws 1L296/E NO_AUTHOR The author ID does not exist diff --git a/applications/calendar/api/reviews.php b/applications/calendar/api/reviews.php index 6b86545a..ad0b8030 100644 --- a/applications/calendar/api/reviews.php +++ b/applications/calendar/api/reviews.php @@ -91,6 +91,7 @@ class _reviews extends \IPS\Content\Api\CommentController * @apiparam datetime date The date/time that should be used for the review date. If not provided, will use the current date/time. Ignored for requests using an OAuth Access Token for a particular member * @apiparam string ip_address The IP address that should be stored for the review. If not provided, will use the IP address from the API request. Ignored for requests using an OAuth Access Token for a particular member * @apiparam int hidden 0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator) + * @apiparam bool anonymous If 1, the item will be posted anonymously. * @reqapiparam int rating Star rating * @throws 2L298/2 INVALID_ID The forum ID does not exist * @throws 1L298/3 NO_AUTHOR The author ID does not exist @@ -132,8 +133,15 @@ class _reviews extends \IPS\Content\Api\CommentController } else { - $author = new \IPS\Member; - $author->name = \IPS\Request::i()->author_name; + if ( \IPS\Request::i()->author === 0 ) + { + $author = new \IPS\Member; + $author->name = \IPS\Request::i()->author_name; + } + else + { + throw new \IPS\Api\Exception( 'NO_AUTHOR', '1L298/3', 400 ); + } } } @@ -164,6 +172,7 @@ class _reviews extends \IPS\Content\Api\CommentController * @apiparam string content The review content as HTML (e.g. "

    This is a review.

    "). Will be sanatized for requests using an OAuth Access Token for a particular member; will be saved unaltered for requests made using an API Key or the Client Credentials Grant Type. * @apiparam int hidden 1/0 indicating if the topic should be hidden * @apiparam int rating Star rating + * @apiparam bool anonymous If 1, the item will be posted anonymously. * @throws 2L298/5 INVALID_ID The review ID does not exist or the authorized user does not have permission to view it * @throws 1L298/6 NO_AUTHOR The author ID does not exist * @throws 1L298/9 INVALID_RATING The rating is not a valid number up to the maximum rating @@ -234,4 +243,56 @@ class _reviews extends \IPS\Content\Api\CommentController throw new \IPS\Api\Exception( 'INVALID_ID', '2L298/7', 404 ); } } + + /** + * POST /calendar/reviews/{id}/react + * Add a reaction + * + * @param int $id ID Number + * @apiparam int id ID of the reaction to add + * @apiparam int author ID of the member reacting + * @return \IPS\calendar\Event\Review + * @throws 1S425/2 NO_REACTION The reaction ID does not exist + * @throws 1S425/3 NO_AUTHOR The author ID does not exist + * @throws 1S425/4 REACT_ERROR Error adding the reaction + * @throws 1S425/5 INVALID_ID Object ID does not exist + * @note If the author has already reacted to this content, any existing reaction will be removed first + */ + public function POSTitem_react( $id ) + { + return $this->_reactAdd( $id ); + } + + /** + * DELETE /calendar/reviews/{id}/react + * Delete a reaction + * + * @param int $id ID Number + * @apiparam int author ID of the member who reacted + * @return \IPS\calendar\Event\Review + * @throws 1S425/6 NO_AUTHOR The author ID does not exist + * @throws 1S425/7 REACT_ERROR Error adding the reaction + * @throws 1S425/8 INVALID_ID Object ID does not exist + * @note If the author has already reacted to this content, any existing reaction will be removed first + */ + public function DELETEitem_react( $id ) + { + return $this->_reactRemove( $id ); + } + /** + * POST /calendar/reviews/{id}/report + * Reports a post + * + * @param int $id ID Number + * @apiparam int author ID of the member reporting + * @apiparam int report_type Report type (0 is default and is for letting CMGR team know, more options via core_automatic_moderation_types) + * @apiparam string message Optional message + * @return \IPS\calendar\Event\Review + * @throws 1S425/B NO_AUTHOR The author ID does not exist + * @throws 1S425/C REPORTED_ALREADY The member has reported this item in the past 24 hours + */ + public function POSTitem_report( $id ) + { + return $this->_report( $id ); + } } \ No newline at end of file diff --git a/applications/calendar/data/acpmenu.json b/applications/calendar/data/acpmenu.json index 91c8b83e..184e74a5 100644 --- a/applications/calendar/data/acpmenu.json +++ b/applications/calendar/data/acpmenu.json @@ -24,5 +24,14 @@ "do": "", "restriction": "settings_manage" } + }, + "stats": { + "rsvp": { + "tab": "stats", + "controller": "rsvp", + "do": "", + "restriction": "rsvp_manage", + "subcontrollers": "" + } } } \ No newline at end of file diff --git a/applications/calendar/data/acprestrictions.json b/applications/calendar/data/acprestrictions.json index 4aa27978..20be2507 100644 --- a/applications/calendar/data/acprestrictions.json +++ b/applications/calendar/data/acprestrictions.json @@ -22,5 +22,10 @@ "venues": { "venues_manage": "venues_manage" } + }, + "stats": { + "rsvp": { + "rsvp_manage": "rsvp_manage" + } } } \ No newline at end of file diff --git a/applications/calendar/data/build.xml b/applications/calendar/data/build.xml index 13b95cad..c5b863bc 100644 --- a/applications/calendar/data/build.xml +++ b/applications/calendar/data/build.xml @@ -1,7 +1,7 @@ - + icalendar eventreminders diff --git a/applications/calendar/data/javascript.xml b/applications/calendar/data/javascript.xml index 5cf58c12..2e256b1c 100644 --- a/applications/calendar/data/javascript.xml +++ b/applications/calendar/data/javascript.xml @@ -1,6 +1,6 @@ - - - - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -1132,7 +1132,7 @@ }); }(jQuery, _)); - - + Calendar Calendar a comment on a calendar event @@ -189,6 +189,7 @@ {# [1:birthday][?:birthdays]} today {# [1:birthday][?:birthdays]} View all + Birthdays Event Event Comment Event Review @@ -485,6 +486,14 @@ To the user who RSVP'd RSVP'd to %s Event RSVP + Calendar + RSVP + RSVPs over time + Not Going + Going + Maybe + Venues + Fired when somebody changes his RSVP status {# [1:day][?:days]} {# [1:week][?:weeks]} {# [1:month][?:months]} diff --git a/applications/calendar/data/modules.json b/applications/calendar/data/modules.json index cb2a3604..c9665e1a 100644 --- a/applications/calendar/data/modules.json +++ b/applications/calendar/data/modules.json @@ -5,10 +5,10 @@ "protected": 0, "default": 1 }, - "venues": { + "stats": { "default_controller": "", - "protected": 0, - "default": 0 + "protected": false, + "default": null } }, "front": { diff --git a/applications/calendar/data/theme.xml b/applications/calendar/data/theme.xml index 9298c00e..deafdd60 100644 --- a/applications/calendar/data/theme.xml +++ b/applications/calendar/data/theme.xml @@ -200,10 +200,13 @@    {{if ( $thisCalendar AND $thisCalendar->can('add') ) OR ( !$thisCalendar AND \IPS\calendar\Calendar::canOnAny('add') )}}    + {{$day = \IPS\Request::i()->d;}} + {{$month = \IPS\Request::i()->m;}} + {{$year = \IPS\Request::i()->y;}} {{if $thisCalendar}} - {lang="create_event"} + {lang="create_event"} {{else}} - {lang="create_event"} + {lang="create_event"} {{endif}} {{endif}} {lang="jump_to"} @@ -323,7 +326,7 @@ {{endif}} {{if isset( $birthdays[ $date->mon . $k ] ) AND $birthdays[ $date->mon . $k ] }} -

    {lang="birthdays_count" pluralize="$birthdays[ $date->mon . $k ]"}

    +

    {lang="birthdays_count" pluralize="$birthdays[ $date->mon . $k ]"}

    {{endif}} @@ -1020,15 +1023,15 @@ {{endif}}]]>