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
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
46edec0f2d
Bug with last commit
2013-07-23 09:46:29 -04:00
Michael Foster
5b3445cac6
Bug with last commit
2013-07-23 09:46:29 -04:00
Michael Foster
1132a4ce79
Option to use font-awesome for sticky/lock icons, etc.
2013-07-23 09:38:42 -04:00
Michael Foster
e84dceb60c
Option to use font-awesome for sticky/lock icons, etc.
2013-07-23 09:38:42 -04:00
Michael Foster
ab0c5ee481
Option to make stylesheet selections board-specific
2013-07-23 01:35:56 -04:00
Michael Foster
ad2edf62d7
Option to make stylesheet selections board-specific
2013-07-23 01:35:56 -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
b471c5e35d
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
js/hide-threads.js
2013-07-22 23:33:02 -04:00
czaks
f0aee74523
catalog: fix previous commit
2013-07-22 19:05:38 -04:00
czaks
9e0e4c86d9
catalog: fix previous commit
2013-07-22 19:05:38 -04:00
czaks
329c81bbd3
catalog: translation fix
2013-07-22 19:05:30 -04:00
czaks
596421a695
catalog: translation fix
2013-07-22 19:05:30 -04:00
Michael Foster
6ba8f3f7de
Add custom links to dashboard
2013-07-22 18:30:45 -04:00
Michael Foster
9a35acdd1e
Add custom links to dashboard
2013-07-22 18:30:45 -04:00
Michael Foster
ed8fe6c27a
Option to check public ban message by default
2013-07-22 17:51:13 -04:00
Michael Foster
aa598d28d1
Option to check public ban message by default
2013-07-22 17:51:13 -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 49afb685c8e658c0f36b8171e176363538eb9419, reversing
changes made to 2451a0f29c08e23ff36ef113082c112224f7e576.
Conflicts:
js/imgcaptcha.js
2013-07-20 22:47:26 -04:00
czaks
600324b137
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 49afb685c8e658c0f36b8171e176363538eb9419, reversing
changes made to 2451a0f29c08e23ff36ef113082c112224f7e576.
Conflicts:
js/imgcaptcha.js
2013-07-20 22:47:26 -04:00
czaks
33c7abf11f
Merge branch 'master' of github.com:vichan-devel/Tinyboard
2013-07-20 22:33:56 -04:00
czaks
52bf3d3623
Merge branch 'master' of github.com:vichan-devel/Tinyboard
2013-07-20 22:33:56 -04:00
czaks
3596e429bf
post search: one more i18n string
2013-07-20 20:41:54 -04:00
czaks
34a5b2c543
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
1fea792ac1
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
629d616de5
post search: internationalize and use config values
2013-07-20 20:01:22 -04:00
czaks
ba95f9b593
post search: internationalize and use config values
2013-07-20 20:01:22 -04:00
Michael Foster
dd75fe985c
Public search form
2013-07-20 18:50:40 -04:00
Michael Foster
26805ffd7f
Public search form
2013-07-20 18:50:40 -04:00
Czterooki
bc1bc9f6ef
Merge branch 'master' of github.com:vichan-devel/Tinyboard
2013-07-20 18:28:57 -04:00
Czterooki
5feda30e63
Merge branch 'master' of github.com:vichan-devel/Tinyboard
2013-07-20 18:28:57 -04:00
Czterooki
ca5283abad
empty ukko boardlist
2013-07-20 18:02:53 -04:00
Czterooki
f6ca7505a2
empty ukko boardlist
2013-07-20 18:02:53 -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
274a86dd03
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
templates/themes/sitemap/info.php
2013-07-20 17:28:34 -04:00
Michael Foster
b776e0a7f0
Search update
2013-07-20 12:05:42 -04:00
Michael Foster
f49e6c9fc3
Search update
2013-07-20 12:05:42 -04:00
Michael Foster
e62b83e79c
Bring back search (searching posts not implemented yet)
2013-07-20 07:50:33 -04:00
Michael Foster
b34ba883c5
Bring back search (searching posts not implemented yet)
2013-07-20 07:50:33 -04:00
Czterooki
aef4425592
merge with vichan-gold
2013-07-20 00:19:08 -04:00
Czterooki
acf93cda21
merge with vichan-gold
2013-07-20 00:19:08 -04:00
Czterooki
81892ebcdc
templates/thread.html
2013-07-20 00:10:39 -04:00
Czterooki
cf3609514e
templates/thread.html
2013-07-20 00:10:39 -04:00
Czterooki
f8ca3aa418
templates/post_thread.html
2013-07-20 00:09:51 -04:00
Czterooki
6be4be8cea
templates/post_thread.html
2013-07-20 00:09:51 -04:00
Czterooki
5b92f99818
templates/post_form.html
2013-07-20 00:09:17 -04:00
Czterooki
baa5dbc957
templates/post_form.html
2013-07-20 00:09:17 -04:00
Michael Foster
19766c4e0e
Bugfix: Warning when in CLI-mode
2013-07-19 06:20:22 -04:00
Michael Foster
f61f3224be
Bugfix: Warning when in CLI-mode
2013-07-19 06:20:22 -04:00