1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-26 16:30:52 +01:00
Commit Graph

479 Commits

Author SHA1 Message Date
czaks
24b1adc501 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html
2013-08-11 09:50:33 -04:00
Michael Foster
9695c327db Rename ban_page_message to ban_page_extra 2013-08-11 21:30:02 +10:00
ctrlcctrlv
2278762000 Option to have a message on the ban page 2013-08-11 21:29:42 +10:00
ctrlcctrlv
edd197586f Option to have a message on the ban page
Conflicts:
	inc/config.php
2013-08-11 21:29:02 +10:00
ctrlcctrlv
48ac445038 Allow for HTML in the board subtitle
Conflicts:
	inc/config.php
2013-08-11 21:08:19 +10:00
czaks
a8738268b3 fix submit button not showing when topic disabled (after merge) 2013-08-09 17:36:07 -04:00
ctrlcctrlv
de4c965b4d Option to have a message on the ban page 2013-08-09 19:55:25 +00:00
ctrlcctrlv
68bd3150f1 Option to have a message on the ban page 2013-08-09 19:52:19 +00:00
ctrlcctrlv
013ca134be Oekaki 2013-08-08 22:15:59 +00:00
ctrlcctrlv
3204b57b5b Advertisements 2013-08-08 21:57:52 +00:00
ctrlcctrlv
52b7254d4b Optionally use email selectbox 2013-08-08 19:30:05 +00:00
ctrlcctrlv
074217ec3c Allow for HTML in the board subtitle 2013-08-08 18:58:44 +00:00
czaks
35c9bdb5f5 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-05 06:23:20 -04:00
czaks
585f75fcaf Revert "Merge branch 'master' of github.com:vichan-devel/Tinyboard"
This reverts commit a84c4510fc, reversing
changes made to a8327c3a37.
2013-08-05 06:17:01 -04:00
czaks
c3def0e453 Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	js/post-hider.js
2013-08-05 06:03:40 -04:00
Michael Foster
cad9d9ea6a remove maximum-scale in <meta name="viewport"> 2013-08-05 05:05:38 -04:00
czaks
3686878eb4 ukko: further fixes; should now provide a smooth overboard experience 2013-08-04 01:36:56 -04:00
czaks
5544657a96 ukko: finally fixed that post (du|multi)plication problem 2013-08-04 00:15:56 -04:00
czaks
53cb3d5a72 ukko: another fix 2013-08-03 22:17:25 -04:00
czaks
a508be77a5 ukko: fix thread duplication 2013-08-03 21:59:05 -04:00
czaks
8f7367d925 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/functions.php
	templates/generic_page.html
	templates/index.html
2013-08-03 19:05:25 -04:00
Michael Foster
ad5570ada2 Update $config['try_smarter']. Should be working now. 2013-08-03 17:42:34 -04:00
Michael Foster
a3a490c7f2 Web config editor: board configs 2013-08-03 06:26:17 -04:00
Michael Foster
3ed82677e4 Web editor: Don't add newlines in comments 2013-08-03 05:44:39 -04:00
Michael Foster
0afd69d975 Web config editor: Write "MOD", "JANITOR", etc. to instance-config instead of just int representations 2013-08-03 05:41:01 -04:00
Michael Foster
3a0ed6fad3 Better error handling/displaying with $config['debug'] and $config['verbose_errors'] 2013-08-03 00:22:28 -04:00
Michael Foster
6936d8dd2f Forgot to commit this 2013-08-02 22:06:32 -04:00
Michael Foster
d59e74f394 Major config.php cleanup and a few minor misc fixes. 2013-08-02 20:52:58 -04:00
Michael Foster
e445c88d1d Installer improvements 2013-08-02 16:19:20 -04:00
czaks
926f18aab9 ukko: bugfixes 2013-08-02 04:36:08 -04:00
czaks
d86eb2669c ukko: implement ukko hide 2013-08-02 04:20:57 -04:00
czaks
cff33c3b64 ukko: javascript major refactor 2013-08-02 03:16:34 -04:00
czaks
2c32231f41 Revert "Disable autocomplete": this breaks access to post text after an error, at least in Firefox
This reverts commit 90b82b1a06.
2013-08-02 00:09:23 -04:00
czaks
6ed8e8752e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-02 00:09:07 -04:00
Michael Foster
01494dccce Installer: Nicer pre-installation test 2013-08-02 00:08:37 -04:00
czaks
d1a5e9d2cf Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/stripes.css
	stylesheets/testorange.css
	stylesheets/wasabi.css
2013-08-01 23:43:20 -04:00
czaks
25ede1e194 Revert "Disable autocomplete": this breaks access to post text after an error, at least in Firefox
This reverts commit 90b82b1a06.
2013-08-01 23:31:35 -04:00
Michael Foster
695d50be8c Simple file editor replacement for ?/config (optional). Issue #127 2013-08-01 17:18:10 -04:00
Michael Foster
538e88b7bd Web config editor: Use a <select> for JANITOR/MOD/ADMIN permissions 2013-08-01 15:20:25 -04:00
czaks
6eb3971b6a Add optional database table prefix (issue #118; see issue comments for details) 2013-08-01 01:16:20 -04:00
czaks
926b2c31ed Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
Michael Foster
801bd56689 Better/fixed jQuery styling and slightly improved js/inline-expanding.js accuracy (when jQuery is enabled) 2013-08-01 00:27:54 -04:00
Michael Foster
d379224e3f Add optional database table prefix (issue #118; see issue comments for details) 2013-07-31 22:14:26 -04:00
czaks
a902bf6cba Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 21:36:54 -04:00
Michael Foster
e740f45ed1 Bugfix: HTML injection in post editing (introduces and fixes yet another bug) 2013-07-31 21:24:17 -04:00
czaks
ef9ede073f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-07-31 21:03:13 -04:00
Michael Foster
da5048a0e4 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
0eaf52583f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/thread.html
2013-07-31 19:25:04 -04:00
czaks
2adef4b4b9 header abstraction: abstracted also in thread.html
Conflicts:
	templates/page.html
	templates/thread.html
2013-07-31 17:14:10 -04:00
czaks
625a7961bd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:02:30 -04:00