Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-12-11 23:36:02 +01:00
Code Releases Wiki Activity
7,696 Commits 50 Branches 28 Tags 71 MiB
d45852c3dd
Commit Graph

1666 Commits

Author SHA1 Message Date
Michael Walker
8aff83bdd4 Fix unsanitised text vulnerability in post/fileinfo.html 2014-07-05 21:57:06 +01:00
Michael Walker
ebdee08d75 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
8chan
f4cf55dbe4 Fix issue #45 2014-06-24 19:41:00 +00:00
8chan
ef810b1fda Fix issue #45 2014-06-24 19:40:16 +00:00
8chan
d6ddd5edf2 Merge vichan-devel 2014-06-21 19:39:55 +00:00
8chan
5b395c014c Merge https://github.com/vichan-devel/vichan 2014-06-21 19:37:24 +00:00
czaks
3895223922 Merge 4.5 
Conflicts:
	templates/post_thread.html
 2014-06-21 20:50:41 +02:00
czaks
f8aa9c7d7c 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
8chan
27bca279ac 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
72c873551e 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
czaks
36dd8c607e 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
4dea8c7a59 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
103a266421 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
Techan
7bf6c97e78 Improve main page template 2014-06-20 23:25:08 +02:00
8chan
4dc1d3e315 No index 2014-06-17 23:00:36 +00:00
czaks
8a189e2380 fix upgrade path a little bit with a new catalog 2014-06-16 11:29:18 +02:00
czaks
36d01fdb7d 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
8f49b148b3 Add scripts to catalog page 2014-06-12 17:27:18 +00:00
8chan
255ed9330c Add scripts to catalog page 2014-06-12 17:26:21 +00:00
8chan
1d6f46d9bb Fix scroll to issues with post-hover.js, clean up highlightReply 2014-06-12 15:36:40 +00:00
8chan
a997ce9e8d Fix scroll to issues with post-hover.js, clean up highlightReply 2014-06-12 15:36:40 +00:00
8chan
ce53832fdf Fix scroll to issues with post-hover.js, clean up highlightReply 2014-06-12 15:36:01 +00:00
8chan
044bfa5b05 Merge vichan-devel 2014-06-10 18:16:16 +00:00
czaks
c2cbbe7e22 Merge 4.5 
Conflicts:
	js/expand-too-long.js
 2014-06-10 17:51:03 +02:00
