Commit Graph
100 Commits
Author SHA1 Message Date
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
czaksandMichael Foster 329c81bbd3 catalog: translation fix 2013-07-22 19:05:30 -04:00
czaksandMichael Foster acea5a3ccc youtube.js: make it work with thread expand etc. 2013-07-22 19:02:01 -04:00
czaksandMichael Foster 96f3363a8b youtube.js: better working in https environments 2013-07-22 19:01:50 -04:00
czaksandMichael Foster bdffdcb1c3 youtube.js: made it actually work, also a fix in usage 2013-07-22 19:01:40 -04:00
czaksandMichael Foster e2806cfcaf youtube.js: fix previous commit 2013-07-22 19:01:32 -04:00
czaksandMichael Foster 51bd267764 youtube.js: prevent default action of opening new window 2013-07-22 19:01:10 -04:00
czaksandMichael Foster 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
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
czaks 8772c31ce1 post search: missed default config 2013-07-20 22:45:21 -04:00
czaks 3596e429bf post search: one more i18n string 2013-07-20 20:41:54 -04:00
czaks faa7cf473f post search: i18n fix; move from post to get, since this method is more suitable for search 2013-07-20 20:39:41 -04:00
czaks 6c05d73f28 post search: i18n one more string 2013-07-20 20:36:54 -04:00
czaks 17952d173c Update Polish translation 2013-07-20 20:23:55 -04:00
czaks 2ae918c0bd post search: one more fix 2013-07-20 20:07:28 -04:00
czaks 8df5d03f8c post search: fix previous commit 2013-07-20 20:05:16 -04:00
czaks 629d616de5 post search: internationalize and use config values 2013-07-20 20:01:22 -04:00
czaks 472b518165 post search: configs and database 2013-07-20 19:48:14 -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
czaks 9f323ae65f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/themes/sitemap/info.php
2013-07-20 17:28:34 -04:00
czaks f04566f6d3 locale: update polish translation 2013-07-18 16:34:22 -04:00
czaks 5547591b87 catalog: fix previous commit 2013-07-18 16:16:43 -04:00
czaks a5a1f00223 catalog: translation fix 2013-07-18 16:13:48 -04:00
czaks aa9844ae2a sitemap theme: fix notice when rebuilding using tools/rebuild.php from CLI 2013-07-18 15:31:22 -04:00
czaks fa66b96240 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	post.php
2013-07-18 15:19:03 -04:00
czaks 8c72c8a432 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-17 22:17:37 -04:00
czaksandroot dd4aea5431 inline-expanding.js: internal fix for better stability 2013-07-17 22:15:26 -04:00
czaksandroot 95b49f2215 quick-reply.js: activate only on index page 2013-07-17 22:09:42 -04:00
czaks 84aaaabece Merge branch 'master' of https://github.com/kaja47/Tinyboard 2013-07-16 13:40:56 -04:00
czaks 786ac5c55c recaptcha: fix for https 2013-07-16 13:18:55 -04:00
czaks 7bdb96a16b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
	templates/index.html
	templates/thread.html
