1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-01-10 13:31:43 +01:00

3488 Commits

Author SHA1 Message Date
Michael Foster
35e2c19fc0 use single quotes 2013-08-12 21:08:40 +10:00
Michael Foster
adbb0c1fdf ... 2013-08-12 13:01:34 +10:00
Michael Foster
5968a58f9f ... 2013-08-12 13:01:34 +10:00
czaks
0f5f44bc95 spoilerimage config variable: this got fixed doubly, once wrong, merge both fixes
Conflicts:
	inc/config.php
2013-08-12 13:01:02 +10:00
czaks
f8d1427362 spoilerimage config variable: this got fixed doubly, once wrong, merge both fixes
Conflicts:
	inc/config.php
2013-08-12 13:01:02 +10:00
Michael Foster
3a5f25f751 what 2013-08-12 13:00:06 +10:00
Michael Foster
80264cdb77 what 2013-08-12 13:00:06 +10:00
czaks
96122c3fc2 fix notice for mod spoiler image 2013-08-12 12:59:52 +10:00
czaks
d72a3dfa20 fix notice for mod spoiler image 2013-08-12 12:59:52 +10:00
Vasiliy Shikhachevskiy
8c3ae439c9 Added Czech translation 2013-08-12 12:58:29 +10:00
Vasiliy Shikhachevskiy
8e502dea55 Added Czech translation 2013-08-12 12:58:29 +10:00
ctrlcctrlv
d846fe6370 forgot to rename config option 2013-08-12 12:58:04 +10:00
ctrlcctrlv
c8eab07cfb forgot to rename config option 2013-08-12 12:58:04 +10:00
ctrlcctrlv
2018fd206b Improve spoiler action
Conflicts:
	inc/mod/pages.php
2013-08-12 12:57:54 +10:00
ctrlcctrlv
58afcbbe81 Improve spoiler action
Conflicts:
	inc/mod/pages.php
2013-08-12 12:57:54 +10:00
ctrlcctrlv
6e74f2a1a6 accidentally spaces 2013-08-12 12:55:52 +10:00
ctrlcctrlv
64bd203bc6 accidentally spaces 2013-08-12 12:55:52 +10:00
ctrlcctrlv
ed04525994 Spoil files moderator action 2013-08-12 12:55:44 +10:00
ctrlcctrlv
1c78a04edd Spoil files moderator action 2013-08-12 12:55:44 +10:00
czaks
92edc1d0a5 noko50: clarify in config how to disable it 2013-08-11 17:53:42 -04:00
czaks
c738134ff5 noko50: clarify in config how to disable it 2013-08-11 17:53:42 -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
500468336e spoilerimage config variable: this got fixed doubly, once wrong, merge both fixes 2013-08-11 17:34:43 -04:00
czaks
ca6373a077 spoilerimage config variable: this got fixed doubly, once wrong, merge both fixes 2013-08-11 17:34:43 -04:00
czaks
6e26c76c56 Merge branch 'master' of http://github.com/ctrlcctrlv/Tinyboard 2013-08-11 17:32:57 -04:00
czaks
7474bd82d7 Merge branch 'master' of http://github.com/ctrlcctrlv/Tinyboard 2013-08-11 17:32:57 -04:00
czaks
c3cb0f171b fix notice for mod spoiler image 2013-08-11 17:22:39 -04:00
czaks
b558ba60a2 fix notice for mod spoiler image 2013-08-11 17:22:39 -04:00
Vasiliy Shikhachevskiy
25b6dfd06a Added Czech translation 2013-08-11 13:59:07 -04:00
Vasiliy Shikhachevskiy
3a5be687d3 Added Czech translation 2013-08-11 13:59:07 -04:00
ctrlcctrlv
b9ec342750 Merge conflict 2013-08-11 15:36:17 +00:00
ctrlcctrlv
06d2f7ffb4 Merge conflict 2013-08-11 15:36:17 +00:00
ctrlcctrlv
efebd30221 forgot to rename config option 2013-08-11 13:55:15 +00:00
ctrlcctrlv
c31a610914 forgot to rename config option 2013-08-11 13:55:15 +00:00
ctrlcctrlv
fd54de7126 Improve spoiler action 2013-08-11 13:54:11 +00:00
ctrlcctrlv
5786c7dbc0 Improve spoiler action 2013-08-11 13:54:11 +00: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
4fb941dbfe $config['boardlist_wrap_bracket'] default to true 2013-08-11 21:30:46 +10:00
Michael Foster
4fbbec0e5d $config['boardlist_wrap_bracket'] default to true 2013-08-11 21:30:46 +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
38c9ac65d8 Critical bug: could not move threads/posts with spoiler images, resulted in I/O error
Conflicts:
	inc/mod/pages.php
2013-08-11 21:26:02 +10:00
ctrlcctrlv
5ed4582885 Critical bug: could not move threads/posts with spoiler images, resulted in I/O error
Conflicts:
	inc/mod/pages.php
2013-08-11 21:26: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
Michael Foster
4bce3d7584 Clean: Make boardlist bracket wrapping optional 2013-08-11 21:06:13 +10:00
Michael Foster
172effc889 Clean: Make boardlist bracket wrapping optional 2013-08-11 21:06:13 +10:00
ctrlcctrlv
7d1acd4a05 Make boardlist bracket wrapping optional 2013-08-11 21:04:45 +10:00