1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-02-09 15:58:38 +01:00

3487 Commits

Author SHA1 Message Date
czaks
97a22e57c1 Remove imgcaptcha, this code is unused in any of our forks and needs work to get here back.
Revert "Merge branch 'imgcaptcha' of https://github.com/asiekierka/Tinyboard"

This reverts commit 49afb685c8e658c0f36b8171e176363538eb9419, reversing
changes made to 2451a0f29c08e23ff36ef113082c112224f7e576.

Conflicts:

	js/imgcaptcha.js
2013-07-20 22:47:26 -04:00
czaks
600324b137 Remove imgcaptcha, this code is unused in any of our forks and needs work to get here back.
Revert "Merge branch 'imgcaptcha' of https://github.com/asiekierka/Tinyboard"

This reverts commit 49afb685c8e658c0f36b8171e176363538eb9419, reversing
changes made to 2451a0f29c08e23ff36ef113082c112224f7e576.

Conflicts:

	js/imgcaptcha.js
2013-07-20 22:47:26 -04:00
czaks
8772c31ce1 post search: missed default config 2013-07-20 22:45:21 -04:00
czaks
c8a72be62f post search: missed default config 2013-07-20 22:45:21 -04:00
czaks
33c7abf11f Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-07-20 22:33:56 -04:00
czaks
52bf3d3623 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-07-20 22:33:56 -04:00
czaks
17952d173c Update Polish translation 2013-07-20 20:23:55 -04:00
czaks
8b3bd5835a Update Polish translation 2013-07-20 20:23:55 -04:00
Czterooki
bc1bc9f6ef Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-07-20 18:28:57 -04:00
Czterooki
5feda30e63 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-07-20 18:28:57 -04:00
czaks
9f323ae65f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/themes/sitemap/info.php
2013-07-20 17:28:34 -04:00
czaks
274a86dd03 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/themes/sitemap/info.php
2013-07-20 17:28:34 -04:00
Michael Foster
67cbc2b1aa Fix permissions with search 2013-07-20 13:15:44 -04:00
Michael Foster
f552849495 Fix permissions with search 2013-07-20 13:15:44 -04:00
Michael Foster
b776e0a7f0 Search update 2013-07-20 12:05:42 -04:00
Michael Foster
f49e6c9fc3 Search update 2013-07-20 12:05:42 -04:00
Michael Foster
e62b83e79c Bring back search (searching posts not implemented yet) 2013-07-20 07:50:33 -04:00
Michael Foster
b34ba883c5 Bring back search (searching posts not implemented yet) 2013-07-20 07:50:33 -04:00
Czterooki
aef4425592 merge with vichan-gold 2013-07-20 00:19:08 -04:00
Czterooki
acf93cda21 merge with vichan-gold 2013-07-20 00:19:08 -04:00
Czterooki
01d9ad9d43 inc/mod/pages.php 2013-07-20 00:05:08 -04:00
Czterooki
36e67de205 inc/mod/pages.php 2013-07-20 00:05:08 -04:00
Czterooki
ad7d15535b config.php 2013-07-20 00:03:45 -04:00
Czterooki
7761dc3fff config.php 2013-07-20 00:03:45 -04:00
Michael Foster
30dc892786 Only store video URLs in database, instead of the generated player HTML. 2013-07-19 18:36:12 -04:00
Michael Foster
731cfba33b Only store video URLs in database, instead of the generated player HTML. 2013-07-19 18:36:12 -04:00
czaks
f04566f6d3 locale: update polish translation 2013-07-18 16:34:22 -04:00
czaks
cef5d586ff locale: update polish translation 2013-07-18 16:34:22 -04:00
czaks
fa66b96240 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	post.php
2013-07-18 15:19:03 -04:00
czaks
495c6fa846 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	post.php
2013-07-18 15:19:03 -04:00
Michael Foster
e4bd9a6886 Themes edit: Split "post" into two seperate actions: "post" (replies) and "post-thread". And add a $board variable. 2013-07-18 12:06:26 -04:00
Michael Foster
34b5f62600 Themes edit: Split "post" into two seperate actions: "post" (replies) and "post-thread". And add a $board variable. 2013-07-18 12:06:26 -04:00
Michael Foster
ce9431ba34 Update filters to work with new ban table 2013-07-18 10:17:19 -04:00
Michael Foster
072e22bdfa Update filters to work with new ban table 2013-07-18 10:17:19 -04:00
czaks
84aaaabece Merge branch 'master' of https://github.com/kaja47/Tinyboard 2013-07-16 13:40:56 -04:00
czaks
49f968fa5d Merge branch 'master' of https://github.com/kaja47/Tinyboard 2013-07-16 13:40:56 -04:00
czaks
7bdb96a16b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
	templates/index.html
	templates/thread.html
2013-07-16 13:02:13 -04:00
czaks
6152ed43bd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
	templates/index.html
	templates/thread.html
2013-07-16 13:02:13 -04:00
Michael Foster
aadb57f2a2 More ban stuff: Show whether or not user has "seen" a ban yet in the ban list and on IP address pages. Purge useless expired ban records. 2013-07-16 08:50:39 -04:00
Michael Foster
390e529717 More ban stuff: Show whether or not user has "seen" a ban yet in the ban list and on IP address pages. Purge useless expired ban records. 2013-07-16 08:50:39 -04:00
Michael Foster
c8f30550af $config['require_ban_view']: Force users to view the "You are banned" page at least once before letting a ban disappear naturally. 2013-07-16 06:33:37 -04:00
Michael Foster
4340e74569 $config['require_ban_view']: Force users to view the "You are banned" page at least once before letting a ban disappear naturally. 2013-07-16 06:33:37 -04:00
Michael Foster
29b10c88db Outputting thread subject in header/title (issue #122) 2013-07-16 02:48:20 -04:00
Michael Foster
9825d8611f Outputting thread subject in header/title (issue #122) 2013-07-16 02:48:20 -04:00
Michael Foster
7302fc57a8 Automatically dismiss all reports regarding a thread after it is locked. 2013-07-16 02:32:44 -04:00
Michael Foster
4eea9507c3 Automatically dismiss all reports regarding a thread after it is locked. 2013-07-16 02:32:44 -04:00
Michael Foster
2144d43f2b Fix issue #24 2013-07-16 02:27:20 -04:00
Michael Foster
a378ff7658 Fix issue #24 2013-07-16 02:27:20 -04:00
Michael Foster
23b27d8057 Add clean() to mod_move function 2013-07-16 01:38:24 -04:00
Michael Foster
a5e04f0ba7 Add clean() to mod_move function 2013-07-16 01:38:24 -04:00