czaks
293543878a
backport parts of 2d6d449bd2
, in particular html classes
2016-05-06 12:14:28 +02:00
Bui
6c334a3b44
lol spaces
2016-05-06 11:45:52 +02:00
Bui
d46bf4e2f2
add id to thread links
2016-05-06 11:45:37 +02:00
czaks
02c3c28a16
main.js: a bit more sane code
2016-05-05 15:37:50 +02:00
czaks
6991ca270e
fix bad merge
2016-05-05 13:53:52 +02:00
Fredrick Brennan
71fde35938
Oops forgot a file
2016-05-05 13:33:14 +02:00
Fredrick Brennan
8943bb0bb3
Rewrite report system due to flooding
2016-05-05 12:57:52 +02:00
8chan
95a9b7b72b
Completely rewrite fix-report-delete-submit.js, add report/delete to menu
2016-05-05 12:52:17 +02:00
8chan
dd27026618
Show stickies at top of catalog
2016-05-05 12:01:16 +02:00
8chan
e8b530a783
Shift-click to hide threads in catalog
2016-05-05 12:00:21 +02:00
8chan
4f96263e3b
Upgrade jQuery mixitup, preserve settings, no animations
2016-05-05 11:59:00 +02:00
czaks
77176faece
enable javascript in mod panel
2016-05-05 09:56:54 +02:00
czaks
38bf3276e4
update copyright years; remove a link to tinyboard (website is dead)
2016-05-05 09:39:23 +02:00
czaks
8dac72e924
update installer
2016-05-05 09:16:09 +02:00
27chan
199931dc1a
Fix default theme and add Font Awesome Icons
2016-04-29 18:00:33 -03:00
Matthieu
028fd3df15
Added: RSS theme
2016-01-26 00:51:39 +01:00
Matthieu
d2de4419bd
Added: config option to hide email in post. (prevent emailfag but let the possibility to sage and noko)
2016-01-26 00:50:55 +01:00
kellerwhy
d4dcfc6321
Make mod/recent_posts.html respect $config['dir']['res']
...
So certain links don't keep linking to /board/res/postnumber despite any changes to $config['dir']['res'] e.g. changing res/ to thread/
2015-08-10 23:16:23 -04:00
27chan
e6c1623a42
Add extension mp4
2015-08-10 22:09:26 -03:00
Jason Puglisi
90e4208473
Added [Return] and [Go to bottom] to thread page above posts
2015-08-08 13:45:02 -04:00
szalwia
11c7c57873
Fix thumbnail scaling in recent theme
...
Use decoded JSON values to set thumbnail sizes in the recent theme
2015-06-04 17:18:27 +01:00
czaks
2d9214ac63
version check should point at engine.vichan.net and not tinyboard.org actually
2015-04-23 08:18:36 +02:00
czaks
271dcb7a65
fileboard: fix possible XSS (mainly applicable to 8chan)
2015-04-23 03:45:08 +02:00
Marcin Łabanowski
4014682882
fileboard support
2015-04-22 06:06:34 +02:00
czaks
4060bf10ed
update copyright years & vichan website
2015-04-12 03:18:51 +02:00
czaks
1f9e36868e
ukko: small optimization: move js creation to install time
2015-04-05 16:20:59 +02:00
czaks
e273111340
sitemap theme for smart_build
2015-04-03 05:57:39 +02:00
czaks
61d2729a40
themes can use smart_build now
2015-04-02 20:54:28 +02:00
czaks
e9e5ceaf90
main.js vs new file uploader
2015-04-01 19:37:06 +02:00
czaks
960053af75
catalog: fix for embed youtube on https
2015-03-31 07:48:03 +02:00
czaks
745bdc2b6c
password is text nao, fuck you chrome
2015-03-31 07:01:51 +02:00
czaks
765dea599b
trivial fixes to file-selector.js
2015-03-31 06:50:05 +02:00
8chan
f26256f55a
Make file selector work, add to config
...
Conflicts:
inc/instance-config.php
templates/post_form.html
2015-03-31 05:59:54 +02:00
marktaiwan
6e84a25f9a
Adds keyboard focus to file selector
2015-03-31 05:57:45 +02:00
marktaiwan
0005f11098
initialize file selector soon as it's loaded
...
Conflicts:
templates/post_form.html
2015-03-31 05:57:22 +02:00
marktaiwan
3bd7f94861
Fallback for browsers that disables javascript
...
Conflicts:
stylesheets/style.css
templates/post_form.html
2015-03-31 05:54:07 +02:00
Marcin Łabanowski
8eb3d709f7
Merge pull request #129 from JasonPuglisi/active-content-fix
...
Fixed and re-enabled active content stat for recent theme
2015-03-28 05:22:02 +01:00
czaks
11c020be9b
Merge branch 'master' of github.com:vichan-devel/Tinyboard
...
Conflicts:
templates/post/image_identification.html
2015-03-23 00:35:48 +01:00
czaks
81afc17b67
image identification: url encode
2015-03-23 00:35:13 +01:00
Jason Puglisi
034b288a13
Fixed to work with multiple images
2015-03-20 09:47:40 -04:00
Jason Puglisi
1283e51ca5
Fixed and re-enabled active content stat for recent theme
2015-03-19 21:49:57 -04:00
Jason Puglisi
d6e91ec62f
Added space after Google image search link
2015-03-19 19:35:28 -04:00
czaks
4aa1d387f8
...
2015-03-10 13:34:02 +01:00
czaks
7d92a05bd8
...
2015-03-10 13:23:40 +01:00
czaks
bdb6001f3f
support for slugified links; may introduce a few bugs
2015-03-10 12:48:59 +01:00
8chan
a550c63f9c
SECURITY / XSS : Stop XSS in post subjects displayed in catalog
...
git blame says czaks forgot an |e in catalog.html, this means that anyone posting a new thread with HTML in the subject field or name field can arbitrarily insert it into the page.
Conflicts:
templates/themes/catalog/catalog.html
2015-01-23 10:40:08 +00:00
czaks
b55ebcd0ef
custom alert: now alert will be able to display custom HTML
2014-10-18 22:43:35 +02:00
czaks
948695e73c
lel, this one will do
2014-10-09 01:49:29 +02:00
czaks
7719ad3e81
minor bugfix @ banlist
2014-10-09 01:26:34 +02:00
czaks
9b3fa77719
new banlist implementation; also includes a public banlist
2014-10-08 23:23:59 +02:00
8chan
93b30d6829
class around poster IDs
2014-10-07 00:19:15 +02:00
czaks
1964279436
Merge branch 'master' of github.com:vichan-devel/Tinyboard
...
Conflicts:
stylesheets/style.css
2014-10-05 18:01:01 +02:00
Bui
62b7e02050
give OPs IDs
2014-10-05 17:49:31 +02:00
Bui
1edaea309b
quote selected text on cite
2014-10-05 17:49:31 +02:00
czaks
86eed0b349
add stylesheet choice to catalog theme
2014-10-05 17:49:27 +02:00
kaf
296e4fd5fa
Added an option to hide sages
2014-10-05 15:29:37 +00:00
8chan
cb7b7d070c
threadscroll was in template for no reason
2014-09-27 11:37:50 +02:00
8chan
e81d016ffa
Attempt to fix scroll to anchor issue
2014-09-25 06:56:24 +02:00
anonfagola
45dd9e637f
Added scrolling threads with up and down keys
...
For 8chan X. Redone so it's in js folder.
@KillerWhale321
2014-09-24 04:47:40 +02:00
czaks
a25e5f7839
additional measurements for catalog, so it does not throw errors; should fix vichan-devel#84
2014-09-24 03:21:35 +02:00
dubcheck
c2f612bac9
'no comment' in Recent theme
2014-09-21 05:51:17 +02:00
czaks
7ec728ffb0
add a go to top link thread view; fixes #82
2014-09-21 02:52:20 +02:00
Fredrick Brennan
23c73ca839
Allow the user to decide whether or not he wants to display his country
2014-09-20 16:35:28 +00:00
czaks
ea3c571d6c
Merge branch 'catalog-spoiler-fix' of https://github.com/marlencrabapple/vichan
2014-09-20 06:44:03 +02:00
czaks
ac888a769d
add a very small image size for catalog
2014-09-20 06:40:43 +02:00
marlencrabapple
14cd12ff2a
Fixed spoiler images in the catalog theme.
2014-09-17 16:15:18 -07:00
marlencrabapple
40787db177
Fixed spoiler thumbnails not showing up in the recent theme
2014-09-17 15:55:16 -07:00
Ian Bradley
cff2af99d5
Fixed blank catalog image count when zero image replies and threads with deleted files from being excluded
2014-09-16 13:10:54 -07:00
Juan Tamad
53ada6a5ff
added option for showing the mod in ban page.
...
also fixes issue where the Staff is not shown in ban appeals.
2014-09-01 06:30:33 +08:00
Tomasz Konojacki
1b62fbea6f
added support for statcounter.com tracking code
2014-08-24 23:33:53 +02:00
czaks
2c99ede62f
fix html validity
2014-08-08 23:09:33 +02:00
czaks
bc5858fe83
image id buttons should be smaller
2014-08-08 23:08:02 +02:00
czaks
05e7ad0b56
ongoing catalog cleanup
2014-08-08 22:50:31 +02:00
czaks
4df5d7697d
fix & optimize catalog a little bit, don't expect anything big yet
2014-08-08 22:36:36 +02:00
czaks
b8381b31db
Revert "Use a different way to show the original filename"
...
This reverts commit d81a6c49e2
.
Conflicts:
js/download-original.js
templates/post/fileinfo.html
2014-08-08 22:18:06 +02:00
czaks
84c8e74ffa
Revert "I thought I deleted that"
...
This reverts commit c6e1afcf65
.
2014-08-08 22:09:28 +02:00
Jano Slota
31f0c1f1e3
Open image identification links in new tabs
2014-08-08 21:59:06 +02:00
Jano Slota
c6e1afcf65
I thought I deleted that
2014-08-08 21:58:49 +02:00
Jano Slota
46c07d3566
Change styling of fileinfo, add iqdb search
2014-08-08 21:58:15 +02:00
Jano Slota
cadfa2cee9
Do not show noko in email selectbox if it's disabled
2014-08-08 21:53:21 +02:00
kaf
fd58873ee6
Added a space for valid html5
2014-08-08 21:53:00 +02:00
Jano Slota
d81a6c49e2
Use a different way to show the original filename
...
Conflicts:
templates/post/fileinfo.html
2014-08-08 21:52:19 +02:00
8chan
48f99deaa5
Fix post linking bug in ?/recent
2014-07-21 16:55:36 +00:00
Fredrick Brennan
18f158e2d5
Forgot some |e
2014-07-19 18:47:34 +00:00
8chan
ef7556194c
Fix 55ch cancer; can now see next page of posts, ?/recent uses templating system
2014-07-19 18:42:52 +00:00
Marcin Łabanowski
95bb7b84b7
actually fix #70
2014-07-06 01:07:41 +02:00
Michael Walker
8aff83bdd4
Fix unsanitised text vulnerability in post/fileinfo.html
2014-07-05 21:57:06 +01:00
8chan
9df6ca8ddd
Fix issue #45
2014-06-24 19:41:00 +00:00
czaks
3895223922
Merge 4.5
...
Conflicts:
templates/post_thread.html
2014-06-21 20:50:41 +02:00
8chan
8d8563a20d
Fix scroll to issues with post-hover.js, clean up highlightReply
...
Conflicts:
templates/post_reply.html
templates/post_thread.html
2014-06-21 20:34:09 +02:00
czaks
26884e8e11
Merge 4.5
...
Conflicts:
post.php
2014-06-20 23:35:45 +02:00
czaks
73177fcffc
Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD
...
Conflicts:
templates/themes/basic/index.html
2014-06-20 23:27:34 +02:00
Techan
9e2b722db6
Change timezone of news on main page to local timezone
2014-06-20 23:26:17 +02:00
Techan
4cc8a0a8b0
Fix custom stylesheets on main page
2014-06-20 23:25:29 +02:00
Techan
c42050671b
Improve main page template
2014-06-20 23:25:08 +02:00
czaks
8a189e2380
fix upgrade path a little bit with a new catalog
2014-06-16 11:29:18 +02:00
8chan
e856917b00
Add scripts to catalog page
2014-06-12 17:27:18 +00:00
8chan
1d6f46d9bb
Fix scroll to issues with post-hover.js, clean up highlightReply
2014-06-12 15:36:40 +00:00
czaks
c2cbbe7e22
Merge 4.5
...
Conflicts:
js/expand-too-long.js
2014-06-10 17:51:03 +02:00
Chen-Pang He
8d745bec26
Set viewport to basic theme
2014-06-10 17:40:47 +02:00
Fredrick Brennan
696e5e59d2
Fix issue #60
2014-05-20 21:23:33 -04:00
Fredrick Brennan
0be16cf178
Fix js error when allow_delete is false
2014-05-19 14:11:24 -04:00
Fredrick Brennan
101202a031
Fix edit board link not appearing
2014-05-18 21:18:06 -04:00
czaks
ea47e000f4
Merge branch 'master' of github.com:vichan-devel/Tinyboard
2014-05-16 10:47:16 +02:00
Jano Slota
ecbf1ff24c
Fixed image identification
2014-05-16 10:47:10 +02:00
Fredrick Brennan
9b3f8421fc
Fix displaying bans
2014-05-14 13:51:49 -04:00
czaks
4288898dfa
Merge branch 'master' of github.com:vichan-devel/Tinyboard
2014-05-10 21:58:34 +02:00
czaks
19ce50c545
Merge ../pl
...
Conflicts:
post.php
2014-05-10 21:58:23 +02:00
Jano Slota
844d724b62
Optimized images
2014-05-10 21:51:00 +02:00
Jason Lam
9bd0572b63
use new truncate_filename function
2014-05-09 20:37:31 -04:00
Jason Lam
bf7304622a
Update poster_id.html
...
previous code did not work
2014-05-08 00:58:42 +02:00
Jason Lam
9dab9179f9
Update poster_id.html
...
previous code did not work
2014-05-07 18:37:48 -04:00
Jano Slota
593560956c
Added configurabe image identification
2014-05-07 11:14:30 +02:00
Fredrick Brennan
d31a353962
Allow post deletion switch
2014-05-05 18:03:51 -04:00
czaks
855618b2a0
Merge branch 'master' of github.com:vichan-devel/Tinyboard
...
Conflicts:
templates/themes/catalog/catalog.html
templates/themes/catalog/theme.php
2014-05-05 17:29:34 +02:00
czaks
73eb8c6b58
quick & dirty youtube thumbnails in catalog support
2014-05-04 01:20:12 +02:00
Fredrick Brennan
b1912ba86f
Merge branch 'staging' of https://github.com/vichan-devel/vichan into staging
2014-04-30 17:18:44 -04:00
Fredrick Brennan
042e7b9c59
Deprecate postControls(), per-file deletion and spoilering
2014-04-30 17:18:35 -04:00
czaks
4e21e3dbb7
Merge master branch into staging
...
Conflicts:
templates/themes/ukko/theme.php
2014-04-30 18:28:46 +02:00
czaks
3545ba1b47
ukko: this return
thingy wasn`t needed
2014-04-30 18:28:14 +02:00
czaks
318d75ac27
ukko: mod support for ukko; fixes #23
2014-04-30 18:20:30 +02:00
czaks
776bbeb73e
ukko: mod support for ukko; fixes #23
2014-04-30 18:18:55 +02:00
Fredrick Brennan
de524c64d9
Attempt to fix styling issue http://i.imgur.com/owHv6sE.png
2014-04-29 20:39:32 -04:00
czaks
2adf7d99db
integrate favelog into catalog theme; needs more work, code cleanup etc.
2014-04-30 00:14:25 +02:00
czaks
bb5446a93d
Merge remote-tracking branch 'origin/br-integration' into staging
2014-04-29 21:35:50 +02:00
czaks
b94e39148b
remove quick-reply-old. it probably doesn't work now, it certainly isn't
...
maintained. this is an old cruft and if needed, it needs rewriting.
2014-04-29 18:37:29 +02:00
czaks
276a742bce
Revert "change thumb
to file
to overcome a nasty bug in upgrading"
...
This reverts commit b0faa1a7e4
.
2014-04-27 16:19:41 +02:00
czaks
b0faa1a7e4
change thumb
to file
to overcome a nasty bug in upgrading
2014-04-27 16:05:38 +02:00
copypaste
c483e1258c
multiimage posting
2014-04-27 15:48:47 +02:00
czaks
0ec6355358
fix recentposts theme building null query, throw error instead
2014-04-20 23:33:52 +02:00
czaks
a93530e32f
update copyright footers in themes
2014-04-20 02:27:54 +02:00
kaf
f83c87b623
Added: /pol/-like flags based on a953229de7
...
Conflicts:
inc/config.php
templates/post_form.html
2014-04-19 18:48:17 +02:00
czaks
bfc4df8276
Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration
2014-04-19 00:24:52 +02:00
czaks
e5c48282c4
apply new branding for vichan-devel
2014-04-17 17:11:32 +02:00
czaks
59874b8376
modularize post templates a little more
2014-04-16 15:01:37 +02:00
czaks
48bc9d9e29
add some files missing from the previous commit
2014-04-16 11:58:41 +02:00
czaks
e81ce17fb4
modularize post templates a little bit; try to unify duplicate code
2014-04-16 11:54:41 +02:00
czaks
e08bc5d54d
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
2014-04-12 20:52:42 +02:00
Michael Reiley
677e428a4d
Update copyright years.
2014-04-12 11:12:42 -07:00
czaks
15c0802c06
Disable the sucky chrome autofill
...
It used to force login into "embed" field and password into post password.
Disabling autocomplete (at form) didn't work. Recreating the fields either.
Trying to induce default values didn't as well. x-autocompletetype didn't.
What worked – creating two dummy fields:
<input type='text'>
<input type='password'>
...just before the real post password.
2014-04-10 11:44:38 +02:00
czaks
e034b9179d
fix paths in templates
2014-04-06 21:48:31 +02:00
czaks
f0b2240b5f
Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration
2014-03-25 13:03:37 +01:00
czaks
15810c9bed
fix permission name
2014-03-25 12:15:40 +01:00
czaks
b1490bed31
favelaframes is nothing more than frameset AFAIC
2014-03-25 12:09:59 +01:00
czaks
1e92e678a6
add a javascript
2014-03-25 12:09:12 +01:00
czaks
fe95b33022
recent posts link
2014-03-25 12:05:07 +01:00
sinuca
1e78987ef6
Added ukko and favelaframes themes
2014-03-25 11:47:46 +01:00
sinuca
fb2b66e2dd
Recent posts functionality
...
Conflicts:
inc/config.php
inc/mod/pages.php
mod.php
2014-03-25 11:35:04 +01:00
sinuca
fc1f1ef315
"Favelog" theme added. Just a catalog with ordering functionality
2014-03-25 11:03:09 +01:00
czaks
75cca1ffb2
fix previous commit
2014-02-24 15:29:26 +01:00
czaks
14c499f9d1
Condense flags into one file. Heads-up for people having custom flags, disable $config['country_flags_condensed'] !!!
2014-02-24 00:06:01 +01:00
czaks
63b9c4db5f
local-time.js now supports custom time formats. idea by copypaste
2014-02-23 17:58:16 +01:00
czaks
5a66fdddc2
installer: update to font-awesome 3.0 or 4.0 it was
2014-02-20 10:37:15 +01:00
czaks
5c9c095e84
okay, that dready css rule refered to this...
2014-02-01 21:53:46 +01:00
czaks
1a9e4eaef6
full, working wPaint oekaki implementation; fixes vichan-devel#20
2014-01-31 09:39:39 +01:00
czaks
ff9b684f7e
remove old oekaki; see vichan-devel#20
2014-01-29 22:59:29 +01:00
czaks
4636f5b6ef
fix watch.js on nonstandard paths; fixes vichan-devel#38
...
this commit also adds a modRoot js variable that makes proper
modlinks. also fixed in watch.js
2014-01-29 22:53:31 +01:00
itsCrafted
a9579e6fa5
Update to Font Awesome 4.0.3
...
This will require you to change any icons that use the "icon-iconname"
format. Please consult the FontAwesome docs for more info.
2014-01-19 14:55:31 -05:00
czaks
c0190bbd64
update google analytics code
2014-01-19 14:54:44 -05:00
czaks
0986f77113
sitemap theme: fix php notice
2014-01-19 14:53:07 -05:00
czaks
1a88ea3271
fix previous commit
2014-01-19 14:45:20 -05:00
czaks
f0a13ea874
unify code with post_thread (see previous commit)
2014-01-19 14:45:14 -05:00
czaks
7ae9b05b28
fix clicking on post ids with dynamically loaded javascript
2014-01-19 14:45:07 -05:00
czaks
3718081470
add missing thumbnails for themes: catalog and sitemap
2014-01-19 14:44:52 -05:00
czaks
198e68d399
remove rrdtool theme; STI told me that it never really worked
2014-01-19 14:44:47 -05:00
czaks
a294fb6952
categories theme: include boardlist for real
2014-01-19 14:44:37 -05:00
itsCrafted
c31cd98b93
Update to Font Awesome 4.0.3
...
This will require you to change any icons that use the "icon-iconname"
format. Please consult the FontAwesome docs for more info.
2014-01-14 21:29:40 +00:00
czaks
cdb988c6d4
rename banner class to board_image in order to evade some adblock rules
2014-01-06 16:38:48 +01:00
czaks
56742a5f9a
i prefer for the top ads to be over the boardlist
2014-01-06 03:28:37 +01:00
czaks
1b706ddc92
update google analytics code
2014-01-05 06:14:20 +01:00
czaks
4202e8123d
sitemap theme: fix php notice
2014-01-04 18:18:35 +01:00
czaks
b36cb115ae
solution of (our) quick-reply and antispam conflict
2014-01-04 01:42:16 +01:00
czaks
08e4fd9a0a
declare active_page for page.html template
2013-12-25 18:31:35 +01:00
czaks
c918953d33
catalog theme: integrate with the styling framework of tinyboard; allow for js
2013-12-25 17:46:13 +01:00
czaks
9d8718d01a
fix previous commit
2013-12-25 14:24:17 +01:00
czaks
dfd32615f3
unify code with post_thread (see previous commit)
2013-12-25 14:23:16 +01:00
czaks
c23c792a21
fix clicking on post ids with dynamically loaded javascript
2013-12-25 14:16:28 +01:00
czaks
0d34594904
add missing thumbnails for themes: catalog and sitemap
2013-12-24 17:06:08 +01:00
czaks
ef927882e0
remove rrdtool theme; STI told me that it never really worked
2013-12-24 16:41:11 +01:00
czaks
09b7b6a116
categories theme: include boardlist for real
2013-12-24 16:35:27 +01:00
czaks
fbb3fe2df8
ukko: hiding boards was not permanent
2013-12-24 16:29:14 +01:00
czaks
37fe209290
fix sql error in ukko when using db prefix. thank you based bush
2013-12-22 20:18:10 +01:00
czaks
f5657caf24
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
...
Conflicts:
inc/config.php
install.php
post.php
stylesheets/style.css
2013-11-11 21:54:35 +01:00
Michael Foster
c8062fbf76
CSRF more mod pages
2013-09-23 16:48:56 +10:00
Michael Foster
04cfeaf01c
hide expired cache shit
2013-09-23 10:38:06 +10:00
Michael Foster
6eefc5ea2a
.
2013-09-23 10:26:13 +10:00
Michael Foster
4ce6218ba0
Some APC libraries/versions do stuff differently.
2013-09-23 10:24:29 +10:00
Michael Foster
fcbc211314
Fixed weird bug with ?/debug/sql trying to allocate a few GB on some instances. Assuming bug with APCu.
2013-09-23 10:21:18 +10:00
Michael Foster
39be89ba49
?/debug/apc
2013-09-23 10:11:16 +10:00
Michael Foster
902da76433
don't show ban appeal for short bans
2013-09-21 12:58:12 +10:00
Michael Foster
a9b7f9b1bc
begin implementation of in-built ban appealing
2013-09-21 12:51:23 +10:00
czaks
99a2e1cf3d
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
...
Conflicts:
js/quick-reply.js
2013-09-18 09:00:22 -04:00
Michael Foster
d13f30b39f
js/settings.js: Simple config stuff for javascript extensions
2013-09-18 14:40:39 +10:00
czaks
8ca495e5b8
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
...
Conflicts:
inc/config.php
2013-09-17 19:12:19 -04:00
Michael Foster
57e4292e9d
Improvements to showing post in ban
2013-09-18 08:56:04 +10:00
Michael Foster
3471f7c668
Optionally show post user was banned for
2013-09-18 08:47:34 +10:00
czaks
6cb7eb939e
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
...
Conflicts:
inc/config.php
inc/display.php
inc/mod/pages.php
install.php
js/quick-reply.js
post.php
templates/index.html
2013-09-17 10:43:44 -04:00
Michael Foster
803f0c8ce1
Fix search for new bans table
2013-09-17 09:35:13 +10:00
Michael Foster
3e57bb04d7
Begin upgrade to much better bans table. DO NOT PULL YET; It won't work.
2013-09-17 09:15:24 +10:00
Michael Foster
5d108319eb
fix some weirdness
2013-09-16 03:51:36 +10:00