czaks
42352e6180 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
Chen-Pang He
8123bbffc8 Set viewport to basic theme 2014-06-10 17:40:47 +02:00
8chan
1d4e3ad7b9 Fix board stylesheets not being respected on +50 2014-06-05 14:35:51 +00:00
8chan
09ef0bc944 Banners commit 2014-05-23 21:20:27 +00:00
8chan
64b6385921 Merge https://github.com/vichan-devel/vichan 2014-05-21 23:41:47 +00:00
Fredrick Brennan
696e5e59d2 Fix issue #60 2014-05-20 21:23:33 -04:00
Fredrick Brennan
1db32eff47 Fix issue #60 2014-05-20 21:23:33 -04:00
8chan
c77526afa6 Merge https://github.com/vichan-devel/vichan 2014-05-19 19:39:35 +00:00
Fredrick Brennan
0be16cf178 Fix js error when allow_delete is false 2014-05-19 14:11:24 -04:00
Fredrick Brennan
054b9b8220 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
Fredrick Brennan
c248646b74 Fix edit board link not appearing 2014-05-18 21:18:06 -04:00
8chan
dc07975c2f Fix edit link not appearing 2014-05-18 19:37:45 +00:00
8chan
07af40e01e Merge https://github.com/vichan-devel/vichan 2014-05-17 19:51:05 +00:00
czaks
ea47e000f4 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-05-16 10:47:16 +02:00
czaks
5de6227fdd 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
Jano Slota
77a5b5c525 Fixed image identification 2014-05-16 10:47:10 +02:00
8chan
da4a310d3f Merge ../test 2014-05-14 17:54:11 +00:00
8chan
ed54529f29 Fix catalog if no files 2014-05-14 17:53:59 +00:00
8chan
02d07f02f2 Merge https://github.com/vichan-devel/vichan 2014-05-14 17:53:36 +00:00
Fredrick Brennan
9b3f8421fc Fix displaying bans 2014-05-14 13:51:49 -04:00
Fredrick Brennan
57cf56ad9b Fix displaying bans 2014-05-14 13:51:49 -04:00
8chan
2fff8835a2 SWITCH TO 5.0; MERGE VICHAN 2014-05-14 16:09:04 +00:00
8chan
3468d324ec Fix failed merge 2014-05-12 19:45:42 +00:00
czaks
4288898dfa Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-05-10 21:58:34 +02:00
czaks
0f9e2a5a9d 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
czaks
5caed72059 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
Jano Slota
adc7288529 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
ea6c9fbe39 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
d60be0de98 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
Jason Lam
a611ddcbc4 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
Jano Slota
4c31dec50e 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
Fredrick Brennan
9ef2d02b5c 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
20cfc8f230 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
8chan
4f4267661b Merge ../http 2014-05-05 15:05:41 +00:00
8chan
6416152794 Fix stylesheet issue for mod 2014-05-05 15:05:18 +00:00
8chan
86ae70770c Merge vichan-devel 2014-05-05 15:04:41 +00:00
czaks
73eb8c6b58 quick & dirty youtube thumbnails in catalog support 2014-05-04 01:20:12 +02:00
czaks
094b5a21c1 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
59e614eb1f 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
Fredrick Brennan
4460b08096 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
8ad1edf5d7 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
7ab87343b7 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
d4753786c7 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
czaks
d3e03c1125 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
Fredrick Brennan
a781ceb041 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
e04cbe9e6f 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
004b0701c1 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
29ca1decd9 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
7ca6ce25f5 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
czaks
8c7505d396 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
copypaste
f178769a0a multiimage posting 2014-04-27 15:48:47 +02:00
8chan
7f56103958 Search page fix 2014-04-23 21:59:41 +00:00
8chan
03dea2173e Merge vichan 2014-04-21 13:46:04 +00:00
czaks
0ec6355358 fix recentposts theme building null query, throw error instead 2014-04-20 23:33:52 +02:00
czaks
a4689d5239 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
czaks
dc93b06d90 update copyright footers in themes 2014-04-20 02:27:54 +02:00
8chan
b1688235dd Merge vichan-devel 2014-04-19 20:11:34 +00:00
8chan
8620e96971 Re-add board into querystring for banners 2014-04-19 20:03:54 +00:00
8chan
071ffaa69c Attempt to fix scroll to anchor issue 2014-04-19 20:02:39 +00:00
8chan
6d7dc7d2d5 Remove openBoard() from ukko 2014-04-19 20:02:15 +00: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
kaf
1c2aa523a3 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
6f39fecb53 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
388867d67f apply new branding for vichan-devel 2014-04-17 17:11:32 +02:00
8chan
c555a88aa9 Fix stylechooser 2014-04-17 00:41:33 +00:00
root
b30fff7ca7 Merge unmerged live changes 2014-04-16 15:14:02 +00:00
root
e34fe06db1 Merge vichan-devel! 2014-04-16 15:05:32 +00:00
czaks
59874b8376 modularize post templates a little more 2014-04-16 15:01:37 +02:00
czaks
037c29619d 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
08f3044a7b 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
de2e9ae11a 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
czaks
b3628f460e 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
Michael Reiley
2a2df69a10 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
afd5bf7510 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
18de02655f fix paths in templates 2014-04-06 21:48:31 +02:00
8chan Admin
195c587dc0 Catalog 8chan fixes 2014-04-05 21:04:46 +00:00
8chan Admin
89fd0a67ad add footer to page.html 2014-04-05 16:25:39 +00:00
8chan Admin
f0be54b98b add meta_description 2014-04-05 16:25:20 +00:00
8chan Admin
3301548eee fix bug where mods could see bans not on their board on IP page 2014-04-05 16:24:26 +00:00
czaks
f0b2240b5f Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration 2014-03-25 13:03:37 +01:00
czaks
6c6fc583df 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
8fa7660cb9 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
bb608e4520 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
df2292ee34 add a javascript 2014-03-25 12:09:12 +01:00
czaks
fe95b33022 recent posts link 2014-03-25 12:05:07 +01:00
czaks
eb8261d88f 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
684ba051fe 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
c2df76af94 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
sinuca
09aed5f20a "Favelog" theme added. Just a catalog with ordering functionality 2014-03-25 11:03:09 +01:00
8chan Admin
6d992068aa Merged sti/Tinyboard 2014-03-13 15:50:17 +00:00
czaks
75cca1ffb2 fix previous commit 2014-02-24 15:29:26 +01:00
czaks
a5b6098737 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
91d10009c4 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
2adeb199bd 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
06d7f74f33 installer: update to font-awesome 3.0 or 4.0 it was 2014-02-20 10:37:15 +01:00
8chan Admin
0dfa7fb087 Global reports function 2014-02-16 20:18:15 +00:00
8chan Admin
15b7d7afec Board argument for banners 2014-02-13 01:01:54 +00:00
8chan Admin
9c433a9390 Per-board banners 2014-02-08 06:01:51 +00:00
czaks
5c9c095e84 okay, that dready css rule refered to this... 2014-02-01 21:53:46 +01:00
czaks
862cc8bc6c 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
fbe3db84f8 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
6cc4c1b811 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
czaks
45c6e87c73 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
itsCrafted
da23a924b9 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
0de72dfde0 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
927699f820 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
dcf21eb6c6 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
335e6b8c91 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
2950e59560 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
4a5945d47d 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
82249c18be 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
czaks
343c9162f5 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
itsCrafted
e427443dda 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
3b81319f5f 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
f84e9c1bce 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
418783d878 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
f4d3112617 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
e21d21e18f solution of (our) quick-reply and antispam conflict 2014-01-04 01:42:16 +01:00
8chan Admin
4adeaaa84c Fix JS 2013-12-27 22:25:28 +00:00
8chan Admin
eaab7e28de Show sages 2013-12-26 19:47:26 +00:00
czaks
08e4fd9a0a declare active_page for page.html template 2013-12-25 18:31:35 +01:00
czaks
08faec17b0 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
10066e2cb7 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
ffbb6da4a8 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
66678a3d75 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
f64ab4fd1c 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
d2e597a22c 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
1e8567e297 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
ad941225e8 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
8ad32c7ba8 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
a60183cce9 fix sql error in ukko when using db prefix. thank you based bush 2013-12-22 20:18:10 +01:00
8chan Admin
d645efe744 Update to font awesome 4 2013-12-02 21:13:08 +00: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
czaks
fdc3b81314 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
8chan Admin
a89f181bab Fix spoiler image appearing when disabled images 2013-10-31 22:15:06 +00:00
8chan Admin
bb2474ae6a Only show default stylesheet to non-mods 2013-10-30 16:59:05 +00:00
8chan Admin
fb34b276d9 Fix View IP page 2013-10-30 09:06:06 +00:00
8chan Admin
1b211568c0 config disable images 2013-10-27 23:27:23 +00:00
8chan Admin
6ad5eededa Fix custom stylesheets & fix bug where couldn't post if previously banned 2013-10-27 15:12:21 +00:00
8chan Admin
137f449351 Looked at dashboard modLog for expire.php 2013-10-26 11:26:08 +00:00
8chan Admin
803b16853e Make it so you can have different stylesheets per board 2013-10-25 01:42:45 +00:00
8chan Admin
240d044660 Don't show users boards they can't control 2013-10-25 01:20:23 +00:00
8chan Admin
0b3995f111 Only show our boards in dashboard 2013-10-24 17:25:31 +00:00
8chan Admin
b997e2de56 Add my notice 2013-10-23 10:01:28 +00:00
8chan Admin
22d308d10c Bold own username 2013-10-23 01:00:51 +00:00
Michael Foster
c8062fbf76 CSRF more mod pages 2013-09-23 16:48:56 +10:00
Michael Foster
1b2aafae7f 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
cd3a456a03 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
b90e0e28fb . 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
444c89170d 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
d21fffce98 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
9163caba5e ?/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
dd4d9b354e 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
Michael Foster
83fa2d2768 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
czaks
4ac087a289 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
Michael Foster
f5aa40dc3b 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
czaks
d3383dd140 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
9bde03ae7d 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
Michael Foster
0ae3a583db 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
czaks
688a228884 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
45568651ce 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
309f6ffbdc 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
Michael Foster
9fb478d942 fix some weirdness 2013-09-16 03:51:36 +10:00
Michael Foster
41a3f9be25 bugfix and work with other stylesheets 2013-09-15 10:29:35 +10:00
Michael Foster
9bffc85a66 bugfix and work with other stylesheets 2013-09-15 10:29:35 +10:00
Michael Foster
c8f2f00320 fix bug with quick-reply and make it nicer 2013-09-15 07:31:05 +10:00
Michael Foster
9ce0d60bba fix bug with quick-reply and make it nicer 2013-09-15 07:31:05 +10:00
Michael Foster
9a8cebe4a1 add real quick reply (wtf was the other thing?) 2013-09-15 07:17:02 +10:00
Michael Foster
7a86403ed0 add real quick reply (wtf was the other thing?) 2013-09-15 07:17:02 +10:00
Michael Foster
961e3d3fe0 dock top nav bar in top right corner for now, because it looks shit everywhere else 2013-09-15 05:46:27 +10:00
Michael Foster
5981aa8ee7 dock top nav bar in top right corner for now, because it looks shit everywhere else 2013-09-15 05:46:27 +10:00
Michael Foster
92550d5084 Better position of top nav bar? Shit css 2013-09-15 00:53:45 +10:00
Michael Foster
7c8a3ef152 Better position of top nav bar? Shit css 2013-09-15 00:53:45 +10:00
Michael Foster
c4a6116722 Optionally show page navigation bar at the top too. 2013-09-15 00:42:20 +10:00
Michael Foster
d3c864e8c1 Optionally show page navigation bar at the top too. 2013-09-15 00:42:20 +10:00
Michael Foster
5da8f28726 Improvements to ?/debug/antispam and ?/debug/recentc 2013-09-09 20:16:13 +10:00
Michael Foster
55d9396504 Improvements to ?/debug/antispam and ?/debug/recentc 2013-09-09 20:16:13 +10:00
Michael Foster
2fae55c094 debug/sql: show "NULL" for null columns 2013-09-09 19:59:25 +10:00
Michael Foster
2287e040fc debug/sql: show "NULL" for null columns 2013-09-09 19:59:25 +10:00
Michael Foster
a9b93d2760 "Are you sure you want to demote yourself?" 2013-09-09 19:17:18 +10:00
Michael Foster
ec9e79e4f5 "Are you sure you want to demote yourself?" 2013-09-09 19:17:18 +10:00
Michael Foster
eea4e42609 Add ability to create custom user/permissions groups 2013-09-09 01:33:51 +10:00
Michael Foster
7927ac598c Add ability to create custom user/permissions groups 2013-09-09 01:33:51 +10:00
czaks
069f1def9b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	install.php
 2013-09-01 11:25:19 -04:00
