Commit Graph

158 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
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
e648121e4a hide-images.js: javascript i18n 2013-07-31 04:42:07 -04:00
czaks
a1b739b818 js i18n: quick-post-controls.js 2013-07-31 04:40:42 -04:00
czaks
223624892a js i18n: forced-anon.js 2013-07-31 04:40:22 -04:00
czaks
bf4eca82b6 js i18n: hide-locked-threads.js i18n 2013-07-31 04:40:16 -04:00
czaks
fee73c2087 js i18n: local-time.js 2013-07-31 04:40:09 -04:00
Marcin Łabanowski
2779db56cb smartphone-spoiler.js: add windows phone/tablet user agents 2013-07-31 04:39:37 -04:00
czaks
4922828e35 js i18n: expand.js 2013-07-31 04:38:23 -04:00
Michael Foster
0a97cf7215 js/local-time.js: Make jQuery optional 2013-07-31 04:37:07 -04:00
czaks
46ebcbf51d local-time.js: make it work with thread expand etc; BEWARE IT NOW NEEDS JQUERY TO BE LOADED BEFORE 2013-07-31 04:35:29 -04:00
czaks
f98d5bdd18 local-time.js: make it work in localised environments 2013-07-31 04:35:14 -04:00
czaks
61a305a1a2 js i18n: misc fixes; quick-reply.js i18n
Conflicts:
	tools/i18n_compile.php
2013-07-31 04:13:29 -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
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
3e5234e54e toggle-images.js: javascript i18n 2013-07-27 01:16:12 -04:00
czaks
d09ef22154 hide-images.js: javascript i18n 2013-07-27 01:12:22 -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
1c33285c81 hide-threads.js: further fixes and customisations, mainly due to unexpanding previously not working here, but working on another boards (4chon, etc.)
Conflicts:
	stylesheets/style.css
2013-07-27 00:33:51 -04:00
czaks
4b50f1475e hide-threads.js: fix previous commit 2013-07-27 00:29:59 -04:00
czaks
c51dc146e2 hide-threads.js: show post hider even in posts without an image 2013-07-27 00:29:37 -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
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
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
Michael Foster
a11c8981fe js/hide-images.js: Hide individual images 2013-07-26 19:55:28 -04:00
Michael Foster
baa6793516 toggle-images.js (this was written last year, but I never pushed it to git) 2013-07-26 19:39:11 -04:00
czaks
1a43b87315 hide-threads.js: further fixes and customisations, mainly due to unexpanding previously not working here, but working on another boards (4chon, etc.) 2013-07-26 15:31:20 -04:00
czaks
95c50ae778 hide-threads.js: fix previous commit 2013-07-26 14:57:08 -04:00
czaks
c217069f2b hide-threads.js: show post hider even in posts without an image 2013-07-26 14:27:38 -04:00
czaks
1aa522e138 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/index.html
	templates/post_thread.html
	templates/thread.html
2013-07-23 10:25:33 -04:00
Michael Foster
c562149458 Bugfix: "[]" showing for mods when hiding threads 2013-07-23 09:20:37 -04:00
czaks
88c1205e42 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/hide-threads.js
2013-07-22 23:33:02 -04:00
czaks
6bc309697e hide-threads.js: fix working with ukko 2013-07-22 23:29:24 -04:00
czaks
acea5a3ccc youtube.js: make it work with thread expand etc. 2013-07-22 19:02:01 -04:00
czaks
96f3363a8b youtube.js: better working in https environments 2013-07-22 19:01:50 -04:00
czaks
bdffdcb1c3 youtube.js: made it actually work, also a fix in usage 2013-07-22 19:01:40 -04:00
czaks
e2806cfcaf youtube.js: fix previous commit 2013-07-22 19:01:32 -04:00
czaks
51bd267764 youtube.js: prevent default action of opening new window 2013-07-22 19:01:10 -04:00
czaks
163df14b50 hide-threads.js: a bigger minus character 2013-07-22 18:58:58 -04:00
czaks
d111c6ab8c hide-threads.js: a bigger minus character 2013-07-22 10:26:14 -04:00
czaks
805c729892 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-22 10:14:17 -04:00