1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-30 02:04:35 +01:00
Commit Graph

240 Commits

Author SHA1 Message Date
czaks
643de18d64 Merge with a private vichan branch
Conflicts:
	inc/bans.php
	inc/mod/pages.php
2014-10-08 23:32:01 +02:00
czaks
9b3fa77719 new banlist implementation; also includes a public banlist 2014-10-08 23:23:59 +02:00
8chan
ba88035109 Edited at feature...add edited_at DATETIME NULL to all tables to use it. 2014-10-07 17:35:50 -07:00
8chan
c4dc3f4d47 Fix spoiler image not working 2014-10-07 04:33:57 +02:00
8chan
47e81b7e9b Fix spoiler image not working 2014-10-06 18:02:50 -07:00
czaks
4a4c985235 missed one line 2014-10-05 18:16:18 +02:00
czaks
8b698e36e7 Merge https://github.com/vichan-devel/vichan
Conflicts:
	inc/mod/pages.php
	js/auto-reload.js
	js/id_colors.js
	js/id_highlighter.js
	stylesheets/style.css
	templates/index.html
2014-10-05 18:12:19 +02:00
kaf
fe60590d19 Check spoiler_image size before ussuming it is 128×128px 2014-10-05 15:26:28 +00:00
8chan
19e864c15c I don't know what I did. 2014-09-25 22:53:56 +00:00
8chan
adb1294016 Merge https://github.com/vichan-devel/vichan 2014-09-13 16:38:06 +00: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
8chan
0ac9aaaf25 Merge vichan-devel 2014-08-10 14:41:40 +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
8chan
f7c7b8cd48 Merge https://github.com/vichan-devel/vichan 2014-07-08 15:33:08 +00:00
czaks
f97d2dff85 fix previous commit 2014-07-08 09:44:30 +02:00
czaks
9526f5ed1c fix #72 2014-07-08 09:43:04 +02:00
8chan
8cd15c9dd8 Merge https://github.com/vichan-devel/vichan 2014-06-21 19:37:24 +00:00
czaks
2c883fda0a fix ban appeals; thanks to sraczynski for reporting 2014-06-16 11:39:56 +02:00
8chan
c493642bce Merge https://github.com/vichan-devel/vichan 2014-06-12 14:37:36 +00:00
czaks
427a9938a7 Merge 4.5 2014-06-12 03:12:56 +02:00
Chen-Pang He
7933abd271 Fix vichan #65
Conflicts:
	inc/mod/auth.php
	inc/mod/pages.php
2014-06-12 03:12:27 +02:00
8chan
66066304c1 Merge https://github.com/vichan-devel/vichan 2014-06-11 00:10:05 +00:00
czaks
503903ac0f Merge 4.5 2014-06-11 02:05:14 +02:00
czaks
23d6e82038 $_SERVER[HTTPS] isn`t being always set; fixes #65 2014-06-11 02:04:59 +02:00
8chan
1006aa3132 Merge vichan-devel 2014-06-10 23:13:42 +00:00
Fredrick Brennan
4f070d16e5 Congrats, you broke the mod page on non-secured servers @jdh8 2014-06-10 23:09:39 +00:00
8chan
bc984261be 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
Chen-Pang He
6716a24b68 Send cookie only via HTTPS if a mod logs in via HTTPS, which is the case on this site 2014-06-10 17:42:18 +02:00
8chan
dc8d8e5bcd Fix cache error when board deleted 2014-05-29 14:41:20 +00:00
8chan
cf23161365 Merge https://github.com/vichan-devel/vichan 2014-05-19 19:39:35 +00:00
Fredrick Brennan
65a14a0d39 Fix moving of deleted files 2014-05-19 14:00:16 -04:00
8chan
1355908418 Fix order in ?/users 2014-05-17 19:50:28 +00:00
8chan
8ac012b1c5 Thanks to Bill Karwin on SO (http://stackoverflow.com/a/23703118/1901658), speed up ?/users dramatically 2014-05-16 19:44:01 +00:00
8chan
c26e339a77 SWITCH TO 5.0; MERGE VICHAN 2014-05-14 16:09:04 +00:00
8chan
12e9f5b4d9 Fix cache issue for listBoards() 2014-05-05 15:05:32 +00:00
Fredrick Brennan
5039584a5e Fix ?/recent str_replace issue 2014-05-04 19:24:34 -04:00
Fredrick Brennan
042e7b9c59 Deprecate postControls(), per-file deletion and spoilering 2014-04-30 17:18:35 -04:00
Fredrick Brennan
24753907eb remove var_dump 2014-04-29 20:18:30 -04:00
Fredrick Brennan
53e33d414f Fix mod_move for multi image 2014-04-29 19:14:10 -04:00
Fredrick Brennan
2b3942d19d Fix mod_move for multi image 2014-04-29 19:07:13 -04:00
czaks
bb5446a93d Merge remote-tracking branch 'origin/br-integration' into staging 2014-04-29 21:35:50 +02:00
copypaste
c483e1258c multiimage posting 2014-04-27 15:48:47 +02:00
root
44729bfc32 Merge unmerged live changes 2014-04-16 15:14:02 +00:00
root
f3585ebfb0 Merge vichan-devel! 2014-04-16 15:05:32 +00:00
8chan Admin
37f2c80e30 fix bug where mods could see bans not on their board on IP page 2014-04-05 16:24:26 +00:00
czaks
9d9d514919 we no have any modpages.html 2014-03-25 11:57:36 +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
8chan Admin
f456f86a87 Global reports function 2014-02-16 20:18:15 +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