czaks
ff06aa2293 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	install.php
 2013-09-01 11:25:19 -04:00
Michael Foster
22fcca343f New index in post tables for listing threads slightly faster (index pages) 2013-09-01 22:15:03 +10:00
Michael Foster
bf4e0f0bf5 New index in post tables for listing threads slightly faster (index pages) 2013-09-01 22:15:03 +10:00
Michael Foster
cf3173d226 Fix issue #136 2013-09-01 09:57:09 +10:00
Michael Foster
a3329541b9 Fix issue #136 2013-09-01 09:57:09 +10:00
Michael Foster
b51fc38783 Some SQL and indexes improvements 2013-09-01 02:04:42 +10:00
Michael Foster
d0ec7bf913 Some SQL and indexes improvements 2013-09-01 02:04:42 +10:00
ctrlcctrlv
2804c6b775 Merge remote-tracking branch 'upstream/master' (vichan-devel) 2013-08-29 13:43:50 +00:00
ctrlcctrlv
02704eac84 Merge remote-tracking branch 'upstream/master' (vichan-devel) 2013-08-29 13:43:50 +00:00
ctrlcctrlv
ee52dcb583 Fix number of replies sometimes displaying next to image 2013-08-29 13:41:36 +00:00
ctrlcctrlv
b71dedce2e Fix number of replies sometimes displaying next to image 2013-08-29 13:41:36 +00:00
czaks
8de81d176c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
 2013-08-29 07:33:19 -04:00
