1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-12-18 10:25:55 +01:00
Commit Graph

354 Commits

Author SHA1 Message Date
czaks
6cb7eb939e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	install.php
	js/quick-reply.js
	post.php
	templates/index.html
2013-09-17 10:43:44 -04:00
Michael Foster
3e57bb04d7 Begin upgrade to much better bans table. DO NOT PULL YET; It won't work. 2013-09-17 09:15:24 +10:00
Michael Foster
c442502e74 h 2013-09-16 12:16:20 +10:00
Michael Foster
d20cda3596 fix for select shit in post form i think 2013-09-16 12:14:34 +10:00
Michael Foster
e175082fd6 recaptcha support 2013-09-16 08:11:54 +10:00
Michael Foster
7d3b249fee small bugfixes 2013-09-16 06:44:33 +10:00
Michael Foster
f2021725d3 work with threads and quick-post-controls.js 2013-09-16 04:45:53 +10:00
Michael Foster
4b45ccc4ee ajax-post-controls.js 2013-09-16 04:42:13 +10:00
Michael Foster
5d108319eb fix some weirdness 2013-09-16 03:51:36 +10:00
Michael Foster
769dfd95fa add ability to close quick reply 2013-09-16 03:20:11 +10:00
Michael Foster
d49b145f9a bugfix: firefox 2013-09-15 20:19:39 +10:00
Michael Foster
30fb025eef ; 2013-09-15 20:15:17 +10:00
Michael Foster
873820dae8 lol 2013-09-15 15:14:02 +10:00
Michael Foster
26b5f801ea some fixes 2013-09-15 15:06:29 +10:00
Michael Foster
30245c85f8 failsafe 2013-09-15 14:54:18 +10:00
Michael Foster
0367914e53 some quick bugfixes 2013-09-15 14:19:25 +10:00
Michael Foster
fdbd905d6f . 2013-09-15 14:13:43 +10:00
Michael Foster
31e64f096e various improvements 2013-09-15 14:11:09 +10:00
Michael Foster
00833eeafd js/ajax.js: post with ajax 2013-09-15 14:03:27 +10:00
Michael Foster
fd5300a49e quick reply take border oto 2013-09-15 13:00:36 +10:00
Michael Foster
cf8656c44d slightly nicer 2013-09-15 11:28:32 +10:00
Michael Foster
d74283640b . 2013-09-15 11:24:06 +10:00
Michael Foster
abb3d0cef4 make quick reply draggable 2013-09-15 11:18:46 +10:00
Michael Foster
8dd1a3e3e8 wait for stylesheet to load? 2013-09-15 10:42:50 +10:00
Michael Foster
41a3f9be25 bugfix and work with other stylesheets 2013-09-15 10:29:35 +10:00
Michael Foster
91e973fd6e allow quick-reply to work with image spoilers 2013-09-15 10:16:33 +10:00
Michael Foster
260908025c dont show quick reply on tiny screens lol 2013-09-15 08:08:44 +10:00
Michael Foster
59aa89a84b hide quick reply shit when scroll't up 2013-09-15 08:00:02 +10:00
Michael Foster
af657bc6e7 remove mod controls from quick reply, looks shit 2013-09-15 07:49:14 +10:00
Michael Foster
841dbaef90 yeah? 2013-09-15 07:40:49 +10:00
Michael Foster
07666f2a3f yeah 2013-09-15 07:39:34 +10:00
Michael Foster
e6934eceb2 that didn't work. try this? 2013-09-15 07:37:57 +10:00
Michael Foster
7bd3a1a3bf sync non-text fields too 2013-09-15 07:35:21 +10:00
Michael Foster
c8f2f00320 fix bug with quick-reply and make it nicer 2013-09-15 07:31:05 +10:00
Michael Foster
9a8cebe4a1 add real quick reply (wtf was the other thing?) 2013-09-15 07:17:02 +10:00
czaks
069f1def9b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-09-01 11:25:19 -04:00
Michael Foster
c567131ca7 bugfix: work with truncated filenames 2013-08-31 19:59:26 +10:00
Michael Foster
3287e57421 js/download-original.js 2013-08-31 19:49:06 +10:00
czaks
c8bb96f0cf toggle-locked-threads.js: fix for awesome font 2013-08-18 13:23:04 -04:00
czaks
da1b7d087e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-08-18 13:16:31 -04:00
Michael Foster
fa4dec36db Don't expand non-images 2013-08-18 16:40:07 +10:00
czaks
381cac2cb8 fix oekaki for ukko 2013-08-17 17:50:31 -04:00
czaks
9773cef5fa upload-selection + oekaki: hide confirmation 2013-08-17 17:31:50 -04:00
czaks
e37efb422e upload-selection.js: oekaki interaction 2013-08-17 17:26:46 -04:00
czaks
29a36e899e oekaki.js: next iteration of fixes 2013-08-17 17:21:05 -04:00
czaks
4b14049c94 oekaki.js: fix a little bit; i18n more 2013-08-17 17:07:15 -04:00
czaks
5d8608b839 Add upload selection javascript for decluttering the post form 2013-08-17 16:56:22 -04:00
czaks
ff479e8bcb Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-17 16:22:04 -04:00
czaks
bf119b7abd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/post-hover.js
2013-08-17 16:21:40 -04:00
ctrlcctrlv
5c2ec21e13 Bundle jscolor 2013-08-17 19:42:00 +00:00
ctrlcctrlv
979e5754a5 Better error handling 2013-08-17 19:08:54 +00:00
ctrlcctrlv
6cb863005d Edit images in thread/board using Oekaki 2013-08-17 18:56:16 +00:00
ctrlcctrlv
e3600131fc Configurable canvas size 2013-08-17 18:00:26 +00:00
ctrlcctrlv
7c5222ffb5 Make it so oekaki can be disabled 2013-08-17 17:36:38 +00:00
Michael Foster
cd3e2ef458 js/expand-all-images.js 2013-08-17 14:54:41 +10:00
Michael Foster
c0815ea25a Bugfix: When you hovered over a >>X link, then hid and unhid a thread (js/hide-threads.js) it would fuck up 2013-08-17 14:42:48 +10:00
czaks
d0c72927a6 Merge (partially) branch 'master' of https://github.com/savetheinternet/Tinyboard
Let's not merge part of it for now; it break things here

