1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-30 02:04:35 +01:00
Commit Graph

6427 Commits

Author SHA1 Message Date
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
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
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
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
kaernyk
f2913a4f81 Correct thread:hover highlighting 2014-09-26 07:58:56 -04:00
kaernyk
35d2a91b0b Merge branch 'master' of https://github.com/ctrlcctrlv/8chan
Conflicts:
	stylesheets/style.css

Correct style.css blunder and merge changes
2014-09-26 07:44:40 -04:00
kaernyk
efd364e4af Corrected changes improperly set in catalog.css 2014-09-26 07:42:12 -04:00
czaks
bb4ebebe89 Merge https://github.com/vichan-devel/vichan
Conflicts:
	js/auto-reload.js
	stylesheets/catalog.css
	stylesheets/style.css
2014-09-26 13:40:02 +02:00
czaks
bfb85fc2b1 catalog.css is no longer used 2014-09-26 13:35:56 +02:00
czaks
76439cbdd9 we don`t use tooltipster anymore, do we? 2014-09-26 13:35:07 +02:00
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
Nebs
ab2a83d194 Fixes catalog href on a potential /res/ board 2014-09-26 13:10:21 +02:00
Nebs
b7592c3eec Fixed unanimating gifs in the catalog 2014-09-26 13:10:14 +02:00
Marcin Łabanowski
9b3c6ab537 Merge pull request #77 from Zaphkiel/master
Misc js fixes
2014-09-26 13:09:26 +02:00
Marcin Łabanowski
d2913d369f Merge pull request #79 from anonfagola/patch-10
Fix syntax error
2014-09-26 13:08:45 +02:00
czaks
afbe945d83 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-09-26 13:07:52 +02:00
kaernyk
e5ce012a09 Adjust theme via catalog.css & style.css
Changes to catalog.css:

  - Forced all threads to a height of 300px and reduced padding to
    improve consistency. I think it improves the readability quite a bit
    but I may be alone in thinking this way.
  -

Changes to style.css:

  - Removed additional padding to allow new catalog spacing

Conflicts:
	stylesheets/style.css
2014-09-26 13:05:04 +02:00
kaernyk
b888500133 Corrected thread padding via style.css
Conflicts:
	stylesheets/style.css
2014-09-26 13:04:01 +02:00
Marcin Łabanowski
082e65fb95 Merge pull request #90 from kaernyk/master
Adjust catalog for uniformity/mobile
2014-09-26 12:59:31 +02:00
czaks
ba515c5f05 post-hover.js: show a popup preview if a reply is only partially on screen; fixes ctrlcctrlv#84 2014-09-26 12:56:05 +02:00
Zealotux
f71cdcaa81 Update style.css
Added "cursor" to "options_tab_icon" according to https://github.com/ctrlcctrlv/8chan/issues/80
2014-09-26 12:47:07 +02:00
Marcin Łabanowski
32fe18db89 Merge pull request #81 from Zealotux/master
Update style.css
2014-09-26 12:46:03 +02:00
kaernyk
9d39c61634 Corrected thread padding via style.css 2014-09-26 05:06:45 -04:00
kaernyk
2b4dd0a615 Adjust theme via catalog.css & style.css
Changes to catalog.css:

  - Forced all threads to a height of 300px and reduced padding to
    improve consistency. I think it improves the readability quite a bit
    but I may be alone in thinking this way.
  -

Changes to style.css:

  - Removed additional padding to allow new catalog spacing
2014-09-26 04:41:32 -04:00
Nebs
35e33f61d4 Fixed unanimating gifs in the catalog 2014-09-26 00:30:23 -05:00
Fredrick Brennan
5a4e39ff70 Merge pull request #87 from anonfagola/patch-11
Update index.html
2014-09-26 00:09:19 -04:00
8chan
9dc91c1bf4 fuck you php 2014-09-26 03:44:34 +00:00
anonfagola
b38c265c47 Update index.html
Removed leftover code
2014-09-25 19:34:27 -07:00