Commit Graph

16 Commits

Author SHA1 Message Date
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
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
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
91bb3182da ⌘+click should open image in new tab 2013-07-30 19:07:28 -04:00
czaks
793042ee6c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/inline-expanding.js
2013-07-29 23:17:37 -04:00
czaks
54714595f7 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
07ea457aa5 inline-expanding.js: missed preventing default action; shouldn't open new window when unwanted anymore 2013-07-27 02:19:58 -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
Michael Foster
c0a45ba123 Allow hide-images.js, toggle-images.js and inline-expanding.js to work together 2013-07-27 00:14:43 -04:00
czaks
dd4aea5431 inline-expanding.js: internal fix for better stability 2013-07-17 22:15:26 -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
czaks
ef66fd62b4 inline-expanding.js: don't set max height 2013-06-15 00:37:12 -04:00
Michael Save
21cb95af28 inline-expanding.js: don't expand larger than the window 2012-04-22 16:57:26 +10:00
Michael Save
f444fa3b6e onready() instead of onload() 2012-03-31 19:37:31 +11:00
Michael Save
d9b2b3f7a1 inline-expanding.js 2012-03-31 19:18:53 +11:00