Conflicts:
	js/post-hover.js
2013-08-16 11:29:13 -04:00
czaks
b31f6489c7 js/catalog-link.js: i18n fix 2013-08-16 10:47:25 -04:00
czaks
83cd4cf841 js/catalog-link.js: disable for ukko 2013-08-16 10:45:43 -04:00
czaks
08652df7ac js/catalog-link.js: i18n 2013-08-16 10:45:01 -04:00
czaks
146243c473 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
2013-08-16 10:07:24 -04:00
Michael Foster
5774d21632 Post hover: hide images when need to 2013-08-16 23:49:57 +10:00
Michael Foster
23f23b8301 Make js/inline-expanding.js better, now that post images are marked with .post-image 2013-08-16 22:02:57 +10: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
ctrlcctrlv
9244cafe9c Fix catalog image not working inside threads 2013-08-11 13:17:21 +00:00
ctrlcctrlv
faf1d42a08 Catalog link script to be used with catalog theme 2013-08-11 21:09:02 +10:00
ctrlcctrlv
8b71029b55 oops ;_; 2013-08-08 23:39:18 +00:00
ctrlcctrlv
4f6e517fad Fix catalog board link appearing when it shouldnt 2013-08-08 23:36:21 +00:00
ctrlcctrlv
78ea9af97c Oekaki 2013-08-08 22:15:59 +00:00
ctrlcctrlv
4a8fbb5f6d Catalog link script to be used with catalog theme 2013-08-08 19:07:22 +00: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
b438fb294b post-hover.js: support linking to OPs (requires ukko patchset!) 2013-08-05 01:00:25 -04:00
czaks
185e68de47 post-hover.js: allow working between threads and boards (ukko patchset required!) 2013-08-05 00:18:25 -04:00
czaks
71db417206 post-hover.js: ukko fix 2013-08-04 06:08:10 -04:00
czaks
fb3b9ea868 quick-post-controls.js: fix javascript interactions 2013-08-04 04:35:41 -04:00
czaks
8a89893b02 quick-post-controls.js: fix javascript interactions 2013-08-04 01:53:37 -04:00
czaks
49993a3559 inline-expanding-filename.js: expand images also by clicking a link and not image 2013-08-02 01:05:29 -04:00
czaks
3b259aab14 style-select.js: add id for a styling ability 2013-08-02 00:24:37 -04:00
czaks
be8c84a2ab style-select.js: fix on firefox 2013-08-02 00:24:27 -04:00
czaks
22cecf9de7 style-select.js: add id for a styling ability 2013-08-02 00:21:41 -04:00
czaks
0d64ae0472 style-select.js: fix on firefox 2013-08-02 00:18:02 -04:00
czaks
1ed45ebe9e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/stripes.css
	stylesheets/testorange.css
	stylesheets/wasabi.css
2013-08-01 23:43:20 -04:00
Michael Foster
2fd60c6d25 Select chosen stylesheet on load 2013-08-01 19:26:09 -04:00
Michael Foster
cf0a20a564 js/style-select.js: Changes the stylesheet chooser links to a <select> 2013-08-01 19:21:15 -04:00
Michael Foster
2fdc8fe650 Moved stylesheets to main repo 2013-08-01 03:31:12 -04:00
czaks
38cc2d77f8 toggle-images.js: javascript i18n 2013-08-01 01:03:37 -04:00
czaks
168a4d73cc Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
Michael Foster
5bf0e7f7e7 Better/fixed jQuery styling and slightly improved js/inline-expanding.js accuracy (when jQuery is enabled) 2013-08-01 00:27:54 -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
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
czaks
e5663953b5 Remove our post-hider script in favour of STI's one, leave symlink for compatibility 2013-07-22 10:14:08 -04:00
Michael Foster
51361d02fb Strange bug in last commit 2013-07-21 21:18:57 -04:00
Michael Foster
9123161870 js/hide-threads.js: Simple thread-minimizing script 2013-07-21 21:12:30 -04:00
czaks
97a22e57c1 Remove imgcaptcha, this code is unused in any of our forks and needs work to get here back.
Revert "Merge branch 'imgcaptcha' of https://github.com/asiekierka/Tinyboard"

This reverts commit 49afb685c8, reversing
changes made to 2451a0f29c.

Conflicts:

	js/imgcaptcha.js
2013-07-20 22:47:26 -04:00
Czterooki
bc1bc9f6ef Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-07-20 18:28:57 -04:00
czaks
d31be1958d youtube.js: make it work with thread expand etc. 2013-07-20 18:25:58 -04:00
czaks
ede654cbd8 youtube.js: better working in https environments 2013-07-20 18:12:45 -04:00
czaks
70a861ec54 youtube.js: made it actually work, also a fix in usage 2013-07-20 18:11:25 -04:00
czaks
2edbb1c210 youtube.js: fix previous commit 2013-07-20 18:01:46 -04:00
czaks
b5d33b0e1c youtube.js: prevent default action of opening new window 2013-07-20 17:50:52 -04:00