czaks
114e34eea5
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
install.php
2013-07-24 16:24:20 -04:00
czaks
2e2469569b
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
install.php
2013-07-24 16:24:20 -04:00
Michael Foster
33a1c00bd5
%length% in public ban messages
2013-07-24 11:30:01 -04:00
Michael Foster
8daaaf350a
%length% in public ban messages
2013-07-24 11:30:01 -04:00
Michael Foster
31f657e550
Long overdue: Salted password hashes
2013-07-24 11:15:55 -04:00
Michael Foster
d6090fb776
Long overdue: Salted password hashes
2013-07-24 11:15:55 -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
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
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
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
805c729892
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
2013-07-22 10:14:17 -04:00
czaks
73414519ba
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
2013-07-22 10:14:17 -04:00
Michael Foster
308f557fd5
Option to automatically strip EXIF metadata from JPEGs
2013-07-21 15:50:45 -04:00
Michael Foster
f798bb5209
Option to automatically strip EXIF metadata from JPEGs
2013-07-21 15:50:45 -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
8772c31ce1
post search: missed default config
2013-07-20 22:45:21 -04:00
czaks
c8a72be62f
post search: missed default config
2013-07-20 22:45:21 -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
17952d173c
Update Polish translation
2013-07-20 20:23:55 -04:00
czaks
8b3bd5835a
Update Polish translation
2013-07-20 20:23:55 -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
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
67cbc2b1aa
Fix permissions with search
2013-07-20 13:15:44 -04:00
Michael Foster
f552849495
Fix permissions with search
2013-07-20 13:15:44 -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
01d9ad9d43
inc/mod/pages.php
2013-07-20 00:05:08 -04:00
Czterooki
36e67de205
inc/mod/pages.php
2013-07-20 00:05:08 -04:00
Czterooki
ad7d15535b
config.php
2013-07-20 00:03:45 -04:00
Czterooki
7761dc3fff
config.php
2013-07-20 00:03:45 -04:00
Michael Foster
30dc892786
Only store video URLs in database, instead of the generated player HTML.
2013-07-19 18:36:12 -04:00
Michael Foster
731cfba33b
Only store video URLs in database, instead of the generated player HTML.
2013-07-19 18:36:12 -04:00
czaks
f04566f6d3
locale: update polish translation
2013-07-18 16:34:22 -04:00
czaks
cef5d586ff
locale: update polish translation
2013-07-18 16:34:22 -04:00