czaks
bfe7ec8166 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
 2013-08-29 07:33:19 -04:00
Michael Foster
0bb254fdb3 Critical bugfix: SQL typo 2013-08-29 12:30:16 +10:00
Michael Foster
b3d7bd6019 Critical bugfix: SQL typo 2013-08-29 12:30:16 +10:00
czaks
8503e65858 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/functions.php
	install.php
	stylesheets/dark_roach.css
 2013-08-28 12:41:36 -04:00
czaks
3a8f106e85 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/functions.php
	install.php
	stylesheets/dark_roach.css
 2013-08-28 12:41:36 -04:00
Michael Foster
f8f375ec30 Sitemap theme: Minimum time between generating, and only generate on post-thread and post-delete 2013-08-28 18:30:01 +10:00
Michael Foster
80a24ea74a Sitemap theme: Minimum time between generating, and only generate on post-thread and post-delete 2013-08-28 18:30:01 +10:00
Michael Foster
5aaa6887f6 Add ip index to post tables for faster ?/IP/ (and flood detection, etc.) 2013-08-28 18:02:28 +10:00
Michael Foster
e7d3738659 Add ip index to post tables for faster ?/IP/ (and flood detection, etc.) 2013-08-28 18:02:28 +10:00
Dan Saunders
bb06593ef5 Added post-delete handling on themes that should use it. 2013-08-26 13:36:14 +10:00
Dan Saunders
5fc304773b Added post-delete handling on themes that should use it. 2013-08-26 13:36:14 +10:00
czaks
de035f4a7e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	stylesheets/dark_roach.css
	stylesheets/style.css
 2013-08-20 18:22:37 -04:00
