1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-30 10:14:37 +01:00
Commit Graph

366 Commits

Author SHA1 Message Date
Michael Foster
d20c0b0b6d I messed up that merge. 2013-09-18 21:37:31 +10:00
czaks
a7c12035cf fix quickreply when recorded position is <0
Conflicts:
	js/quick-reply.js
2013-09-18 21:34:37 +10:00
czaks
c63f066b0e ajax.js: fix upload progress display in firefox 2013-09-18 21:32:43 +10:00
Michael Foster
dcc1376013 bugfix: quick reply link showing on index 2013-09-18 15:05:45 +10:00
Michael Foster
aaf28604ff forgot to commit js/settings.js. and new quick reply setting 2013-09-18 15:00:47 +10:00
Michael Foster
f5aa40dc3b js/settings.js: Simple config stuff for javascript extensions 2013-09-18 14:40:39 +10:00
czaks
b50fcd86ef ajax.js: fix upload progress display in firefox 2013-09-17 18:54:06 -04:00
czaks
c0787c9b71 remove js/quick-reply-vd-old.js (didn't differ too much from the original -old) 2013-09-17 18:19:44 -04:00
czaks
0855d00bcc fix quickreply when recorded position is <0 2013-09-17 18:15:59 -04:00
czaks
b9f1029192 quick-reply.js and oekaki.js interoperation fix 2013-09-17 18:12:54 -04:00
czaks
2755dba90d readd mistakenly deleted files by a bad merge 2013-09-17 15:13:03 -04:00
czaks
00b42a614a Merge https://github.com/savetheinternet/Tinyboard-Tools into vichan-devel-4.5
Conflicts:
	README.md
	js/auto-reload.js
	js/fix-report-delete-submit.js
	js/forced-anon.js
	js/local-time.js
	js/post-hover.js
	js/quick-post-controls.js
	js/quick-reply.js
	js/show-backlinks.js
	js/smartphone-spoiler.js
	migration/kusabax.php
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/testorange.css
	stylesheets/wasabi.css
	tools/benchmark.php
	tools/i18n_extract.php
	tools/inc/cli.php
	tools/rebuild.php
2013-09-17 15:08:41 -04:00
czaks
688a228884 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
309f6ffbdc 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
c72f08c3d2 h 2013-09-16 12:16:20 +10:00
Michael Foster
09986af4d4 fix for select shit in post form i think 2013-09-16 12:14:34 +10:00
Michael Foster
8c086ccc5e recaptcha support 2013-09-16 08:11:54 +10:00
Michael Foster
6aee7e71bd small bugfixes 2013-09-16 06:44:33 +10:00
Michael Foster
2eeaa4a1ad work with threads and quick-post-controls.js 2013-09-16 04:45:53 +10:00
Michael Foster
baac9af8d0 ajax-post-controls.js 2013-09-16 04:42:13 +10:00
Michael Foster
9fb478d942 fix some weirdness 2013-09-16 03:51:36 +10:00
Michael Foster
161d315e3a add ability to close quick reply 2013-09-16 03:20:11 +10:00
Michael Foster
eeba3f7b92 bugfix: firefox 2013-09-15 20:19:39 +10:00
Michael Foster
1f1fb6a694 ; 2013-09-15 20:15:17 +10:00
Michael Foster
b15145c504 lol 2013-09-15 15:14:02 +10:00
Michael Foster
85526ce0e4 some fixes 2013-09-15 15:06:29 +10:00
Michael Foster
d27a7cb6c3 failsafe 2013-09-15 14:54:18 +10:00
Michael Foster
bc41892255 some quick bugfixes 2013-09-15 14:19:25 +10:00
Michael Foster
d4767b536a . 2013-09-15 14:13:43 +10:00
Michael Foster
9a88778c6a various improvements 2013-09-15 14:11:09 +10:00
Michael Foster
b6faf5b09f js/ajax.js: post with ajax 2013-09-15 14:03:27 +10:00
Michael Foster
a431d7e991 quick reply take border oto 2013-09-15 13:00:36 +10:00
Michael Foster
27192cc141 slightly nicer 2013-09-15 11:28:32 +10:00
Michael Foster
c5fc4eeae5 . 2013-09-15 11:24:06 +10:00
Michael Foster
927f92e9cc make quick reply draggable 2013-09-15 11:18:46 +10:00
Michael Foster
1cd28b246f wait for stylesheet to load? 2013-09-15 10:42:50 +10:00
Michael Foster
9bffc85a66 bugfix and work with other stylesheets 2013-09-15 10:29:35 +10:00
Michael Foster
448d090af8 allow quick-reply to work with image spoilers 2013-09-15 10:16:33 +10:00
Michael Foster
814c1dee01 dont show quick reply on tiny screens lol 2013-09-15 08:08:44 +10:00
Michael Foster
6e3582ff95 hide quick reply shit when scroll't up 2013-09-15 08:00:02 +10:00
Michael Foster
13f4de6655 remove mod controls from quick reply, looks shit 2013-09-15 07:49:14 +10:00
Michael Foster
b01603a184 yeah? 2013-09-15 07:40:49 +10:00
Michael Foster
eaf8c8fe78 yeah 2013-09-15 07:39:34 +10:00
Michael Foster
be79c95b8a that didn't work. try this? 2013-09-15 07:37:57 +10:00
Michael Foster
b042df3e7a sync non-text fields too 2013-09-15 07:35:21 +10:00
Michael Foster
9ce0d60bba fix bug with quick-reply and make it nicer 2013-09-15 07:31:05 +10:00
Michael Foster
7a86403ed0 add real quick reply (wtf was the other thing?) 2013-09-15 07:17:02 +10:00
czaks
ff06aa2293 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-09-01 11:25:19 -04:00
Michael Foster
b4a60943b6 bugfix: work with truncated filenames 2013-08-31 19:59:26 +10:00
Michael Foster
5ce4d874eb js/download-original.js 2013-08-31 19:49:06 +10:00
czaks
f3c8146b20 toggle-locked-threads.js: fix for awesome font 2013-08-18 13:23:04 -04:00
czaks
311c18b34d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-08-18 13:16:31 -04:00
Michael Foster
ec46b30028 Don't expand non-images 2013-08-18 16:40:07 +10:00
czaks
a8d5505578 fix oekaki for ukko 2013-08-17 17:50:31 -04:00
czaks
c3343972a6 upload-selection + oekaki: hide confirmation 2013-08-17 17:31:50 -04:00
czaks
1896121fcd upload-selection.js: oekaki interaction 2013-08-17 17:26:46 -04:00
czaks
02930ce621 oekaki.js: next iteration of fixes 2013-08-17 17:21:05 -04:00
czaks
7e0e272bfd oekaki.js: fix a little bit; i18n more 2013-08-17 17:07:15 -04:00
czaks
60aecf6f87 Add upload selection javascript for decluttering the post form 2013-08-17 16:56:22 -04:00
czaks
af5400d441 Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-17 16:22:04 -04:00
czaks
d6d9e0f260 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/post-hover.js
2013-08-17 16:21:40 -04:00
ctrlcctrlv
7213396207 Bundle jscolor 2013-08-17 19:42:00 +00:00
ctrlcctrlv
2875279472 Better error handling 2013-08-17 19:08:54 +00:00
ctrlcctrlv
a30675030c Edit images in thread/board using Oekaki 2013-08-17 18:56:16 +00:00
ctrlcctrlv
f5360ad6c1 Configurable canvas size 2013-08-17 18:00:26 +00:00
ctrlcctrlv
18a103a68d Make it so oekaki can be disabled 2013-08-17 17:36:38 +00:00
Michael Foster
e11e532c32 js/expand-all-images.js 2013-08-17 14:54:41 +10:00
Michael Foster
fe3676383d 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
4dc1bec32a 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
4f09574149 js/catalog-link.js: i18n fix 2013-08-16 10:47:25 -04:00
czaks
777e98ad85 js/catalog-link.js: disable for ukko 2013-08-16 10:45:43 -04:00
czaks
04013c56c1 js/catalog-link.js: i18n 2013-08-16 10:45:01 -04:00
czaks
e440851526 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
98daa9b0d1 Post hover: hide images when need to 2013-08-16 23:49:57 +10:00
Michael Foster
39e2ed40dc Make js/inline-expanding.js better, now that post images are marked with .post-image 2013-08-16 22:02:57 +10:00
czaks
78ed2de16e fix thread expanding and post hover interop a bit 2013-08-13 15:30:17 -04:00
czaks
5e15d6335e noko50 + expand.js: make it interoperate 2013-08-11 17:59:17 -04:00
ctrlcctrlv
8ba527dccf Fix catalog image not working inside threads 2013-08-11 13:17:21 +00:00
ctrlcctrlv
afc46771af Catalog link script to be used with catalog theme 2013-08-11 21:09:02 +10:00
ctrlcctrlv
63d374d354 oops ;_; 2013-08-08 23:39:18 +00:00
ctrlcctrlv
37b75b065a Fix catalog board link appearing when it shouldnt 2013-08-08 23:36:21 +00:00
ctrlcctrlv
013ca134be Oekaki 2013-08-08 22:15:59 +00:00
ctrlcctrlv
c756cfb667 Catalog link script to be used with catalog theme 2013-08-08 19:07:22 +00:00
czaks
585f75fcaf 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
c3def0e453 Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	js/post-hider.js
2013-08-05 06:03:40 -04:00
czaks
0a5409e8d4 post-hover.js: support linking to OPs (requires ukko patchset!) 2013-08-05 01:00:25 -04:00
czaks
0a5ac47dc2 post-hover.js: allow working between threads and boards (ukko patchset required!) 2013-08-05 00:18:25 -04:00
czaks
f3f7093d12 post-hover.js: ukko fix 2013-08-04 06:08:10 -04:00
czaks
42df7d23f4 quick-post-controls.js: fix javascript interactions 2013-08-04 04:35:41 -04:00
czaks
68b0ad2b48 quick-post-controls.js: fix javascript interactions 2013-08-04 01:53:37 -04:00
czaks
5d62f2fb1f inline-expanding-filename.js: expand images also by clicking a link and not image 2013-08-02 01:05:29 -04:00
czaks
7aafdcbe55 style-select.js: add id for a styling ability 2013-08-02 00:24:37 -04:00
czaks
49abd1a036 style-select.js: fix on firefox 2013-08-02 00:24:27 -04:00
czaks
6089a74a22 style-select.js: add id for a styling ability 2013-08-02 00:21:41 -04:00
czaks
941aec875d style-select.js: fix on firefox 2013-08-02 00:18:02 -04:00
czaks
d1a5e9d2cf 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
84de059065 Select chosen stylesheet on load 2013-08-01 19:26:09 -04:00
Michael Foster
1bcd577638 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
4e84ceb368 toggle-images.js: javascript i18n 2013-08-01 01:03:37 -04:00
czaks
926b2c31ed Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
Michael Foster
801bd56689 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
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
0a4cfee529 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
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
2a51b03d2e hide-images.js: javascript i18n 2013-07-31 04:42:07 -04:00
czaks
7ed5dfa93a js i18n: quick-post-controls.js 2013-07-31 04:40:42 -04:00
czaks
dad73edf99 js i18n: forced-anon.js 2013-07-31 04:40:22 -04:00
czaks
6b903e8f35 js i18n: hide-locked-threads.js i18n 2013-07-31 04:40:16 -04:00
czaks
49d3ce8158 js i18n: local-time.js 2013-07-31 04:40:09 -04:00
Marcin Łabanowski
cd62252f60 smartphone-spoiler.js: add windows phone/tablet user agents 2013-07-31 04:39:37 -04:00
czaks
93a8ac1d05 js i18n: expand.js 2013-07-31 04:38:23 -04:00
Michael Foster
7cc7109350 js/local-time.js: Make jQuery optional 2013-07-31 04:37:07 -04:00
czaks
6eb61b5c99 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
431fa656ab local-time.js: make it work in localised environments 2013-07-31 04:35:14 -04:00
czaks
62566dd174 js i18n: misc fixes; quick-reply.js i18n
Conflicts:
	tools/i18n_compile.php
2013-07-31 04:13:29 -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
83bb16cb37 Issue #61 2013-07-31 00:39:00 -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
840676d1e8 toggle-images.js: javascript i18n 2013-07-27 01:16:12 -04:00
czaks
ca79c26565 hide-images.js: javascript i18n 2013-07-27 01:12:22 -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
czaks
940097293c ukko: fix javascript interoperation 2013-07-27 00:57:12 -04:00
czaks
37d861ecb9 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
e8ce6c1360 hide-threads.js: fix previous commit 2013-07-27 00:29:59 -04:00
czaks
31e1b85707 hide-threads.js: show post hider even in posts without an image 2013-07-27 00:29:37 -04:00
czaks
b6274dccc3 expand.js: fix post order when new posts appear between loading index and expanding 2013-07-27 00:28:55 -04:00
czaks
aba0641b16 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
be3de713cb Allow hide-images.js, toggle-images.js and inline-expanding.js to work together 2013-07-27 00:14:43 -04:00
czaks
72bca57af6 expand.js: fix post order when new posts appear between loading index and expanding 2013-07-26 22:39:00 -04:00
czaks
ea3decb169 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
d4799e54c1 js/hide-images.js: Hide individual images 2013-07-26 19:55:28 -04:00
Michael Foster
99f24f9758 toggle-images.js (this was written last year, but I never pushed it to git) 2013-07-26 19:39:11 -04:00
czaks
265c366db6 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
b5075989a2 hide-threads.js: fix previous commit 2013-07-26 14:57:08 -04:00
czaks
bfa3236d63 hide-threads.js: show post hider even in posts without an image 2013-07-26 14:27:38 -04:00
czaks
808ae271f4 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
ec459e69f4 Bugfix: "[]" showing for mods when hiding threads 2013-07-23 09:20:37 -04:00
czaks
b471c5e35d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/hide-threads.js
2013-07-22 23:33:02 -04:00
czaks
b8d81ec281 hide-threads.js: fix working with ukko 2013-07-22 23:29:24 -04:00
czaks
4c362c6c12 youtube.js: make it work with thread expand etc. 2013-07-22 19:02:01 -04:00
czaks
5184d1ee0a youtube.js: better working in https environments 2013-07-22 19:01:50 -04:00
czaks
352ea404bd youtube.js: made it actually work, also a fix in usage 2013-07-22 19:01:40 -04:00
czaks
869fda1da3 youtube.js: fix previous commit 2013-07-22 19:01:32 -04:00
czaks
0029e4c5a0 youtube.js: prevent default action of opening new window 2013-07-22 19:01:10 -04:00
czaks
17cb3e452c hide-threads.js: a bigger minus character 2013-07-22 18:58:58 -04:00