Remove GitLab migration notice
parent
e1c91c896c
commit
3bd1a2cf2d
27
README.md
27
README.md
|
|
@ -1,10 +1,3 @@
|
|||
!!! TinyIB has moved to GitLab !!!
|
||||
====
|
||||
|
||||
Please visit https://gitlab.com/tslocum/tinyib
|
||||
|
||||
------------
|
||||
|
||||
TinyIB - A Lightweight and Efficient [Image Board](https://en.wikipedia.org/wiki/Imageboard) Script
|
||||
====
|
||||
|
||||
|
|
@ -12,11 +5,11 @@ TinyIB - A Lightweight and Efficient [Image Board](https://en.wikipedia.org/wiki
|
|||
|
||||
**No database? No problem.** Store posts as text files for a portable set-up capable of running on virtually any PHP host.
|
||||
|
||||
**Not looking for an image board script?** TinyIB is able to allow new threads without requiring an image, or even disallow images entirely. See the [Text Board Mode](https://github.com/tslocum/TinyIB/wiki/Text-Board-Mode) wiki page for instructions.
|
||||
**Not looking for an image board script?** TinyIB is able to allow new threads without requiring an image, or even disallow images entirely. See the [Text Board Mode](https://gitlab.com/tslocum/tinyib/wikis/Text-Board-Mode) wiki page for instructions.
|
||||
|
||||
For demos see the [TinyIB Installations](https://github.com/tslocum/TinyIB/wiki) page.
|
||||
For demos see the [TinyIB Installations](https://gitlab.com/tslocum/tinyib/wikis/Home) page.
|
||||
|
||||
**Database structure was last modified on *15th Sep 2015*.** Are you unable to create new posts? Run the SQL on [this page](https://github.com/tslocum/TinyIB/wiki/NewSQLStructure) to finish the upgrade process.
|
||||
**Database structure was last modified on *15th Sep 2015*.** Are you unable to create new posts? Run the SQL on [this page](https://gitlab.com/tslocum/tinyib/wikis/NewSQLStructure) to finish the upgrade process.
|
||||
|
||||
Features
|
||||
------------
|
||||
|
|
@ -42,7 +35,7 @@ Installing
|
|||
- If you plan on disabling image uploads to use TinyIB as a text board only, this library is not required.
|
||||
2. CD to the directory you wish to install TinyIB.
|
||||
3. Run the command:
|
||||
- `git clone git://github.com/tslocum/TinyIB.git ./`
|
||||
- `git clone https://gitlab.com/tslocum/tinyib.git ./`
|
||||
4. Copy **settings.default.php** to **settings.php**
|
||||
5. Configure **settings.php**
|
||||
- To allow WebM upload:
|
||||
|
|
@ -85,14 +78,14 @@ Updating
|
|||
1. Obtain the latest release.
|
||||
- If you installed via Git, run the following command in TinyIB's directory:
|
||||
- `git pull`
|
||||
- Otherwise, [download](https://github.com/tslocum/TinyIB/archive/master.zip) and extract a zipped archive.
|
||||
- Otherwise, [download](https://gitlab.com/tslocum/tinyib/-/archive/master/tinyib-master.zip) and extract a zipped archive.
|
||||
2. Note which files were modified.
|
||||
- If **settings.default.php** was updated, migrate the changes to **settings.php**
|
||||
- Take care to not change the value of **TINYIB_TRIPSEED**, as it would result in different secure tripcodes.
|
||||
- If other files were updated, and you have made changes yourself:
|
||||
- Visit [GitHub](https://github.com/tslocum/TinyIB) and review the changes made in the update.
|
||||
- Visit [GitLab](https://gitlab.com/tslocum/tinyib) and review the changes made in the update.
|
||||
- Ensure the update does not interfere with your changes.
|
||||
3. Visit [GitHub](https://github.com/tslocum/TinyIB/wiki/NewSQLStructure) and check for new SQL queries which may be required to complete the update.
|
||||
3. Visit [GitLab](https://gitlab.com/tslocum/tinyib/wikis/NewSQLStructure) and check for new SQL queries which may be required to complete the update.
|
||||
|
||||
Migrating
|
||||
------------
|
||||
|
|
@ -120,13 +113,13 @@ Support
|
|||
------------
|
||||
|
||||
1. Ensure you are running the latest version of TinyIB.
|
||||
2. Review the [open issues](https://github.com/tslocum/TinyIB/issues).
|
||||
3. Open a [new issue](https://github.com/tslocum/TinyIB/issues/new).
|
||||
2. Review the [open issues](https://gitlab.com/tslocum/tinyib/issues).
|
||||
3. Open a [new issue](https://gitlab.com/tslocum/tinyib/issues/new).
|
||||
|
||||
Contributing
|
||||
------------
|
||||
|
||||
1. Read the [GitHub Forking Guide](https://help.github.com/forking/).
|
||||
1. Read the [GitLab Forking Workflow](https://docs.gitlab.com/ce/workflow/forking_workflow.html).
|
||||
2. Fork TinyIB.
|
||||
3. Commit code changes to your forked repository.
|
||||
4. Submit a pull request describing your modifications.
|
||||
|
|
|
|||
10
imgboard.php
10
imgboard.php
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
# TinyIB
|
||||
#
|
||||
# https://github.com/tslocum/TinyIB
|
||||
# https://gitlab.com/tslocum/tinyib
|
||||
|
||||
error_reporting(E_ALL);
|
||||
ini_set("display_errors", 1);
|
||||
|
|
@ -397,12 +397,12 @@ if (isset($_POST['message']) || isset($_POST['file'])) {
|
|||
$text .= '<blockquote class="reply" style="padding: 7px;font-size: 1.25em;">
|
||||
<pre style="margin: 0;padding: 0;">Attempting update...' . "\n\n" . $git_output . '</pre>
|
||||
</blockquote>
|
||||
<p><b>Note:</b> If TinyIB updates and you have made custom modifications, <a href="https://github.com/tslocum/TinyIB/commits/master">review the changes</a> which have been merged into your installation.
|
||||
<p><b>Note:</b> If TinyIB updates and you have made custom modifications, <a href="https://gitlab.com/tslocum/tinyib/commits/master" target="_blank">review the changes</a> which have been merged into your installation.
|
||||
Ensure that your modifications do not interfere with any new/modified files.
|
||||
See the <a href="https://github.com/tslocum/TinyIB#readme">README</a> for more information.</p>';
|
||||
See the <a href="https://gitlab.com/tslocum/tinyib#readme">README</a> for more information.</p>';
|
||||
} else {
|
||||
$text .= '<p><b>TinyIB was not installed via Git.</b></p>
|
||||
<p>If you installed TinyIB without Git, you must <a href="https://github.com/tslocum/TinyIB">update manually</a>. If you did install with Git, ensure the script has read and write access to the <b>.git</b> folder.</p>';
|
||||
<p>If you installed TinyIB without Git, you must <a href="https://gitlab.com/tslocum/tinyib">update manually</a>. If you did install with Git, ensure the script has read and write access to the <b>.git</b> folder.</p>';
|
||||
}
|
||||
} elseif (isset($_GET['dbmigrate'])) {
|
||||
if (TINYIB_DBMIGRATE) {
|
||||
|
|
@ -460,7 +460,7 @@ if (isset($_POST['message']) || isset($_POST['file'])) {
|
|||
fancyDie('Set TINYIB_DBMODE to flatfile and enter in your MySQL settings in settings.php before migrating.');
|
||||
}
|
||||
} else {
|
||||
$text .= '<p>This tool currently only supports migration from a flat file database to MySQL. Your original database will not be deleted. If the migration fails, disable the tool and your board will be unaffected. See the <a href="https://github.com/tslocum/TinyIB#migrating" target="_blank">README</a> <small>(<a href="README.md" target="_blank">alternate link</a>)</small> for instructions.</a><br><br><a href="?manage&dbmigrate&go"><b>Start the migration</b></a></p>';
|
||||
$text .= '<p>This tool currently only supports migration from a flat file database to MySQL. Your original database will not be deleted. If the migration fails, disable the tool and your board will be unaffected. See the <a href="https://gitlab.com/tslocum/tinyib#migrating" target="_blank">README</a> <small>(<a href="README.md" target="_blank">alternate link</a>)</small> for instructions.</a><br><br><a href="?manage&dbmigrate&go"><b>Start the migration</b></a></p>';
|
||||
}
|
||||
} else {
|
||||
fancyDie('Set TINYIB_DBMIGRATE to true in settings.php to use this feature.');
|
||||
|
|
|
|||
11
inc/html.php
11
inc/html.php
|
|
@ -39,7 +39,7 @@ function pageFooter() {
|
|||
|
||||
return <<<EOF
|
||||
<div class="footer">
|
||||
- <a href="http://www.2chan.net" target="_top">futaba</a> + <a href="http://www.1chan.net" target="_top">futallaby</a> + <a href="https://github.com/tslocum/TinyIB" target="_top">tinyib</a> -
|
||||
- <a href="http://www.2chan.net" target="_top">futaba</a> + <a href="http://www.1chan.net" target="_top">futallaby</a> + <a href="https://gitlab.com/tslocum/tinyib" target="_top">tinyib</a> -
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -771,15 +771,6 @@ function manageStatus() {
|
|||
$info = $threads . ' ' . plural('thread', $threads) . ', ' . $bans . ' ' . plural('ban', $bans);
|
||||
$output = '';
|
||||
|
||||
if ($isadmin) {
|
||||
$output .= <<<EOF
|
||||
<fieldset>
|
||||
<legend>Notice</legend>
|
||||
<p>TinyIB has <a href="https://gitlab.com/tslocum/tinyib" target="_blank">moved to GitLab</a>. If you installed via git, please run <pre>git remote set-url origin https://gitlab.com/tslocum/tinyib.git</pre> to continue receiving updates.</p>
|
||||
</fieldset>
|
||||
EOF;
|
||||
}
|
||||
|
||||
if ($isadmin && TINYIB_DBMODE == 'mysql' && function_exists('mysqli_connect')) { // Recommend MySQLi
|
||||
$output .= <<<EOF
|
||||
<fieldset>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
# TinyIB
|
||||
#
|
||||
# https://github.com/tslocum/TinyIB
|
||||
# https://gitlab.com/tslocum/tinyib
|
||||
#
|
||||
# Contact the author via tslocum@gmail.com if you need support.
|
||||
# Contact the author via trevor@rocketnine.space if you need support.
|
||||
# See README for instructions on configuring, moderating and upgrading your board.
|
||||
#
|
||||
# Set TINYIB_DBMODE to a MySQL-related mode if it's available. By default it's set to flatfile, which can be very slow.
|
||||
|
|
|
|||
Loading…
Reference in New Issue