Commit Graph
100 Commits
Author SHA1 Message Date
czaks 9343651d90 Add optional database table prefix (issue #118; see issue comments for details) 2013-08-01 01:16:20 -04:00
czaks 1364d84ae1 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 01:05:13 -04:00
czaks 235ee484fd removed a relict from older post hider 2013-08-01 01:04:19 -04:00
czaksandMichael Foster 38cc2d77f8 toggle-images.js: javascript i18n 2013-08-01 01:03:37 -04:00
czaks 1792a60f82 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:59:36 -04:00
czaks 168a4d73cc Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
czaks cefd5517ac Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 21:36:54 -04:00
czaksandMichael Foster 232f4ff868 markup modifiers: make it even harder to escape 2013-07-31 21:27:50 -04:00
czaksandMichael Foster ab36452543 fix post editing for tinyboard markup 2013-07-31 21:26:55 -04:00
czaks e93d5b2f8e Revert "markup modifiers: make it even harder to escape"
This reverts commit d7ea47a91f.
2013-07-31 21:22:57 -04:00
czaks 055c3a7382 Revert "facilitate using markup modifiers multiple times; make raw html not consume the whole post"
This reverts commit e7dd0bbc4a.
2013-07-31 21:22:32 -04:00
czaks 83844b5e3e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-07-31 21:03:13 -04:00
czaks 03d91df1d8 fix previous commit; markup is called via reference 2013-07-31 20:41:56 -04:00
czaks ce2af291b0 markup modifiers: there was a plan for adding markup to ban reasons, but assignment was missing; escape markup there too 2013-07-31 20:33:27 -04:00
czaks d7ea47a91f markup modifiers: make it even harder to escape 2013-07-31 20:13:19 -04:00
czaks e7dd0bbc4a facilitate using markup modifiers multiple times; make raw html not consume the whole post 2013-07-31 20:11:11 -04:00
czaks fa5922b45e fix post editing for tinyboard markup 2013-07-31 19:50:25 -04:00
czaks b35ea55763 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/thread.html
2013-07-31 19:25:04 -04:00
czaksandMichael Foster 6317a70152 header abstraction: abstracted also in thread.html
Conflicts:
	templates/page.html
	templates/thread.html
2013-07-31 17:14:10 -04:00
czaks dc9df2b9b3 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:05:53 -04:00
czaks c0abd1d851 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:02:30 -04:00
czaks 3d979750b1 fix merge 2013-07-31 15:01:44 -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
czaksandMichael Foster 67db0a878a js i18n: finish implementation with addition of the compiled locale strings file to additional javascripts 2013-07-31 04:57:50 -04:00
czaksandMichael Foster 3f98522ff2 i18n one more string in inc/functions.php 2013-07-31 04:56:42 -04:00
czaksandMichael Foster babeec8bb9 localise time values 2013-07-31 04:55:34 -04:00
czaksandMichael Foster be2e7d9782 i18n some strings in inc/config.php 2013-07-31 04:54:08 -04:00
czaksandMichael Foster 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
czaksandMichael Foster 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
czaksandMichael Foster e648121e4a hide-images.js: javascript i18n 2013-07-31 04:42:07 -04:00
czaksandMichael Foster a1b739b818 js i18n: quick-post-controls.js 2013-07-31 04:40:42 -04:00
czaksandMichael Foster 223624892a js i18n: forced-anon.js 2013-07-31 04:40:22 -04:00
czaksandMichael Foster bf4eca82b6 js i18n: hide-locked-threads.js i18n 2013-07-31 04:40:16 -04:00
czaksandMichael Foster fee73c2087 js i18n: local-time.js 2013-07-31 04:40:09 -04:00
Marcin ŁabanowskiandMichael Foster 2779db56cb smartphone-spoiler.js: add windows phone/tablet user agents 2013-07-31 04:39:37 -04:00
czaksandMichael Foster 4922828e35 js i18n: expand.js 2013-07-31 04:38:23 -04:00
czaksandMichael Foster 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
czaksandMichael Foster f98d5bdd18 local-time.js: make it work in localised environments 2013-07-31 04:35:14 -04:00
Marcin ŁabanowskiandMichael Foster 15d2c3e28a Added recent_dark stylesheet for recent template, need to be changed currently in style.php though 2013-07-31 04:32:48 -04:00
czaksandMichael Foster 61a305a1a2 js i18n: misc fixes; quick-reply.js i18n
Conflicts:
	tools/i18n_compile.php
2013-07-31 04:13:29 -04:00
czaksandMichael Foster 701cf42eef main.js: added preliminary translation functions for javascript 2013-07-31 04:11:01 -04:00
Marcin ŁabanowskiandMichael Foster 7e0cec3d9d Facilitate styling of subboard listings 2013-07-31 04:09:35 -04:00
czaksandMichael Foster 22556f43f5 Update Polish locale 2013-07-31 04:07:15 -04:00
czaksandMichael Foster b772be7c5b Update Polish translation 2013-07-31 04:07:03 -04:00
czaksandMichael Foster ba27016813 locale: update polish translation 2013-07-31 04:06:57 -04:00
czaksandMichael Foster 0ffa0b3adf Update Polish translation; javascript l10n 2013-07-31 04:06:52 -04:00
Marcin ŁabanowskiandMichael Foster 5ea2f02e7d Fixed typo in Polish translation 2013-07-31 04:05:49 -04:00
Marcin ŁabanowskiandMichael Foster 39cf9e7de5 Updated Polish translation (3) 2013-07-31 04:05:44 -04:00
Marcin ŁabanowskiandMichael Foster 4266c412b5 Updated Polish translation (2) 2013-07-31 04:05:38 -04:00
Marcin ŁabanowskiandMichael Foster cbab1f9ac2 Updated Polish translation 2013-07-31 04:05:29 -04:00
Marcin ŁabanowskiandMichael Foster daca11113e image identification: add imgops.com button 2013-07-31 04:00:29 -04:00
Marcin ŁabanowskiandMichael Foster 7c8bbe8527 Implement image identification buttons using regex.info/exif, google images and tineye 2013-07-31 04:00:22 -04:00
czaksandMichael Foster b7d884ef45 recaptcha: fix for https 2013-07-31 03:58:28 -04:00
Marcin ŁabanowskiandMichael Foster 3ef2c05bb2 url_ads: fix it not working 2013-07-31 03:39:20 -04:00
Marcin ŁabanowskiandMichael Foster 73cb2bdf2c convert+gifsicle: fix previous commit 2013-07-31 03:33:12 -04:00
Marcin ŁabanowskiandMichael Foster b7e725bf3e Support for resizing gifs using gifsicle with resizing the rest using ImageMagick 2013-07-31 03:33:06 -04:00
Marcin ŁabanowskiandMichael Foster f9cdf31ede Fix animated .gif conversion when $config['thumb_ext'] == '' 2013-07-31 03:32:44 -04:00
czaks ee23ec1e24 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 03:18:11 -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
czaks 793042ee6c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/inline-expanding.js
2013-07-29 23:17:37 -04:00
czaksandMichael Foster 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 9a27feca01 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-29 18:16:24 -04:00
czaks 4257191acd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-29 16:26:10 -04:00
czaks d11e9d752e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-28 20:51:43 -04:00
czaksandMichael Foster cea7881749 categories theme: i18n some strings 2013-07-28 16:47:32 -04:00
czaksandMichael Foster 98187303d7 categories theme: fix title displaying twice, put boardlist there instead 2013-07-28 16:47:24 -04:00
czaks 26b6dfb126 dark.css stylesheet fixes 2013-07-27 02:34:15 -04:00
czaks 4ffbbe7a23 Tag for vichan-devel-4.0.5-gold after bugfix 2013-07-27 02:21:08 -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 7af28a6e14 Tag as vichan-devel-4.0.4-gold 2013-07-27 02:06:50 -04:00
czaks 396492aad6 Update Polish locale 2013-07-27 02:01:42 -04:00
czaks 065a6f97c8 localise time values 2013-07-27 01:50:38 -04:00
czaks b31487b53d categories theme: i18n some strings 2013-07-27 01:43:09 -04:00
czaks e2b1034f09 categories theme: fix title displaying twice, put boardlist there instead 2013-07-27 01:38:03 -04:00
czaks 3f2ea6b936 i18n some strings in inc/config.php 2013-07-27 01:33:21 -04:00
czaks ae99c6dd0d i18n one more string in inc/functions.php 2013-07-27 01:21:30 -04:00
czaks 1157864612 banned.php: remove polish strings; html5; needs further work 2013-07-27 01:19:30 -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
czaksandMichael Foster 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
czaksandMichael Foster 4b50f1475e hide-threads.js: fix previous commit 2013-07-27 00:29:59 -04:00
czaksandMichael Foster c51dc146e2 hide-threads.js: show post hider even in posts without an image 2013-07-27 00:29:37 -04:00
czaksandMichael Foster d82cd9b7bd expand.js: fix post order when new posts appear between loading index and expanding 2013-07-27 00:28:55 -04:00
czaksandMichael Foster 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
czaks 35f8730f40 ukko: fix top boardlist losing its fixed status 2013-07-27 00:13:54 -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
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 5108bd1bf7 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-07-26 13:47:53 -04:00
czaks 114e34eea5 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-07-24 16:24:20 -04:00
czaks 4e609da2b7 fix merge 2013-07-23 10:34:23 -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
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
czaksandMichael Foster f0aee74523 catalog: fix previous commit 2013-07-22 19:05:38 -04:00