czaks
c167e38252 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	stylesheets/dark_roach.css
	stylesheets/style.css
 2013-08-20 18:22:37 -04:00
Michael Foster
db8173fe62 Remember post password if entered manually 2013-08-20 23:34:41 +10:00
Michael Foster
36a34be39f Remember post password if entered manually 2013-08-20 23:34:41 +10:00
Michael Foster
abfdd38e59 Unicode bi-directional text: Finally a working fix 2013-08-19 23:47:56 +10:00
Michael Foster
35331580c3 Unicode bi-directional text: Finally a working fix 2013-08-19 23:47:56 +10:00
ctrlcctrlv
db5ce2cb8f Merge remote-tracking branch 'upstream/master' 2013-08-19 13:21:25 +00:00
ctrlcctrlv
0726c2ad7b Merge remote-tracking branch 'upstream/master' 2013-08-19 13:21:25 +00:00
ctrlcctrlv
fd398f82ed Fix reply moving 2013-08-19 13:20:10 +00:00
ctrlcctrlv
5246148c78 Fix reply moving 2013-08-19 13:20:10 +00:00
Michael Foster
5438d7cf64 add alt="" to flags to make it standards-compliant 2013-08-19 20:31:15 +10:00
Michael Foster
c6cde83f04 add alt="" to flags to make it standards-compliant 2013-08-19 20:31:15 +10:00
czaks
5389b0f358 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-18 19:26:31 -04:00
czaks
451a4e062c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-18 19:26:31 -04:00
Michael Foster
d2fdeead64 bidi_cleanup: Just replace with HTML5's <bdi> (for now, at least). The old code was hardly working, and had issued with older PHP versions. 2013-08-19 05:19:54 +10:00
Michael Foster
ade761a88e bidi_cleanup: Just replace with HTML5's <bdi> (for now, at least). The old code was hardly working, and had issued with older PHP versions. 2013-08-19 05:19:54 +10:00
czaks
da1b7d087e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	install.php
 2013-08-18 13:16:31 -04:00