2013-07-16 13:02:13 -04:00
czaks 8a598982a4 vichan-devel-4.0-gold release; mention vichan-devel in README; bump version; tag 2013-07-03 02:24:59 -04:00
czaks 8de00e5ba9 Update Polish translation; javascript l10n 2013-07-03 01:59:36 -04:00
czaks 1e3ae4c7f7 js i18n: quick-post-controls.js 2013-07-03 01:55:43 -04:00
czaks 05e719cea0 js i18n: forced-anon.js 2013-07-03 01:48:24 -04:00
czaks 7660be1e02 js i18n: hide-locked-threads.js i18n 2013-07-03 01:40:23 -04:00
czaks 0a6a982ae9 i18n_extract tool: replace the bundled lib with gettext forced to assume python, since it extracts more strings 2013-07-03 01:37:48 -04:00
czaks f9abd0669b js i18n: local-time.js 2013-07-03 01:27:09 -04:00
czaks f2128758f2 i18n tools: small fixes 2013-07-03 01:24:09 -04:00
czaks 7180a77705 smartphone-spoiler.js: make it work with thread expanding etc. 2013-07-03 01:18:44 -04:00
czaks 37c1b134de js i18n: expand.js 2013-07-03 01:17:56 -04:00
czaks da9f367f2f js i18n: misc fixes; quick-reply.js i18n 2013-07-03 01:04:08 -04:00
czaks 3fc38cb552 tools/inc/lib/jsgettext/: misc fixes 2013-07-03 00:50:43 -04:00
czaks 21f6799617 js i18n: finish implementation with addition of the compiled locale strings file to additional javascripts 2013-07-03 00:25:32 -04:00
czaks 2b8d695b49 tools/i18n_*: introduction of translation tools for tinyboard; supporting javascript i18n 2013-07-03 00:12:28 -04:00
czaks 8fd569ce1e tools/inc/lib/jsgettext/: remove unnecessary file 2013-07-02 23:58:37 -04:00
czaks f7d7981248 tools/inc/lib/jsgettext/: apply fixes from bugtracker 2013-07-02 23:57:47 -04:00
czaks 74f4c7da18 main.js: added preliminary translation functions for javascript 2013-07-02 23:10:00 -04:00
czaks 7ab1ec4caa tools/inc/lib/jsgettext/: bundle jsgettext library from https://code.google.com/p/jsgettext 2013-07-02 22:48:43 -04:00
czaks 47640a0ce8 tools/: move cli utils from tinyboard-tools to tinyboard repo 2013-07-02 22:45:52 -04:00
czaks fe1e07f1bf local-time.js: make it work with thread expand etc; BEWARE IT NOW NEEDS JQUERY TO BE LOADED BEFORE 2013-07-02 21:09:05 -04:00
czaks dfe31de156 local-time.js: make it work in localised environments 2013-07-02 20:58:16 -04:00
Marcin Łabanowskiandroot 6961f5b8b5 post_form: move submit button upper when thread field is disabled 2013-07-02 18:05:40 -04:00
czaks d134d2ae22 post-hider.js: further code cleanup; fix displaying on board pages 2013-06-24 09:05:33 -04:00
czaks 0cae0d70b8 post-hider.js: fixed multiple board issues; eg. you could hide a thread on one board, and threads from other boards with the same id would have been hidden too 2013-06-24 09:02:12 -04:00
czaks 802fd16d46 templates/post_thread.html: add data-board field for every thread; mainly for post-hiding and ukko integration 2013-06-24 08:46:59 -04:00
czaks da57f51c87 templates/post_thread.html: changed windows-type endlines to unix-type 2013-06-24 08:44:19 -04:00
czaks 3bcf88e842 JS Api: added an active_page variable to make it easier to denote the context from javascript 2013-06-24 08:23:09 -04:00
czaks 24a520485d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/page.html
2013-06-21 16:41:39 -04:00
czaks c073967600 SPDY: send back updated thread/index after post
Sets X-Associated-Content header, which is at least recognized
by Apache mod_spdy.
2013-06-21 16:37:56 -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 9b3eb9c2ca stylesheets: add photon.css by Turanga 2013-06-15 01:36:30 -04:00
czaks ef66fd62b4 inline-expanding.js: don't set max height 2013-06-15 00:37:12 -04:00
czaks ba424698e0 header abstraction: abstracted also in thread.html 2013-06-15 00:22:13 -04:00
czaks e53481f93e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/index.html
2013-06-15 00:08:11 -04:00
czaks 8b952fe97f overboard: missed templates/index.html 2013-06-15 00:04:08 -04:00
czaks b85fc7d102 generic boardlist for overboard 2013-06-14 23:57:04 -04:00
czaks 9c29cec659 Moved ukko to a proper location 2013-05-26 18:03:20 -04:00
czaks 258083e5cb Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-05-26 17:53:00 -04:00
czaks 4c45689528 vichan specific fix to facilitate using "." and "+" in boardnames 2013-05-26 17:52:33 -04:00
Marcin Łabanowski b4efebae55 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-29 14:31:35 +01:00
Marcin Łabanowski cac9b86824 [EDIT] mistake while merging 2013-01-28 14:28:26 +01:00
Marcin Łabanowski d1bd4e1f7b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-28 13:29:21 +01:00
Marcin Łabanowski e6b9bad788 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	mod.php
2013-01-26 15:08:48 +01:00
Marcin Łabanowski 9b7b1c996f Revert "[EDIT] restore previous behaviour (editing of html, not bbcode)"
This reverts commit 55d752073d.
2013-01-26 15:03:31 +01:00
Marcin Łabanowski 55d752073d [EDIT] restore previous behaviour (editing of html, not bbcode) 2013-01-23 19:06:13 +01:00
Marcin Łabanowski fabba73ce4 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into HEAD
Conflicts:
	mod.php
2013-01-23 18:58:38 +01:00
Marcin Łabanowski e087e9afae Revert "[EDIT] added dummy page"
This reverts commit a051ca64ab.

Conflicts:
	mod.php
2013-01-23 18:57:02 +01:00
Marcin Łabanowski 635cd5a7d9 Revert "[EDIT] added dummy form"
This reverts commit 1a2c859996.
2013-01-23 18:54:48 +01:00
Marcin Łabanowski b04a05494a Revert "[EDIT] basic edit support"
This reverts commit 9fec3646fa.

Conflicts:
	inc/mod/pages.php
2013-01-23 18:54:41 +01:00
Marcin Łabanowski 25268f3876 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-23 17:19:31 +01:00
Marcin Łabanowski 18ca523b18 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-21 13:17:13 +01:00
Marcin Łabanowski b968a6a1f9 Merge pull request #11 from cccxd/patch-4
Update stylesheets/testorange.css
2013-01-19 07:29:43 -08:00
Marcin Łabanowski 00bd6b7596 Merge pull request #9 from cccxd/patch-2
Update stylesheets/szalet.css
2013-01-19 07:29:25 -08:00
Marcin Łabanowski 82fb733906 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-19 16:23:02 +01:00
Marcin Łabanowski fa0a79d992 url_ads: fix it not working 2013-01-16 19:49:26 +01:00
Marcin Łabanowski 1c7adaa3cf url_ads: Fix comment in inc/config.php 2013-01-16 19:29:25 +01:00
Marcin Łabanowski b3cbf0ec9c Merge pull request #7 from cccxd/patch-1
Update inc/config.php
2013-01-16 10:14:44 -08:00
Marcin Łabanowski 84a5066300 Merge pull request #6 from cccxd/master
referrer
2013-01-16 10:14:20 -08:00