czaks
0eaf52583f
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
templates/thread.html
2013-07-31 19:25:04 -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
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
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
ee64c02f33
Accidentally included header.html twice
2013-07-31 05:06:29 -04:00
asiekierka
3ad74029f4
added Fluttershy recent theme and theme picker
2013-07-31 04:32:57 -04:00
Marcin Łabanowski
8338ef185b
Added recent_dark stylesheet for recent template, need to be changed currently in style.php though
2013-07-31 04:32:48 -04:00
Michael Foster
e06a800027
Convert to UNIX line endings
2013-07-31 04:28:26 -04:00
czaks
62566dd174
js i18n: misc fixes; quick-reply.js i18n
...
Conflicts:
tools/i18n_compile.php
2013-07-31 04:13:29 -04:00
czaks
1ffb6dcc4c
main.js: added preliminary translation functions for javascript
2013-07-31 04:11:01 -04:00
Marcin Łabanowski
f75058f5dd
image identification: add imgops.com button
2013-07-31 04:00:29 -04:00
Marcin Łabanowski
64c986017a
Implement image identification buttons using regex.info/exif, google images and tineye
2013-07-31 04:00:22 -04:00
czaks
80096a0386
recaptcha: fix for https
2013-07-31 03:58:28 -04:00
Michael Foster
8b9b6983be
fix header.html merge
2013-07-31 03:55:55 -04:00
asiekierka
68f755ee26
refactored head away from templates
...
Conflicts:
templates/generic_page.html
templates/index.html
templates/page.html
2013-07-31 03:54:18 -04:00
czaks
6eaff24cdc
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
2013-07-31 03:18:11 -04:00
Michael Foster
5039fb0c8f
Disable autocomplete
2013-07-31 02:38:40 -04:00
czaks
eed8767039
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
inc/functions.php
inc/mod/pages.php
install.php
js/expand.js
mod.php
2013-07-31 02:30:44 -04:00
Michael Foster
2545acd35f
Ability to hide IP addresses from mod log
2013-07-31 00:04:57 -04:00
Michael Foster
36339feee6
Hide "flags" section in posting form if user doesn't have permission to do anything special
2013-07-30 23:36:46 -04:00
Michael Foster
a01f53b4a4
Upgrade to utf8mb4 charset for MySQL server versions above 5.5.3. Keep support for older versions. Fix charsets for multiple columns and tables.
2013-07-30 22:08:56 -04:00
czaks
10f9220657
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
js/inline-expanding.js
2013-07-29 23:17:37 -04:00
Michael Foster
1d5339d7c6
Post search: Search other fields too
2013-07-29 20:20:07 -04:00
czaks
e9d23d991c
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
2013-07-29 18:16:24 -04:00
Michael Foster
3fb8310744
See last commit
2013-07-29 16:31:36 -04:00
Michael Foster
ba8e912fcf
Post serach results: link to posts with ?/
2013-07-29 16:26:32 -04:00
czaks
32eca7cfc9
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
2013-07-29 16:26:10 -04:00
Michael Foster
92d65f4100
Update search results template
2013-07-29 16:24:11 -04:00
Michael Foster
cc7615cf06
Search posts
2013-07-29 16:18:06 -04:00
Michael Foster
233c9fabf8
Error in news template
2013-07-29 13:14:21 -04:00
czaks
0b3fecc451
categories theme: i18n some strings
2013-07-28 16:47:32 -04:00
czaks
dc0c354a7c
categories theme: fix title displaying twice, put boardlist there instead
2013-07-28 16:47:24 -04:00
czaks
d2d3896c31
categories theme: i18n some strings
2013-07-27 01:43:09 -04:00
czaks
0f707ec665
categories theme: fix title displaying twice, put boardlist there instead
2013-07-27 01:38:03 -04:00
czaks
940097293c
ukko: fix javascript interoperation
2013-07-27 00:57:12 -04:00
czaks
b4c9f8edff
ukko: fix top boardlist losing its fixed status
2013-07-27 00:13:54 -04:00
czaks
f6840a9b36
fix merge
2013-07-23 10:34:23 -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
5b3445cac6
Bug with last commit
2013-07-23 09:46:29 -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
ad2edf62d7
Option to make stylesheet selections board-specific
2013-07-23 01:35:56 -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
9e0e4c86d9
catalog: fix previous commit
2013-07-22 19:05:38 -04:00
czaks
596421a695
catalog: translation fix
2013-07-22 19:05:30 -04:00
Michael Foster
9a35acdd1e
Add custom links to dashboard
2013-07-22 18:30:45 -04:00
Michael Foster
aa598d28d1
Option to check public ban message by default
2013-07-22 17:51:13 -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
52bf3d3623
Merge branch 'master' of github.com:vichan-devel/Tinyboard
2013-07-20 22:33:56 -04:00