czaks
311c18b34d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	install.php
 2013-08-18 13:16:31 -04:00
ctrlcctrlv
f8837ad60c Add option to update catalog on new posts as well as new threads 2013-08-19 03:08:02 +10:00
ctrlcctrlv
d12ec4a82c Add option to update catalog on new posts as well as new threads 2013-08-19 03:08:02 +10:00
Michael Foster
5051e0572a Missing theme conf type "checkbox" 2013-08-19 02:03:54 +10:00
Michael Foster
139741c07e Missing theme conf type "checkbox" 2013-08-19 02:03:54 +10:00
Michael Foster
844a337e03 Make file and thumb 255 chars 2013-08-18 20:59:46 +10:00
Michael Foster
3504b31052 Make file and thumb 255 chars 2013-08-18 20:59:46 +10:00
Michael Foster
dcf97d6b5b Add optional modifier: <tinyboard is_file> to tell Tinyboard that even though an image might have a thumbnail, it could still be a non-image upload 2013-08-18 18:17:12 +10:00
Michael Foster
d7118307b9 Add optional modifier: <tinyboard is_file> to tell Tinyboard that even though an image might have a thumbnail, it could still be a non-image upload 2013-08-18 18:17:12 +10:00
czaks
ed16e40e20 upload: add ids for a script for selection 2013-08-17 16:37:15 -04:00
czaks
326d25a288 upload: add ids for a script for selection 2013-08-17 16:37:15 -04:00
ctrlcctrlv
6cb863005d Edit images in thread/board using Oekaki 2013-08-17 18:56:16 +00:00
ctrlcctrlv
a30675030c Edit images in thread/board using Oekaki 2013-08-17 18:56:16 +00:00
ctrlcctrlv
e3600131fc Configurable canvas size 2013-08-17 18:00:26 +00:00
ctrlcctrlv
f5360ad6c1 Configurable canvas size 2013-08-17 18:00:26 +00:00
ctrlcctrlv
7c5222ffb5 Make it so oekaki can be disabled 2013-08-17 17:36:38 +00:00
ctrlcctrlv
18a103a68d Make it so oekaki can be disabled 2013-08-17 17:36:38 +00:00
czaks
ca565d07c2 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/display.php
 2013-08-16 16:06:54 -04:00
czaks
b7948c8e3d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/display.php
 2013-08-16 16:06:54 -04:00
Michael Foster
8858127498 Bugfix: post.filex => post.fileheight, etc. 2013-08-17 04:07:32 +10:00
Michael Foster
b2580d4a18 Bugfix: post.filex => post.fileheight, etc. 2013-08-17 04:07:32 +10:00
czaks
b0312d4d36 ukko: fix for new new Post and new Thread syntax 2013-08-16 10:13:06 -04:00
czaks
de148485a6 ukko: fix for new new Post and new Thread syntax 2013-08-16 10:13:06 -04:00
czaks
146243c473 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
 2013-08-16 10:07:24 -04:00
