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

6452 Commits

Author SHA1 Message Date
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
czaks
9b466f74a6 Merge https://github.com/vichan-devel/vichan 2014-09-27 11:26:41 +02:00
czaks
629b1c92a6 fix a recently introduced quick-reply max-width issue 2014-09-27 11:26:30 +02:00
czaks
f2e101f30d fix multi-image.js when quick-reply isn`t loaded 2014-09-27 11:22:28 +02:00
czaks
370c724550 Merge https://github.com/vichan-devel/vichan
Conflicts:
	js/multi-image.js
	stylesheets/style.css
2014-09-27 11:19:25 +02:00
czaks
6c139caf3c style.css: setting default font size is imo a bit invasive 2014-09-27 11:16:16 +02:00
czaks
dda7462013 catalog link not always working; fix ctrlcctrlv#88 2014-09-27 11:13:04 +02:00
8chan
6fd3b64c67 Disallow multiple Shrink all images appearing
fixes vichan-devel#91
2014-09-27 10:55:14 +02:00
8chan
56f3d89774 Fix multi image from quick reply
Conflicts:
	js/multi-image.js
2014-09-27 10:52:24 +02:00
anonfagola
d9f20c290d Updated threadscroll.js with bettter compatibility 2014-09-27 10:48:36 +02:00
Marcin Łabanowski
9596b6ace3 Merge pull request #92 from kaernyk/master
[WIP] Improvements to mobile display on boards/catalog
2014-09-27 10:47:21 +02:00
kaernyk
a3c03932c3 Fix mobile scaling/padding 2014-09-27 01:38:25 -04: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
461a7f8a0b Merge branch 'bui-master' 2014-09-27 05:00:22 +00: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
Fredrick Brennan
5d6de13561 Merge pull request #95 from undido/patch-2
Fixed bug with webm's and remove images if they are clicked to be expanded
2014-09-26 23:41:11 -04:00
Fredrick Brennan
f04c4843ab Merge pull request #98 from anonfagola/patch-12
Updated threadscroll.js with bettter compatibility
2014-09-26 23:40:40 -04:00
kaernyk
c115ebc7e0 Improved image handling in catalog for various screen sizes 2014-09-26 22:54:01 -04:00
8chan
03439092ee Merge /home/service/www/http 2014-09-27 00:52:31 +00:00
8chan
24caf95f20 Fix mod.php catalog 404 bug 2014-09-27 00:52:21 +00:00
8chan
5357db8475 Merge https://github.com/ctrlcctrlv/8chan
Conflicts:
	inc/instance-config.php
	templates/index.html
2014-09-27 00:47:47 +00:00
8chan
5e62e7a143 Disallow multiple Shrink all images appearing 2014-09-27 00:44:55 +00:00
8chan
f16f88966c Fix multi image from quick reply 2014-09-27 00:44:41 +00:00
8chan
695a8a3aaf Update instance config 2014-09-26 23:55:19 +00:00
anonfagola
992d2472c9 Updated threadscroll.js with bettter compatibility 2014-09-26 16:55:16 -07:00
8chan
88e7b239e8 threadscroll was in template for no reason 2014-09-26 23:53:52 +00:00
8chan
d5b551e682 Disable hash antispam (lazy - need to add an option later) 2014-09-26 23:53:25 +00:00
8chan
d5c975622e Use templates for more pages, i18n 2014-09-26 23:52:02 +00:00
undido
c599bbb4bc only append hover-toggle element to first options_tab class 2014-09-26 18:08:11 -03:00
undido
1ba6003c81 Fixed bug with webm, image-hover closes when you click an image to expand it to expand it inline 2014-09-26 17:34:34 -03:00
kaernyk
2e46875125 Improvements to mobile display on boards/catalog 2014-09-26 14:38:08 -04:00
Jayden Callahan
b4fd7c8e2c A quick update to config.php 2014-09-27 03:03:54 +09:30
adonisk
d98eb528a5 v8ch.css 2014-09-26 19:08:46 +02:00
czaks
ed7c366c48 Merge https://github.com/vichan-devel/vichan
Conflicts:
	stylesheets/style.css
2014-09-26 14:36:00 +02:00
czaks
ef1ceb4f3b fix catalog margins 2014-09-26 14:35:25 +02:00
czaks
505da40b13 Merge https://github.com/vichan-devel/vichan 2014-09-26 14:31:54 +02:00
kaernyk
b223b2b2f8 Remove erroneous data and fix indentation
Conflicts:
	stylesheets/style.css
2014-09-26 14:29:37 +02:00
kaernyk
b1ea8b18d0 Improve image handling in catalog to improve consistency
Conflicts:
	stylesheets/style.css
2014-09-26 14:28:20 +02:00
Marcin Łabanowski
6387d88f39 Merge pull request #92 from kaernyk/master
Improve image scaling in catalog
2014-09-26 14:26:52 +02:00
kaernyk
74ab0a2feb Remove erroneous data and fix indentation 2014-09-26 08:23:25 -04:00
kaernyk
5093f5c121 Merge branch 'master' of https://github.com/ctrlcctrlv/8chan
Conflicts:
	stylesheets/style.css

quick merge
2014-09-26 08:15:10 -04:00
czaks
5b5f3984f0 Merge branch 'master' of https://github.com/ctrlcctrlv/8chan
Conflicts:
	stylesheets/style.css
2014-09-26 14:13:31 +02:00
czaks
5e1531bb5c Merge https://github.com/vichan-devel/vichan 2014-09-26 14:11:30 +02:00
kaernyk
bb7835c99f Improve image handling in catalog to improve consistency 2014-09-26 08:10:29 -04:00
czaks
b4b99cd936 Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	stylesheets/style.css
2014-09-26 14:08:40 +02:00
kaernyk
359c295eca Correct thread:hover highlighting 2014-09-26 14:07:40 +02:00
kaernyk
153622c068 Corrected changes improperly set in catalog.css
Conflicts:
	stylesheets/style.css
2014-09-26 14:07:31 +02:00
Marcin Łabanowski
00aefa2929 Merge pull request #91 from kaernyk/master
Correct catalog display
2014-09-26 14:06:15 +02:00