czaks
|
83844b5e3e
|
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
inc/functions.php
|
2013-07-31 21:03:13 -04:00 |
|
Michael Foster
|
a5312ebe89
|
Allow public ban messages on raw HTML posts
|
2013-07-31 21:02:26 -04:00 |
|
Michael Foster
|
0f9df0ac66
|
Newline before <tinyboard ban message>
|
2013-07-31 20:54:20 -04:00 |
|
Michael Foster
|
328484bee7
|
SQL cleanup
|
2013-07-31 20:51:43 -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 |
|
Michael Foster
|
6bbe407e18
|
Markup modifiers: raw HTML
|
2013-07-31 19:18:55 -04:00 |
|
Michael Foster
|
6d52c8b428
|
Markup modifiers. Fix issue #66 (public ban message lost when rebuilding post body)
|
2013-07-31 18:59:54 -04:00 |
|
Michael Foster
|
4891735c49
|
Fix issue #72
|
2013-07-31 18:29:09 -04:00 |
|
czaks
|
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 |
|
Michael Foster
|
3a8736cdc0
|
Fix last commit
|
2013-07-31 17:04:36 -04:00 |
|
Michael Foster
|
c2a287cd14
|
Only run SQL query to count threads if we really need to
|
2013-07-31 17:02:42 -04:00 |
|
czaks
|
c0abd1d851
|
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
|
2013-07-31 17:02:30 -04:00 |
|
Michael Foster
|
6cdf603875
|
Fix last commit; Make Tinyboard Twig extension more mb-safe
|
2013-07-31 16:38:09 -04:00 |
|
Michael Foster
|
d692bce686
|
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
|
dc1d1a3fcd
|
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
|
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 |
|
Michael Foster
|
8e4c493a4c
|
Issue #126
|
2013-07-31 12:05:19 -04:00 |
|
Michael Foster
|
659310663e
|
i18n some more strings in inc/config.php
|
2013-07-31 06:56:57 -04:00 |
|
Michael Foster
|
42e16e233a
|
Javascript l10n: Work without $config['additional_javascript_compile']
|
2013-07-31 06:54:53 -04:00 |
|
Michael Foster
|
439795e63b
|
Disallow board names which are too large for the filesytem to handle
|
2013-07-31 06:40:57 -04:00 |
|
Michael Foster
|
317f616e82
|
Accidentally included header.html twice
|
2013-07-31 05:06:29 -04:00 |
|
Michael Foster
|
81da2fea04
|
Undo 7e0cec for now. Will restore later once I resolve issues
|
2013-07-31 05:03:50 -04:00 |
|
czaks
|
67db0a878a
|
js i18n: finish implementation with addition of the compiled locale strings file to additional javascripts
|
2013-07-31 04:57:50 -04:00 |
|
czaks
|
3f98522ff2
|
i18n one more string in inc/functions.php
|
2013-07-31 04:56:42 -04:00 |
|
czaks
|
babeec8bb9
|
localise time values
|
2013-07-31 04:55:34 -04:00 |
|
czaks
|
be2e7d9782
|
i18n some strings in inc/config.php
|
2013-07-31 04:54:08 -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 |
|