diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 60b9da6e59..4fb7bfd404 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -7,7 +7,7 @@ #### Example: **What kind of issue is it (Question, Bug, etc.)?** Bug. -**In which version of NamelessMC did it occur (1.x.x)?** Release 1.0.11. +**In which version of NamelessMC did it occur (1.x.x)?** Release 1.0.12. **How would you describe the issue?** The index does not load up at all. **Do you have (relevant) resources about this issue (Logs, pictures, etc.)?** Yes, I have the a screenshot of it. [Click here](http://i.imgur.com/QqkXhVx.png) **Do you have an idea how or where the issue occurs?** I think it has to do with the "index.php" file but not sure. diff --git a/README.md b/README.md index 559d76dd74..df4c3d89ad 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# NamelessMC - version 1.0.11 +# NamelessMC - version 1.0.12 NamelessMC is a free, easy to use & powerful website software for your Minecraft server, which includes a large range of features. -Version 1.0.11 features: +Version 1.0.12 features: - Template and theme system - Languages @@ -11,17 +11,18 @@ Version 1.0.11 features: - Forum topic labels (not yet permission based, working on that) - Subforums - Alerts system, including popup notifications upon user tagging or a new staff application -- Small additions including page loading time and the ability to enable/disable error reporting from the AdminCP -- New optional email system -- Upcoming API +- Email configuration +- API - Ability to disable UUID linking, allowing support for offline mode servers -- Completion of custom page system +- Custom page system - Server statistics integration - Staff and member lists - Minecraft status - reCAPTCHA option - Voice server viewer - Two factor authentication +- Minecraft account verification +- Announcements Included addons: - Donate @@ -71,6 +72,8 @@ Upcoming addons (these will need to be downloaded separately): * @PugaBear * @Tim-NL * @godleydemon +* @yshf9 +* @Saphiria **[NamelessMC Website](http://namelessmc.github.io/)** * @Samerton @@ -87,12 +90,9 @@ Upcoming addons (these will need to be downloaded separately): * Norsk: @partydragen * Slovak: @Marki35 * French: @CreaModZ -* Dutch: Sander Jochems, @Azoraqua, @Headhunterzpw and @melerpe +* Dutch: Sander Jochems, @Azoraqua, @Headhunterzpw, @melerpe and @aycgit * Finnish: -kakara- -* Portuguese: @dgateles - -**NamelessMC On Spigot** -* Resource: @Saphiria +* Portuguese: @dgateles, @dasilvaj4 ## IRC \#NamelessMC on irc.spi.gt diff --git a/changelog.txt b/changelog.txt index a39abd0050..83137104ae 100644 --- a/changelog.txt +++ b/changelog.txt @@ -343,4 +343,22 @@ - Allow changing Minecraft avatar type - Alert profile owners on wall posts - Add drop column function -- Allow enabling/disabling custom usernames \ No newline at end of file +- Allow enabling/disabling custom usernames + +1.0.12 +- Add wells to profile page tabs +- Add Minecraft account association +- Allow use of wells on custom pages +- Fix Twitter feed issues +- Fix email config issue +- Reinstate cookie notice +- Update issue template to 1.0.12 +- Update translations +- Add announcement system +- Add user titles +- Add option to change Twitter feed style +- Add BungeeUtilisals support +- Prevent users from liking their own profile wall posts +- Allow HTML use in profile wall posts +- Fix database issues with donate addon +- Add modify column function \ No newline at end of file diff --git a/core/includes/updates/1011.php b/core/includes/updates/1011.php new file mode 100644 index 0000000000..d39b4ce4f1 --- /dev/null +++ b/core/includes/updates/1011.php @@ -0,0 +1,55 @@ + 1.0.12 updater + +// Settings +// MCAssoc +$queries->create('settings', array( + 'name' => 'use_mcassoc', + 'value' => '0' +)); + +$queries->create('settings', array( + 'name' => 'mcassoc_key', + 'value' => 'null' +)); + +// Twitter style +$queries->create('settings', array( + 'name' => 'twitter_style', + 'value' => 'light' +)); + +// Announcements +try { + $data = $queries->createTable("announcements", " `id` int(11) NOT NULL AUTO_INCREMENT, `content` mediumtext NOT NULL, `can_close` tinyint(1) NOT NULL DEFAULT '0', `type` varchar(16) NOT NULL, PRIMARY KEY (`id`)", "ENGINE=InnoDB DEFAULT CHARSET=latin1"); + $data = $queries->createTable("announcements_pages", " `id` int(11) NOT NULL AUTO_INCREMENT, `announcement_id` int(11) NOT NULL, `page` varchar(64) NOT NULL, PRIMARY KEY (`id`)", "ENGINE=InnoDB DEFAULT CHARSET=latin1"); + $data = $queries->createTable("announcements_permissions", " `id` int(11) NOT NULL AUTO_INCREMENT, `announcement_id` int(11) NOT NULL, `group_id` int(11) DEFAULT NULL, `user_id` int(11) DEFAULT NULL, `view` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id`)", "ENGINE=InnoDB DEFAULT CHARSET=latin1"); +} catch(Exception $e){ + // Error, continue anyway +} + +// Modify donation addon package and description columns +try { + $donation_exists = $queries->tableExists('donation_settings'); + if(!empty($donation_exists)){ + $queries->modifyColumn('donation_cache', 'package', 'varchar(64)'); + $queries->modifyColumn('donation_packages', 'description', 'MEDIUMTEXT'); + } +} catch(Exception $e){ + // Error, continue anyway +} + +// Update version number +$version_number_id = $queries->getWhere('settings', array('name', '=', 'version')); +$version_number_id = $version_number_id[0]->id; + +$queries->update('settings', $version_number_id, array( + 'value' => '1.0.12' +)); + +$version_update_id = $queries->getWhere('settings', array('name', '=', 'version_update')); +$version_update_id = $version_update_id[0]->id; + +$queries->update('settings', $version_update_id, array( + 'value' => 'false' +)); \ No newline at end of file diff --git a/pages/install.php b/pages/install.php index 0378a54c30..1bbf576e90 100644 --- a/pages/install.php +++ b/pages/install.php @@ -653,7 +653,7 @@ // Version update $version_id = $queries->getWhere('settings', array('name', '=', 'version')); $queries->update('settings', $version_id[0]->id, array( - 'value' => '1.0.11' + 'value' => '1.0.12' )); @@ -1022,7 +1022,7 @@ ), 28 => array( 'name' => 'version', - 'value' => '1.0.11' + 'value' => '1.0.12' ), 29 => array( 'name' => 'version_checked',