1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-12-04 20:08:02 +01:00
Commit Graph

3229 Commits

Author SHA1 Message Date
czaks
a902bf6cba Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 21:36:54 -04:00
czaks
4d8c7f67cd markup modifiers: make it even harder to escape 2013-07-31 21:27:50 -04:00
czaks
70dbed72b1 fix post editing for tinyboard markup 2013-07-31 21:26:55 -04:00
Michael Foster
e740f45ed1 Bugfix: HTML injection in post editing (introduces and fixes yet another bug) 2013-07-31 21:24:17 -04:00
czaks
164d0e6e3b Revert "markup modifiers: make it even harder to escape"
This reverts commit d7ea47a91f.
2013-07-31 21:22:57 -04:00
czaks
07f8aa8c4c 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
ef9ede073f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-07-31 21:03:13 -04:00
Michael Foster
d30d94960c Allow public ban messages on raw HTML posts 2013-07-31 21:02:26 -04:00
Michael Foster
286524ca46 Newline before <tinyboard ban message> 2013-07-31 20:54:20 -04:00
Michael Foster
da5048a0e4 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
644f1d90cb fix previous commit; markup is called via reference 2013-07-31 20:41:56 -04:00
czaks
08e7192377 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
99427246e1 markup modifiers: make it even harder to escape 2013-07-31 20:13:19 -04:00
czaks
ada248ce4a facilitate using markup modifiers multiple times; make raw html not consume the whole post 2013-07-31 20:11:11 -04:00
czaks
2c7fa51012 fix post editing for tinyboard markup 2013-07-31 19:50:25 -04:00
czaks
0eaf52583f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/thread.html
2013-07-31 19:25:04 -04:00
Michael Foster
2b74f8b37d Markup modifiers: raw HTML 2013-07-31 19:18:55 -04:00
Michael Foster
be11041471 Markup modifiers. Fix issue #66 (public ban message lost when rebuilding post body) 2013-07-31 18:59:54 -04:00
Michael Foster
89285fd7c3 Fix issue #72 2013-07-31 18:29:09 -04:00
czaks
2adef4b4b9 header abstraction: abstracted also in thread.html
Conflicts:
	templates/page.html
	templates/thread.html
2013-07-31 17:14:10 -04:00
czaks
2c8bd71a9a Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:05:53 -04:00
Michael Foster
19b719f0af Fix last commit 2013-07-31 17:04:36 -04:00
Michael Foster
7619d23499 Only run SQL query to count threads if we really need to 2013-07-31 17:02:42 -04:00
czaks
625a7961bd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:02:30 -04:00
Michael Foster
44910c34c3 Fix last commit; Make Tinyboard Twig extension more mb-safe 2013-07-31 16:38:09 -04:00
Michael Foster
a8c929e0e7 Fix issue #74. Note: This bug may break the display of certain filenames prior to upgrade. 2013-07-31 16:34:50 -04:00
Michael Foster
d447c0bd72 Issue #125 2013-07-31 16:22:27 -04:00
Michael Foster
b299976007 two tiny changes 2013-07-31 16:06:24 -04:00
Michael Foster
0f7b252994 Convert to UNIX line endings 2013-07-31 16:04:46 -04:00
czaks
1f2b4e0181 i18n_extract tool: replace the bundled lib with gettext forced to assume python, since it extracts more strings 2013-07-31 16:00:16 -04:00
czaks
cb82c7d28a i18n tools: small fixes 2013-07-31 16:00:01 -04:00
czaks
ca72ad64ca js i18n: misc fixes; quick-reply.js i18n
Conflicts:
	js/quick-reply.js
	templates/main.js
2013-07-31 15:59:51 -04:00
czaks
291a0f02cb tools/inc/lib/jsgettext/: misc fixes 2013-07-31 15:58:45 -04:00
czaks
73fb2cfe55 tools/i18n_*: introduction of translation tools for tinyboard; supporting javascript i18n 2013-07-31 15:58:31 -04:00
czaks
ad809eeceb tools/inc/lib/jsgettext/: remove unnecessary file 2013-07-31 15:58:21 -04:00
czaks
79b6428718 tools/inc/lib/jsgettext/: apply fixes from bugtracker 2013-07-31 15:58:07 -04:00
czaks
12d1636b40 tools/inc/lib/jsgettext/: bundle jsgettext library from https://code.google.com/p/jsgettext 2013-07-31 15:57:53 -04:00
czaks
ed2f3358db fix merge 2013-07-31 15:01:44 -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
Michael Foster
bb820f6da9 Issue #126 2013-07-31 12:05:19 -04:00
Michael Foster
cf7f7cc9d6 i18n some more strings in inc/config.php 2013-07-31 06:56:57 -04:00
Michael Foster
18017ff761 Javascript l10n: Work without $config['additional_javascript_compile'] 2013-07-31 06:54:53 -04:00
Michael Foster
0f7777e4a6 Disallow board names which are too large for the filesytem to handle 2013-07-31 06:40:57 -04:00
Michael Foster
ee64c02f33 Accidentally included header.html twice 2013-07-31 05:06:29 -04:00
Michael Foster
f0e3d62b0f Undo 7e0cec for now. Will restore later once I resolve issues 2013-07-31 05:03:50 -04:00
czaks
1924e15354 js i18n: finish implementation with addition of the compiled locale strings file to additional javascripts 2013-07-31 04:57:50 -04:00
czaks
fb1968c0b9 i18n one more string in inc/functions.php 2013-07-31 04:56:42 -04:00
czaks
e968fd6ce9 localise time values 2013-07-31 04:55:34 -04:00
czaks
ef68982c79 i18n some strings in inc/config.php 2013-07-31 04:54:08 -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