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

16 Commits

Author SHA1 Message Date
czaks
7e58e50516 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
1e2c4bda9b 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
eed8767039 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
15268d1cb5 ⌘+click should open image in new tab 2013-07-30 19:07:28 -04:00
czaks
10f9220657 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/inline-expanding.js
2013-07-29 23:17:37 -04:00
czaks
20cdaa3e09 js/inline-expanding.js: Allow to work with auto-reload.js, etc. (jQuery is still optional)
Conflicts:
	js/inline-expanding.js
2013-07-29 22:54:09 -04:00
czaks
20ad5c8f1f inline-expanding.js: missed preventing default action; shouldn't open new window when unwanted anymore 2013-07-27 02:19:58 -04:00
czaks
c051ceb475 fix merge 2013-07-27 01:08:26 -04:00
czaks
d723b77d4c 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
Michael Foster
be3de713cb Allow hide-images.js, toggle-images.js and inline-expanding.js to work together 2013-07-27 00:14:43 -04:00
czaks
872e1f8cb1 inline-expanding.js: internal fix for better stability 2013-07-17 22:15:26 -04:00
czaks
ab146f39c3 javascripts: fixed interactions (BEWARE, inline-expanding.js now requires jquery! fix your configs) 2013-06-15 01:39:39 -04:00
czaks
7417980496 inline-expanding.js: don't set max height 2013-06-15 00:37:12 -04:00
Michael Save
44cb618446 inline-expanding.js: don't expand larger than the window 2012-04-22 16:57:26 +10:00
Michael Save
67078c17d1 onready() instead of onload() 2012-03-31 19:37:31 +11:00
Michael Save
25e10def5b inline-expanding.js 2012-03-31 19:18:53 +11:00