czaks
e440851526 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
 2013-08-16 10:07:24 -04:00
Michael Foster
0565e2119d Bugfix: Thumbnail sizes (thumbx => thumbwidth, etc.) 2013-08-16 23:25:32 +10:00
Michael Foster
5353e38328 Bugfix: Thumbnail sizes (thumbx => thumbwidth, etc.) 2013-08-16 23:25:32 +10:00
Michael Foster
0ad1c03997 Optional "flag style" and "flag alt" modifiers 2013-08-16 23:12:40 +10:00
Michael Foster
cca020be80 Optional "flag style" and "flag alt" modifiers 2013-08-16 23:12:40 +10:00
Michael Foster
a9fe4ea2db Change flag_country to just flag 2013-08-16 22:12:25 +10:00
Michael Foster
2cc9eb468a Change flag_country to just flag 2013-08-16 22:12:25 +10:00
Michael Foster
4876a27232 Much better post modifiers: raw HTML, ban messages, etc. 2013-08-16 21:25:56 +10:00
Michael Foster
44e16593b6 Much better post modifiers: raw HTML, ban messages, etc. 2013-08-16 21:25:56 +10:00
Michael Foster
b666886416 A few modifications: 
1. Finally, clean up some of the crappy code in inc/display.php; no more extreme clutter. new Thread() and new Post() take an array as the first parameter now.

2. Poster country flags. Currently requires the "geoip" extension.

3. Give post images a classname. This was also long-overdue.
 2013-08-16 21:08:01 +10:00
Michael Foster
5fdc0878c9 A few modifications: 
1. Finally, clean up some of the crappy code in inc/display.php; no more extreme clutter. new Thread() and new Post() take an array as the first parameter now.

2. Poster country flags. Currently requires the "geoip" extension.

3. Give post images a classname. This was also long-overdue.
 2013-08-16 21:08:01 +10:00
czaks
4f855cf3b3 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
 2013-08-13 14:46:16 -04:00
czaks
13e0e451da Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
 2013-08-13 14:46:16 -04:00
Michael Foster
0de0bc6ceb Optional: Allow uploading by URL 2013-08-12 22:51:46 +10:00
Michael Foster
44590b5756 Optional: Allow uploading by URL 2013-08-12 22:51:46 +10:00
czaks
d3b0a55dd9 noko50: small fixes in template 2013-08-11 17:52:35 -04:00
czaks
95c95cb85b noko50: small fixes in template 2013-08-11 17:52:35 -04:00
czaks
8534e2cc80 Merge branch 'noko50-new-dev11' of http://github.com/fallenPineapple/Tinyboard 
Conflicts:
	inc/functions.php
 2013-08-11 17:49:29 -04:00
czaks
0c52d1b93c Merge branch 'noko50-new-dev11' of http://github.com/fallenPineapple/Tinyboard 
Conflicts:
	inc/functions.php
 2013-08-11 17:49:29 -04:00
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
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
aecfc37510 Rename ban_page_message to ban_page_extra 2013-08-11 21:30:02 +10:00
Michael Foster
9695c327db 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
2278762000 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
edd197586f 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
ctrlcctrlv
48ac445038 Allow for HTML in the board subtitle 
Conflicts:
	inc/config.php
 2013-08-11 21:08:19 +10:00
fallenPineapple
12ee85beaf Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
fallenPineapple
42f6b8e0bb Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
czaks
ef4cf16a73 fix submit button not showing when topic disabled (after merge) 2013-08-09 17:36:07 -04:00
czaks
a8738268b3 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
de4c965b4d Option to have a message on the ban page 2013-08-09 19:55:25 +00:00