1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-12-15 17:11:18 +01:00
Commit Graph

6279 Commits

Author SHA1 Message Date
czaks
af5400d441 Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-17 16:22:04 -04:00
czaks
bf119b7abd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/post-hover.js
2013-08-17 16:21:40 -04:00
czaks
d6d9e0f260 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/post-hover.js
2013-08-17 16:21:40 -04:00
ctrlcctrlv
5c2ec21e13 Bundle jscolor 2013-08-17 19:42:00 +00:00
ctrlcctrlv
7213396207 Bundle jscolor 2013-08-17 19:42:00 +00:00
ctrlcctrlv
979e5754a5 Better error handling 2013-08-17 19:08:54 +00:00
ctrlcctrlv
2875279472 Better error handling 2013-08-17 19:08:54 +00: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
Michael Foster
cff62b250c Bugfix: raw html posting 2013-08-18 04:49:56 +10:00
Michael Foster
4b5e1909f5 Bugfix: raw html posting 2013-08-18 04:49:56 +10: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
Michael Foster
3a27060503 GeoIP: Ignore country codes that aren't country codes: ap (Asia/Pacific), EU, etc. 2013-08-18 01:06:13 +10:00
Michael Foster
cde7631d4b GeoIP: Ignore country codes that aren't country codes: ap (Asia/Pacific), EU, etc. 2013-08-18 01:06:13 +10:00
Michael Foster
28f366b686 keep casing of escape modifiers 2013-08-17 17:56:38 +10:00
Michael Foster
e4a07b9103 keep casing of escape modifiers 2013-08-17 17:56:38 +10:00
Michael Foster
998002fd34 better modifier escaping again 2013-08-17 17:53:39 +10:00
Michael Foster
3e7996f3ee better modifier escaping again 2013-08-17 17:53:39 +10:00
Michael Foster
b2d5ec253b escape_markup_modifiers: make it case insensitive 2013-08-17 17:41:22 +10:00
Michael Foster
acb68a6240 escape_markup_modifiers: make it case insensitive 2013-08-17 17:41:22 +10:00
Michael Foster
e7f25aa480 add delete event 2013-08-17 16:06:45 +10:00
Michael Foster
0ff4e567bc add delete event 2013-08-17 16:06:45 +10:00
Michael Foster
cd3e2ef458 js/expand-all-images.js 2013-08-17 14:54:41 +10:00
Michael Foster
e11e532c32 js/expand-all-images.js 2013-08-17 14:54:41 +10:00
Michael Foster
c0815ea25a Bugfix: When you hovered over a >>X link, then hid and unhid a thread (js/hide-threads.js) it would fuck up 2013-08-17 14:42:48 +10:00
Michael Foster
fe3676383d Bugfix: When you hovered over a >>X link, then hid and unhid a thread (js/hide-threads.js) it would fuck up 2013-08-17 14:42:48 +10: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
e5103b543a fix aspect ratio displaying 2013-08-17 04:11:24 +10:00
Michael Foster
2c7c1249bf fix aspect ratio displaying 2013-08-17 04:11:24 +10: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
Michael Foster
0d45fbc799 Add \n before post modifiers. Add flag alt for country flags. 2013-08-17 03:39:58 +10:00
Michael Foster
1373276589 Add \n before post modifiers. Add flag alt for country flags. 2013-08-17 03:39:58 +10:00
czaks
d0c72927a6 Merge (partially) branch 'master' of https://github.com/savetheinternet/Tinyboard
Let's not merge part of it for now; it break things here

Conflicts:
	js/post-hover.js
2013-08-16 11:29:13 -04:00
czaks
4dc1bec32a Merge (partially) branch 'master' of https://github.com/savetheinternet/Tinyboard
Let's not merge part of it for now; it break things here

Conflicts:
	js/post-hover.js
2013-08-16 11:29:13 -04:00
czaks
b31f6489c7 js/catalog-link.js: i18n fix 2013-08-16 10:47:25 -04:00
czaks
4f09574149 js/catalog-link.js: i18n fix 2013-08-16 10:47:25 -04:00
czaks
83cd4cf841 js/catalog-link.js: disable for ukko 2013-08-16 10:45:43 -04:00
czaks
777e98ad85 js/catalog-link.js: disable for ukko 2013-08-16 10:45:43 -04:00
czaks
08652df7ac js/catalog-link.js: i18n 2013-08-16 10:45:01 -04:00
czaks
04013c56c1 js/catalog-link.js: i18n 2013-08-16 10:45:01 -04:00
czaks
e0b729f803 fix search.php for new new Post and new Thread syntax 2013-08-16 10:17:13 -04:00
czaks
2c290cab51 fix search.php for new new Post and new Thread syntax 2013-08-16 10:17:13 -04: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
3696ffd035 noko50 fix previous commit 2013-08-16 10:10:18 -04:00