1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-12-18 02:16:03 +01:00
Commit Graph

23 Commits

Author SHA1 Message Date
czaks
2382603b4d fix hide-images.js interactions (should be STI-safe) 2013-12-25 18:12:00 +01:00
czaks
c2ffd32436 fix thread expanding and post hover interop a bit 2013-08-13 15:30:17 -04:00
czaks
b5bba48edf noko50 + expand.js: make it interoperate 2013-08-11 17:59:17 -04:00
czaks
2cc0769f54 Revert "Merge branch 'master' of github.com:vichan-devel/Tinyboard"
This reverts commit a84c4510fc, reversing
changes made to a8327c3a37.
2013-08-05 06:17:01 -04:00
czaks
a84c4510fc Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	js/post-hider.js
2013-08-05 06:03:40 -04:00
czaks
55c7146d88 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
	inc/image.php
	js/expand.js
	js/hide-threads.js
	js/local-time.js
	js/smartphone-spoiler.js
	templates/header.html
	templates/index.html
	templates/main.js
	templates/page.html
	templates/post_reply.html
	templates/post_thread.html
	templates/thread.html
2013-07-31 14:54:20 -04:00
czaks
45ead9803f ukko: fix javascript interoperation
Conflicts:
	js/expand.js
	js/hide-threads.js
	templates/themes/ukko/ukko.js
2013-07-31 04:51:53 -04:00
czaks
2868dd7886 javascripts: fixed interactions (BEWARE, inline-expanding.js now requires jquery! fix your configs)
Conflicts:
	js/expand.js
	js/inline-expanding.js
2013-07-31 04:47:50 -04:00
czaks
4922828e35 js i18n: expand.js 2013-07-31 04:38:23 -04:00
czaks
96bcf5dd1e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
	inc/mod/pages.php
	install.php
	js/expand.js
	mod.php
2013-07-31 02:30:44 -04:00
Michael Foster
3bee1ba4fd Issue #61 2013-07-31 00:39:00 -04:00
czaks
880cf25366 fix merge 2013-07-27 01:08:26 -04:00
czaks
64a66db613 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/hide-threads.js
	js/inline-expanding.js
	stylesheets/style.css
2013-07-27 01:04:36 -04:00
czaks
e3cb427fee ukko: fix javascript interoperation 2013-07-27 00:57:12 -04:00
czaks
d82cd9b7bd expand.js: fix post order when new posts appear between loading index and expanding 2013-07-27 00:28:55 -04:00
czaks
6bf217941a expand.js: fix a weird bug - thread expand not always worked due to post being loaded in DOM, but not put in a right place in a thread, or so, so check if it has been loaded in a thread instead of if it exists in DOM 2013-07-27 00:28:43 -04:00
czaks
e5bdf63692 expand.js: fix post order when new posts appear between loading index and expanding 2013-07-26 22:39:00 -04:00
czaks
a28b5fc3a1 expand.js: fix a weird bug - thread expand not always worked due to post being loaded in DOM, but not put in a right place in a thread, or so, so check if it has been loaded in a thread instead of if it exists in DOM 2013-07-26 22:34:06 -04:00
Czterooki
aef4425592 merge with vichan-gold 2013-07-20 00:19:08 -04:00
Czterooki
dfddeb30da js/expand.js 2013-07-20 00:06:08 -04:00
czaks
37c1b134de js i18n: expand.js 2013-07-03 01:17:56 -04:00
czaks
1d76164e29 javascripts: fixed interactions (BEWARE, inline-expanding.js now requires jquery! fix your configs) 2013-06-15 01:39:39 -04:00
Michael Save
af3ec3f8c7 expand.js: inline thread expanding 2012-03-31 21:32:09 +11:00