Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-29 01:34:31 +01:00
Code Releases Wiki Activity
7,266 Commits 50 Branches 28 Tags 70 MiB
2f04aefdf5
Commit Graph

3327 Commits

Author SHA1 Message Date
8chan
cfb31c53af Merge https://github.com/ctrlcctrlv/8chan 2014-10-22 19:20:28 -07:00
8chan
0f8aef4f50 I'm going to run this on a cron job instead...people were using this to DoS 2014-10-22 19:19:49 -07:00
8chan
ff225064a1 Add ?/flags [NOT DONE] and $config[allow_delete] to ?/settings 2014-10-22 19:18:23 -07:00
8chan
a8effc870d Fix bans page on Firefox 2014-10-22 19:17:18 -07:00
8chan
840c42adc4 array_unique to prevent JS Errors 2014-10-22 19:16:45 -07:00
8chan
0eba6fa4c3 This was crashing rebuild.php for some reason... 2014-10-22 19:16:13 -07:00
unknown
bac2307140 [#184] Added config+functionality for removing clean status local+global if a post is edited. Fixed an issue where marking a post clean wouldn't trigger template reconstruction. 2014-10-21 08:10:07 -05:00
unknown
9c5ec12aaa [#184] Reports made to clean posts are now ignored correctly (and in accordance with the local/global duality). Marking posts clean dismisses posts (also in accordance with local/global duality). Fixed up some templating issues (now display more correct messages and omit actions that are invalid). Moved Clean action off post-level and into reports action. 2014-10-21 07:50:25 -05:00
unknown
4c8e920303 [#184] Resolved duplicate report issue. Added rudamentary Clean functionality. 2014-10-20 10:17:19 -05:00
czaks
e528250802 enable youtube.js; should reduce lags with too many embeds 2014-10-20 14:33:09 +02:00
unknown
7cac272396 [#184] FUCK PLEASE WORK 2014-10-19 12:10:50 -05:00
unknown
3c2ebb2d6b Merge branch 'master' of git://github.com/ctrlcctrlv/8chan 
Conflicts:
	templates/8chan/index.html
 2014-10-19 11:15:57 -05:00
unknown
01c80bd7ad [#184] System almost completely functional. Woo. 2014-10-19 11:07:07 -05:00
unknown
a8a843bf4b [#184] Added Promote and Demote to reports. CSS improvements. 2014-10-19 00:07:16 -05:00
unknown
3654c4f7ef Signed-off-by: unknown <8n-tech@users.noreply.github.com> 2014-10-19 00:00:58 -05:00
unknown
e90eca7339 [#184] tomorrow.css. 2014-10-18 20:31:25 -05:00
unknown
2d6d449bd2 [#184] Added <body> tag classes. Style selector now adds a <body> class. Moved board list under moderator dashboard. 2014-10-18 20:07:04 -05:00
8chan
0743da4e4b Merge https://github.com/ctrlcctrlv/8chan 2014-10-18 13:33:36 -07:00
8chan
fceea15317 Be smarter about rebuilds 2014-10-18 13:21:08 -07:00
8chan
f1c2388840 8archive.moe 2014-10-18 13:20:46 -07:00
czaks
3f7b37ce59 Merge branch 'master' of https://github.com/ctrlcctrlv/8chan 
Conflicts:
	inc/image.php
 2014-10-18 16:37:03 +02:00
czaks
353dca32d3 Merge https://github.com/vichan-devel/vichan 
Conflicts:
	inc/image.php
 2014-10-18 13:57:02 +02:00
czaks
24548e377c update locales 2014-10-18 13:54:27 +02:00
clsr
49079e57fb Fix expanded tabs 2014-10-18 13:43:25 +02:00
clsr
d266908ca9 Fix API: Swap image width/height, make replies an integer, fix original filename 2014-10-18 13:43:25 +02:00
unknown
ba0a874b27 [#184] Added <body> tag classes. Style selector now adds a <body> class. Moved board list under moderator dashboard. 2014-10-18 03:32:00 -05:00
unknown
36a3cddba0 Merge branch 'master' of git://github.com/ctrlcctrlv/8chan 2014-10-17 02:41:51 -05:00
unknown
9920a51ff5 - Resolved board creation script throwing SQL error for mismatched column count. 
- Resolved warnings would be thrown if inc/dnsbls.php did not exist.
- Resolved problem where shell_exec_error was incorrectly reporting a success in instances where 'md5sum' was not supported, resulting in "'md5sum'" literally being recorded as the file hash. This then lead to hex2bin throwing an error on page load, preventing access to threads (among other problems).
 2014-10-17 02:32:39 -05:00
8chan
d50b86a7c2 underline 2014-10-16 18:53:59 -07:00
8chan
33371bee9f Allow IP less to show more posts 2014-10-16 18:53:52 -07:00
clsr
7e3fd0dcc5 Fix expanded tabs 2014-10-16 17:26:58 +02:00
clsr
6073c9e73a Fix API: Swap image width/height, make replies an integer, fix original filename 2014-10-16 17:08:39 +02:00
8chan
9bf6ebec43 SECURITY: IPs were still being shown on IP_less in a few places 2014-10-12 16:34:34 -07:00
8chan
6052ed8d3d SECURITY: imagemagick/graphicsmagick was ignoring all errors 
So, in a much older patch I had a problem where an incorrect RGB
profile would make image uploads fail. I fixed this by using strpos
against the error message...but didn't check the return value
correctly.

That means that any error from gm/im was ignored. This caused people
to upload too large images and flood /b/ with 1 x 10000 pixel images

My fault, patched now. Sorry about that.

Conflicts:
	inc/image.php
 2014-10-12 10:23:03 +02:00
8chan
0c570e2ca5 SECURITY: imagemagick/graphicsmagick was ignoring all errors 
So, in a much older patch I had a problem where an incorrect RGB
profile would make image uploads fail. I fixed this by using strpos
against the error message...but didn't check the return value
correctly.

That means that any error from gm/im was ignored. This caused people
to upload too large images and flood /b/ with 1 x 10000 pixel images

My fault, patched now. Sorry about that.
 2014-10-11 15:41:16 -07:00
8chan
803c76a800 .x.x less confusing...will change to less_ip eventually 2014-10-11 20:37:58 +02:00
czaks
2359f82385 Merge https://github.com/vichan-devel/vichan 2014-10-11 20:13:31 +02:00
czaks
5d1b426fa3 fix bans.php on removing a ban by a semi-privileged mod 2014-10-11 20:13:05 +02:00
8chan
2e694b8b1c Khorne in #8chan on irc.rizon.net contributed this thread watcher. 
Can't properly attribute the code to him because he doesn't want it
connected to his Github account for some reason.
 2014-10-11 10:21:00 -07:00
8chan
a838e2986c Only show IPs in ?/bans if mod has show_ip 2014-10-10 09:52:23 -07:00
8chan
f07cf32001 Don't show host on IP_less 
Sometimes there isn't one so you get weird stuff like

127.0.x.x
x.x.0.1

revealing the whole IP. Oops.
 2014-10-09 20:26:40 -07:00
8chan
da0ea45730 Merge branch 'master' of https://github.com/ctrlcctrlv/8chan 2014-10-09 21:40:24 -04:00
8chan
fe9297aaaa Attempt to hide IPs from board volunteers 2014-10-09 21:39:37 -04:00
8chan
f95cc5d8bf .x.x less confusing...will change to less_ip eventually 2014-10-09 16:59:58 -07:00
8chan
de7c089d7b this download all script doesnt even work 2014-10-09 16:58:00 -07:00
8chan
e4a4415308 Merge https://github.com/ctrlcctrlv/8chan 2014-10-08 19:11:56 -07:00
czaks
3e88cc23fb Merge vichan 2014-10-09 04:09:44 +02:00
czaks
3a552e5b76 hopefully fix locales 2014-10-09 04:09:30 +02:00
8chan
4bd6ebd7aa Merge https://github.com/ctrlcctrlv/8chan 2014-10-08 19:00:13 -07:00
czaks
d3a52f6aed Merge vichan 2014-10-09 03:57:38 +02:00
czaks
dfd05e88f9 possible fix of themes` interactions 2014-10-09 03:57:18 +02:00
8chan
162d9e8210 Merge ../http 
Conflicts:
	templates/mod/settings.html
 2014-10-08 18:21:38 -07:00
8chan
f4b93f8b1c Enable infinite scroll by default 2014-10-08 18:20:47 -07:00
czaks
3a48cbc790 8chan: allow users to opt out of public ban system 2014-10-09 03:10:47 +02:00
czaks
217f25c51d fix incorrectly applied permissions 2014-10-09 02:08:15 +02:00
czaks
99374eac32 8chan new banlist customization 2014-10-09 02:04:31 +02:00
czaks
ef3bb46876 bans.php: surpress error 2014-10-09 02:00:31 +02:00
czaks
b1c76ba120 fix a bad merge 2014-10-09 01:14:14 +02:00
czaks
e678c178ac display capcode, if you can`t show username 2014-10-08 23:42:24 +02:00
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
3928a3212a Merge branch 'master' of https://github.com/ctrlcctrlv/8chan 2014-10-08 20:11:36 +00:00
8chan
bf644d1a22 This threadscroll script is glitchy as fuck 2014-10-08 11:35:56 -07:00
8chan
d58adad48d SECURITY: Move indexed option to table...fixes unindexed boards appearing in search/random 2014-10-07 20:54:00 -07:00
Marcin Łabanowski
6a6250eb77 Merge pull request #155 from hugofragata/master 
Added download-all feature
 2014-10-08 05:53:33 +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
69ad4f26db config update 2014-10-07 17:33:32 -07:00
Fredrick Brennan
52a662a395 Merge pull request #160 from wopot/patch-2 
lineup 4 if´s with || (OR)
 2014-10-07 11:24:56 -04:00
8chan
3da946268a SECURITY: Poster IDs could reveal IPs across boards 
Imagine the following scenario:

Alice has permission to view IPs on board A, and Bob has permissions to view IPs on board B.

If the post number was to match, and the same IP made both posts, A and B could trade user IPs which they wouldn't normally have permission to do so. This weird bug has already creeped up on 8chan.co and is now patched.
 2014-10-07 08:16:21 -07:00
wopot
9c47ebed03 lineup 4 if´s with || (OR) 2014-10-07 16:33:27 +02:00
hugofragata
acf4c3bb8b Modified inc/instance-config.php 
Modified inc/instance-config.php to include js/download-all.js and
js/jszip.min.js
 2014-10-07 15:00:40 +01:00
hugofragata
7239350e69 Revert "Added download-all feature" 
This reverts commit 12a8f1a672.
 2014-10-07 14:46:50 +01:00
8chan
c4dc3f4d47 Fix spoiler image not working 2014-10-07 04:33:57 +02:00
8chan
db55a3040f Make inline.js work in mod panel 2014-10-06 18:36:19 -07:00
8chan
ed94a1671d Merge https://github.com/ctrlcctrlv/8chan 
Conflicts:
	post.php
 2014-10-06 18:12:50 -07:00
8chan
47e81b7e9b Fix spoiler image not working 2014-10-06 18:02:50 -07:00
8chan
345e5aa3a4 Featured boards now based on uniques 2014-10-06 18:01:01 -07:00
wopot
c7351dff09 4 times "elseif" is not the way 
and precalc. value sometimes help if well commentent
 2014-10-07 00:16:02 +02:00
Marcin Łabanowski
9f3dba7372 Merge pull request #105 from anonfagola/patch-17 
Update instance-config.php
 2014-10-07 00:11:52 +02:00
hugofragata
12a8f1a672 Added download-all feature 
The button to download all the files in a thread only appears when the
page is a thread, such as treeview. I added the download-all button next
to the treeview one. I modified stylesheets/v8ch.css to include the id
#download-all. I modified inc/instance-config.php to include the
download-all.js and jszip.min.js. I added the files js/jszip.min.js
which is a library to work with zip files in JS and I added
js/download-all.js which goes through all files, adds them to a zip and
then gives it to the user.
 2014-10-06 16:50:20 +01:00
wopot
ba3f0f25fe 4 times "elseif" is not the way 
and precalc. value sometimes help if well commentent
 2014-10-06 17:50:05 +02:00
Bui
aba8d27ace wasn't aware of DNS function 2014-10-05 23:20:06 +02:00
Bui
1e95e58811 don't break if dns_system is true 2014-10-05 23:20:06 +02:00
Bui
8b9932218f add forward-confirmed reverse DNS 2014-10-05 23:20:06 +02:00
Bui
3f4381cf40 wasn't aware of DNS function 2014-10-06 04:30:32 +09:00
Bui
ca7955ecfc don't break if dns_system is true 2014-10-06 04:08:10 +09:00
Bui
98b172980f add forward-confirmed reverse DNS 2014-10-06 03:37:13 +09:00
8chan
6d19be38e3 Merge https://github.com/ctrlcctrlv/8chan 
Conflicts:
	inc/instance-config.php
 2014-10-05 17:09:50 +00:00
8chan
4414ef80b4 DNSBLs bypass stuff, fix Opera bug. 2014-10-05 17:07:59 +00:00
8chan
7bfbd10d69 Re-enable this filter 2014-10-05 17:06:57 +00:00
czaks
e0e3de2773 Merge https://github.com/vichan-devel/vichan 2014-10-05 18:38:45 +02:00
czaks
8518164352 sync locales with transifex 2014-10-05 18:38:25 +02: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
Marcin Łabanowski
97a25dad03 Merge pull request #102 from cable6-dev/bugfix-genwebmerror 
[bugfix]$config['error']['genwebmerror'] wasn't set in config.php
 2014-10-05 17:56:46 +02:00
Marcin Łabanowski
d01d892896 Merge pull request #100 from cable6-dev/feature-hide-sage 
Added an option to hide sages
 2014-10-05 17:53:32 +02:00
Marcin Łabanowski
42868c672a Merge pull request #103 from cable6-dev/bug-fix-check_spoiler_size 
Check spoiler_image size before ussuming it is 128×128px
 2014-10-05 17:53:08 +02:00
kaf
3c2529e157 [bugfix]$config['error']['genwebmerror'] wasn't set in config.php 2014-10-05 15:35:52 +00:00
kaf
296e4fd5fa Added an option to hide sages 2014-10-05 15:29:37 +00:00
kaf
fe60590d19 Check spoiler_image size before ussuming it is 128×128px 2014-10-05 15:26:28 +00:00
kaf
9cee5f6c61 [bugfix]ban appeals (was also present in tinyboard) 2014-10-05 12:53:02 +00:00
riking
edf98dbee3 Add example secrets.php file 2014-10-04 13:48:52 -07:00
riking
5d89342b4f Make dnsbls.php optional, secrets.php mandatory 2014-10-04 13:48:11 -07:00
8chan
99e95bb807 Merge ../http 
Conflicts:
	templates/themes/catalog/catalog.html
 2014-09-30 23:10:27 +00:00
8chan
7ca9b7edaf Max links = 40 2014-09-30 23:06:48 +00:00
Bui
ba7cc64bbb fix languages 2014-09-29 07:30:45 +09:00
8chan
befe393778 Rewrite color IDs script so it actually works 2014-09-27 21:23:51 +00:00
anonfagola
b621699a22 Update instance-config.php 
@ctrlcctrlv said to me over IRC he removed the threadscroll script because on some browsers, it would refresh the page when scrolling. This has been fixed in #98, so it should be back in as a default addditional JS.

and i remembered the semicolon this time
 2014-09-27 13:19:39 -07:00
8chan
b6bfe97c67 @anonfagola seriously needs to remember his fucking semicolons 2014-09-27 20:08:18 +00:00
8chan
4c3f48c021 Merge /root/8chan 2014-09-27 20:06:27 +00:00
8chan
3747a3396b revert 2014-09-27 20:05:48 +00:00
8chan
993df563db undo no cache test 2014-09-27 20:05:33 +00:00
anonfagola
4c720120e4 Added id_highlighter.js to additional_javscript 2014-09-27 09:49:17 -07:00
czaks
e748a286b3 Merge branch 'master' of https://github.com/ctrlcctrlv/8chan 
Conflicts:
	inc/api.php
	js/multi-image.js
 2014-09-27 11:34:05 +02:00
czaks
529951f75b Merge https://github.com/vichan-devel/vichan 2014-09-27 11:31:52 +02:00
czaks
ef53af04ec fix a recently added md5 api field 2014-09-27 11:31:30 +02:00
Fredrick Brennan
6afc91d472 Merge pull request #94 from peerau/patch-1 
A quick update to config.php
 2014-09-27 01:31:33 -04:00
8chan
47a92791ed Merge branch 'master' of https://github.com/bui/8chan into bui-master 
Conflicts:
	boards.php
 2014-09-27 04:58:41 +00:00
8chan
24caf95f20 Fix mod.php catalog 404 bug 2014-09-27 00:52:21 +00:00
8chan
695a8a3aaf Update instance config 2014-09-26 23:55:19 +00:00
Jayden Callahan
b4fd7c8e2c A quick update to config.php 2014-09-27 03:03:54 +09:30
hatstand0
d27cddaacc Add file hash to API 
The API currently lacks the Base64 encoded file hash 4chan's API provides, which assists in file de-duplication by archive software.
 2014-09-26 13:28:04 +02:00
hatstand0
7ea5b129e6 Fix thumbnail width/height in API 
The API currently has the thumbnail widths and heights switched around
 2014-09-26 13:27:49 +02:00
8chan
9dc91c1bf4 fuck you php 2014-09-26 03:44:34 +00:00
Bui
f4a9c5f551 only use 8chan locales 2014-09-26 10:38:23 +09:00
Bui
da370c53c0 wrong function name 2014-09-26 10:17:47 +09:00
Bui
ae183c1c42 use country names in boards.html 2014-09-26 10:15:17 +09:00
anonfagola
466f2b12ee Fix syntax error 2014-09-25 17:03:50 -07:00
8chan
19e864c15c I don't know what I did. 2014-09-25 22:53:56 +00:00
8chan
179df591af mobile style in config 2014-09-25 21:35:17 +00:00
Fredrick Brennan
5cbdbd312a Merge pull request #72 from peerau/master 
Changes to allow media-file clustering and CDN possibilities.
 2014-09-25 17:34:02 -04:00
Jayden Callahan
cb5fed2bdf Config: deletion of boards covers img_root now 2014-09-26 07:01:11 +09:30
Jayden Callahan
1f2cd47562 Config: actually add config.php 2014-09-26 06:48:24 +09:30
Jayden Callahan
fbdb72994a Config: add a thing for clustered installations 2014-09-26 06:46:06 +09:30
8chan
4bb8eb49e8 Merge /home/service/www/http 
Conflicts:
	inc/instance-config.php
	js/auto-reload.js
 2014-09-25 20:55:05 +00:00
8chan
48ca125eaf include instead of require 2014-09-25 20:49:46 +00:00
8chan
a6e9c13e51 We dont need two of these. 2014-09-25 20:31:52 +00:00
8chan
e1ce037c8c Merge branch 'master' of https://github.com/TheHowl/8chan into TheHowl-master 
Conflicts:
	create.php
 2014-09-25 20:28:46 +00:00
8chan
c8fc323ea6 AYAH by default. 2014-09-25 20:14:00 +00:00
8chan
15f49b7017 Merge branch 'master' of https://github.com/undido/8chan into undido-master 
Conflicts:
	install.sql
	random.php
 2014-09-25 20:10:12 +00:00
Fredrick Brennan
0073b7c855 Merge pull request #69 from anonfagola/patch-8 
Update instance-config.php
 2014-09-25 14:34:51 -04:00
Ki11Deer
014f0eb12a Update instance-config.php to fix Twitter alt text 
I am new here don't rape my face.
 2014-09-25 14:32:03 -04:00
anonfagola
77b2caa284 Update instance-config.php 
Fix https://github.com/ctrlcctrlv/8chan/issues/62
 2014-09-25 10:46:33 -07:00
Fredrick Brennan
f11da66e3d Merge pull request #65 from hatstand0/patch-2 
Add file md5 to API
 2014-09-25 12:37:17 -04:00
Fredrick Brennan
ad17f3e95b Merge pull request #51 from anonfagola/patch-6 
Made threadscroll.js a default additional JS
 2014-09-25 12:36:18 -04:00
hatstand0
e26ce2c610 Add file hash to API 
The API currently lacks the Base64 encoded file hash 4chan's API provides, which assists in file de-duplication by archive software.
 2014-09-26 00:09:14 +10:00
hatstand0
ebd85c1fd6 Fix thumbnail width/height in API 
The API currently has the thumbnail widths and heights switched around
 2014-09-25 23:42:41 +10:00
Morgan Bazalgette (Howl)
c72e1fcb1d Merge pull request #1 from ctrlcctrlv/master 
fucking git how do i merge to my current repo without making it notice to all the people that committed that
 2014-09-25 15:10:20 +02:00
undido
37ac3fbe9e Added recaptcha support to create.php 2014-09-25 08:18:27 -03:00
undido
03b142b847 removed var_dump 2014-09-25 08:06:16 -03:00
undido
b24ec23cbb inc/mod/pages.php only show your board in boardlist if you are ranked below admin 2014-09-25 07:57:51 -03:00
undido
ff68278111 renamed playgame config field to ayah_enabled 2014-09-25 07:08:55 -03:00
undido
9c0436269f disable ayah 'game' on create.php by default added option to turn it on in /inc/config.php with explaination on where to put private keys at 2014-09-25 06:58:44 -03:00
anonfagola
14148b1292 Made threadscroll.js a default additional JS 2014-09-24 16:54:49 -07:00
8chan
416a48838c Add timer to auto reload js 2014-09-24 21:30:57 +00:00
TheHowl
eee2cf82d4 Make ayah optional 2014-09-24 22:35:59 +02:00
8chan
2afb2b4e7b Require secrets.php 2014-09-24 20:19:58 +00:00
8chan
102559751a Require secrets.php 2014-09-24 20:19:58 +00:00
8chan
e94ae94f6c Add extra non-synced file for 8chan.co secrets (passwords etc) 2014-09-24 20:17:59 +00:00
8chan
4eb31555fc Add update button to auto-reload.js 2014-09-24 20:14:02 +00:00
8chan
f0e58a02d2 Merge https://github.com/vichan-devel/vichan 
Conflicts:
	README.md
 2014-09-24 19:42:45 +00:00
fourfivesix
795b2646ea Uncommenting catalog_link, it is now required 
`$config['catalog_link']` is now required because `templates/main.js` uses it.
 2014-09-24 14:36:03 -03:00
czaks
3b2f448102 restore compatibility with php < 5.5; fixes vichan-devel#86 2014-09-24 12:26:15 +02:00
8chan
c090ad7fff We open source nao 2014-09-24 04:27:14 +00:00
8chan
fb405c9cf0 Reject repost option in ?/settings 2014-09-24 04:25:55 +00:00
czaks
ba49bc6c37 update locales 2014-09-24 03:48:46 +02:00
8chan
b682c5861a Merge https://github.com/ctrlcctrlv/8chan 
Conflicts:
	README.md
	banners.php
	create.php
	inc/instance-config.php
 2014-09-24 00:07:56 +00:00
8chan
da9ee32c2b add htmlpurifier library 2014-09-23 23:25:04 +00:00
8chan
1e479f5a2e Fix #13 2014-09-23 23:22:41 +00:00
8chan
9acbfe4d98 Add AYAH library to repo 2014-09-23 19:46:51 +00:00
8chan
d5bce0bf04 Merge ../http 2014-09-23 15:32:19 +00:00
8chan
fa28b5b370 Merge ../http 2014-09-23 15:32:19 +00:00
8chan
a2a15c761c Allow SWF, fix \rule breaking /b/ (temporarily) 2014-09-23 15:31:52 +00:00
8chan
9adee6016c Allow SWF, fix \rule breaking /b/ (temporarily) 2014-09-23 15:31:52 +00:00
8chan
f8e55b3143 Merge ../http 
Conflicts:
	create.php
	inc/instance-config.php
 2014-09-23 15:30:03 +00:00
8chan
ff6831e51c Merge ../http 
Conflicts:
	create.php
	inc/instance-config.php
 2014-09-23 15:30:03 +00:00
8chan
0764a8ead8 Apologies for this huge shitty commit. Git got corrupted. Contains a merge, change to katex, stylesheets, lots of shit really. ;_; 2014-09-22 18:29:06 -07:00
8chan
3675caadfc Apologies for this huge shitty commit. Git got corrupted. Contains a merge, change to katex, stylesheets, lots of shit really. ;_; 2014-09-22 18:29:06 -07:00
Fredrick Brennan
a8be948f7d Merge https://github.com/vichan-devel/vichan 
Conflicts:
	inc/bans.php
	js/favorites.js
 2014-09-21 18:04:10 +00:00
Fredrick Brennan
300ec2a295 Merge https://github.com/vichan-devel/vichan 
Conflicts:
	inc/bans.php
	js/favorites.js
 2014-09-21 18:04:10 +00:00
Fredrick Brennan
19d6db9a44 Config changes 2014-09-21 17:51:42 +00:00
Fredrick Brennan
6ea0f26ce4 Config changes 2014-09-21 17:51:42 +00:00
czaks
92183e8e39 add portuguese (portugal) translation by Chorizo 2014-09-21 08:37:16 +02:00
czaks
6b968ce50a add portuguese (portugal) translation by Chorizo 2014-09-21 08:37:16 +02:00
czaks
a1f26e8fd1 update locales 2014-09-21 04:52:18 +02:00
czaks
476d24d401 update locales 2014-09-21 04:52:18 +02:00
Fredrick Brennan
7288f1dec7 Fix last commit 2014-09-20 16:49:32 +00:00
Fredrick Brennan
686338e576 Fix last commit 2014-09-20 16:49:32 +00: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
Fredrick Brennan
1c2a2a3cf6 Allow the user to decide whether or not he wants to display his country 2014-09-20 16:35:28 +00:00
Fredrick Brennan
9070b061ee Bug fix: users were banned from /0/ if they had a ban anywhere else 
Conflicts:
	inc/bans.php
 2014-09-20 15:39:47 +00:00
Fredrick Brennan
a3a7586b35 Bug fix: users were banned from /0/ if they had a ban anywhere else 
Conflicts:
	inc/bans.php
 2014-09-20 15:39:47 +00:00
Fredrick Brennan
19f2505ae6 Merge https://github.com/vichan-devel/vichan 2014-09-20 15:29:05 +00:00
Fredrick Brennan
6f195a033c Merge https://github.com/vichan-devel/vichan 2014-09-20 15:29:05 +00:00
Fredrick Brennan
696b551a31 Allow the user to decide whether or not he wants to display his country 2014-09-20 15:21:50 +00:00
Fredrick Brennan
9d67593af0 Allow the user to decide whether or not he wants to display his country 2014-09-20 15:21:50 +00:00
Fredrick Brennan
f67f839e0f fuck splitting this one up, misc changes 2014-09-20 15:21:09 +00:00
Fredrick Brennan
b5ce7c683d fuck splitting this one up, misc changes 2014-09-20 15:21:09 +00:00
Fredrick Brennan
e972548ae2 More dice limits 2014-09-20 15:20:22 +00:00
Fredrick Brennan
b8a3ef5b56 More dice limits 2014-09-20 15:20:22 +00:00