1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-28 01:10:51 +01:00
Commit Graph

479 Commits

Author SHA1 Message Date
czaks
fa9bf536c3 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
aecfc37510 Rename ban_page_message to ban_page_extra 2013-08-11 21:30:02 +10:00
ctrlcctrlv
9ee598ee81 Option to have a message on the ban page 2013-08-11 21:29:42 +10:00
ctrlcctrlv
39f542704b Option to have a message on the ban page
Conflicts:
	inc/config.php
2013-08-11 21:29:02 +10:00
ctrlcctrlv
acb4c47a9f Allow for HTML in the board subtitle
Conflicts:
	inc/config.php
2013-08-11 21:08:19 +10:00
czaks
ef4cf16a73 fix submit button not showing when topic disabled (after merge) 2013-08-09 17:36:07 -04:00
ctrlcctrlv
efcec13439 Option to have a message on the ban page 2013-08-09 19:55:25 +00:00
ctrlcctrlv
ecb15c7dcb Option to have a message on the ban page 2013-08-09 19:52:19 +00:00
ctrlcctrlv
78ea9af97c Oekaki 2013-08-08 22:15:59 +00:00
ctrlcctrlv
d4a1ae3595 Advertisements 2013-08-08 21:57:52 +00:00
ctrlcctrlv
7205801ced Optionally use email selectbox 2013-08-08 19:30:05 +00:00
ctrlcctrlv
b8921508fe Allow for HTML in the board subtitle 2013-08-08 18:58:44 +00:00
czaks
16ae5177f7 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-05 06:23:20 -04:00
czaks
2cc0769f54 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
a84c4510fc Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	js/post-hider.js
2013-08-05 06:03:40 -04:00
Michael Foster
1248e329d2 remove maximum-scale in <meta name="viewport"> 2013-08-05 05:05:38 -04:00
czaks
e2b5ec9354 ukko: further fixes; should now provide a smooth overboard experience 2013-08-04 01:36:56 -04:00
czaks
f2427ca392 ukko: finally fixed that post (du|multi)plication problem 2013-08-04 00:15:56 -04:00
czaks
ddcad35f6c ukko: another fix 2013-08-03 22:17:25 -04:00
czaks
c2ba0bc7bf ukko: fix thread duplication 2013-08-03 21:59:05 -04:00
czaks
a0855cdcf5 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
a3fbff2259 Update $config['try_smarter']. Should be working now. 2013-08-03 17:42:34 -04:00
Michael Foster
424de7561d Web config editor: board configs 2013-08-03 06:26:17 -04:00
Michael Foster
eb3fc990f5 Web editor: Don't add newlines in comments 2013-08-03 05:44:39 -04:00
Michael Foster
0d1bfa47f1 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
1d37e81ade Better error handling/displaying with $config['debug'] and $config['verbose_errors'] 2013-08-03 00:22:28 -04:00
Michael Foster
6ecda16be3 Forgot to commit this 2013-08-02 22:06:32 -04:00
Michael Foster
4fce9b63ae Major config.php cleanup and a few minor misc fixes. 2013-08-02 20:52:58 -04:00
Michael Foster
9e7fbf927c Installer improvements 2013-08-02 16:19:20 -04:00
czaks
3922677968 ukko: bugfixes 2013-08-02 04:36:08 -04:00
czaks
73b5cf5a08 ukko: implement ukko hide 2013-08-02 04:20:57 -04:00
czaks
6f6a20af8e ukko: javascript major refactor 2013-08-02 03:16:34 -04:00
czaks
5710575d1d 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
a15e0ffa98 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-02 00:09:07 -04:00
Michael Foster
f06978659b Installer: Nicer pre-installation test 2013-08-02 00:08:37 -04:00
czaks
1ed45ebe9e 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
dc84ccc6a8 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
5a44c50811 Simple file editor replacement for ?/config (optional). Issue #127 2013-08-01 17:18:10 -04:00
Michael Foster
6b6f32949d Web config editor: Use a <select> for JANITOR/MOD/ADMIN permissions 2013-08-01 15:20:25 -04:00
czaks
9343651d90 Add optional database table prefix (issue #118; see issue comments for details) 2013-08-01 01:16:20 -04:00
czaks
168a4d73cc Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
Michael Foster
5bf0e7f7e7 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
a052a791b5 Add optional database table prefix (issue #118; see issue comments for details) 2013-07-31 22:14:26 -04:00
czaks
cefd5517ac Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 21:36:54 -04:00
Michael Foster
ea2b8cce07 Bugfix: HTML injection in post editing (introduces and fixes yet another bug) 2013-07-31 21:24:17 -04:00
czaks
83844b5e3e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-07-31 21:03:13 -04:00
Michael Foster
328484bee7 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
b35ea55763 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/thread.html
2013-07-31 19:25:04 -04:00
czaks
6317a70152 header abstraction: abstracted also in thread.html
Conflicts:
	templates/page.html
	templates/thread.html
2013-07-31 17:14:10 -04:00
czaks
c0abd1d851 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:02:30 -04:00