1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-30 10:14:37 +01:00
Commit Graph

536 Commits

Author SHA1 Message Date
czaks
a902bf6cba Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 21:36:54 -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
ef9ede073f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-07-31 21:03:13 -04:00
Michael Foster
da5048a0e4 SQL cleanup 2013-07-31 20:51:43 -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
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 49afb685c8, reversing
changes made to 2451a0f29c.

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
czaks
34a5b2c543 post search: one more i18n string 2013-07-20 20:41:54 -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
ba95f9b593 post search: internationalize and use config values 2013-07-20 20:01:22 -04:00
Michael Foster
26805ffd7f Public search form 2013-07-20 18:50:40 -04:00
Czterooki
5feda30e63 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-07-20 18:28:57 -04:00
Czterooki
f6ca7505a2 empty ukko boardlist 2013-07-20 18:02:53 -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
f49e6c9fc3 Search update 2013-07-20 12:05:42 -04:00
Michael Foster
b34ba883c5 Bring back search (searching posts not implemented yet) 2013-07-20 07:50:33 -04:00
Czterooki
acf93cda21 merge with vichan-gold 2013-07-20 00:19:08 -04:00
Czterooki
cf3609514e templates/thread.html 2013-07-20 00:10:39 -04:00
Czterooki
6be4be8cea templates/post_thread.html 2013-07-20 00:09:51 -04:00
Czterooki
baa5dbc957 templates/post_form.html 2013-07-20 00:09:17 -04:00
Michael Foster
f61f3224be Bugfix: Warning when in CLI-mode 2013-07-19 06:20:22 -04:00
czaks
5ae572390c catalog: fix previous commit 2013-07-18 16:16:43 -04:00
czaks
d3f7a25070 catalog: translation fix 2013-07-18 16:13:48 -04:00
czaks
ba4b361ae5 sitemap theme: fix notice when rebuilding using tools/rebuild.php from CLI 2013-07-18 15:31:22 -04:00
czaks
495c6fa846 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	post.php
2013-07-18 15:19:03 -04:00
Michael Foster
34b5f62600 Themes edit: Split "post" into two seperate actions: "post" (replies) and "post-thread". And add a $board variable. 2013-07-18 12:06:26 -04:00
Michael Foster
7c638fddf0 Quick catalog theme bugfix 2013-07-18 11:40:21 -04:00
copypaste
9682c71dcc Catalog theme 2013-07-18 11:34:04 -04:00
copypaste
9d08164b6d Catalog theme 2013-07-18 11:30:00 -04:00
czaks
ff6ac8e069 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-17 22:17:37 -04:00
Michael Foster
7fc2b71804 New theme: XML sitemap generator 2013-07-17 10:17:28 -04:00
czaks
8538ab3db7 recaptcha: fix for https 2013-07-16 13:18:55 -04:00
czaks
6152ed43bd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
	templates/index.html
	templates/thread.html
2013-07-16 13:02:13 -04:00
Michael Foster
390e529717 More ban stuff: Show whether or not user has "seen" a ban yet in the ban list and on IP address pages. Purge useless expired ban records. 2013-07-16 08:50:39 -04:00
Michael Foster
4340e74569 $config['require_ban_view']: Force users to view the "You are banned" page at least once before letting a ban disappear naturally. 2013-07-16 06:33:37 -04:00
Michael Foster
9825d8611f Outputting thread subject in header/title (issue #122) 2013-07-16 02:48:20 -04:00
Michael Foster
9ae5804821 Remove search section from dashboard as it is currently nonexistent in the latest version. 2013-07-16 01:14:42 -04:00
czaks
94b87f2f71 js i18n: misc fixes; quick-reply.js i18n 2013-07-03 01:04:08 -04:00
czaks
1603f246f2 main.js: added preliminary translation functions for javascript 2013-07-02 23:10:00 -04:00
Marcin Łabanowski
8ee3ff9caa post_form: move submit button upper when thread field is disabled 2013-07-02 18:05:40 -04:00
czaks
c65fe97a99 templates/post_thread.html: add data-board field for every thread; mainly for post-hiding and ukko integration 2013-06-24 08:46:59 -04:00
czaks
8a9a8da9fc templates/post_thread.html: changed windows-type endlines to unix-type 2013-06-24 08:44:19 -04:00
czaks
07e419e967 JS Api: added an active_page variable to make it easier to denote the context from javascript 2013-06-24 08:23:09 -04:00
czaks
a139c44a80 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/page.html
2013-06-21 16:41:39 -04:00
Michael
a087ab72db Merge pull request #115 from Macil/miscfixes
Miscellaneous fixes
2013-06-18 10:45:13 -07:00
Michael
9ca0aa37f5 Merge pull request #114 from Macil/rtlfix
Fix display issues with RTL control characters in post names, subjects, ...
2013-06-18 10:41:31 -07:00
Macil Tech
9a6349450c Don't forget secure tripcode that's preceded by a space.
Mod capcodes are not remembered in the posting form.
2013-06-18 11:58:32 -05:00
Macil Tech
0563bbb4a3 Include non-compiled javascript in page.html too. 2013-06-18 11:55:51 -05:00
Macil Tech
8b14cbb091 Fix display issues with RTL control characters in post names, subjects, and filenames. 2013-06-18 11:07:47 -05:00
czaks
588a915c40 header abstraction: abstracted also in thread.html 2013-06-15 00:22:13 -04:00
czaks
b0a555365c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/index.html
2013-06-15 00:08:11 -04:00
czaks
1f35fa8bac overboard: missed templates/index.html 2013-06-15 00:04:08 -04:00
czaks
29d900ea95 generic boardlist for overboard 2013-06-14 23:57:04 -04:00
lanc33
9edcdb077c Fixes #59 by making quick-reply.js agnostic to the value of $config['button_reply']. 2013-05-29 19:16:37 -03:00
czaks
be7df18e4d Moved ukko to a proper location 2013-05-26 18:03:20 -04:00
czaks
f6701dfb74 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-05-26 17:53:00 -04:00
Michael Save
41b3638fbf Mod log in ?/IP (ie. ban history) 2013-03-16 18:27:24 +11:00
Marcin Łabanowski
cf49306488 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-28 13:29:21 +01:00
Michael Save
97b4d14df1 Added more debug links to dashboard 2013-01-27 18:44:53 +11:00
Marcin Łabanowski
5eb5fc2205 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	mod.php
2013-01-26 15:08:48 +01:00
Marcin Łabanowski
a6ea6a818a Revert "[EDIT] restore previous behaviour (editing of html, not bbcode)"
This reverts commit 55d752073d.
2013-01-26 15:03:31 +01:00
Michael Save
f5e019aeaf Escape result in ?/debug/sql 2013-01-26 00:00:39 +11:00
Michael Save
d9b27fd42a New debug page: ?/debug/sql 2013-01-25 23:56:55 +11:00
Michael Save
5766be121c ?/debug/recent 2013-01-25 22:23:26 +11:00
Michael Save
e16ef2fde9 New debug mod page: ?/debug/recent (recent posts across all boards) 2013-01-25 22:18:03 +11:00
Michael Save
80f5c57e9b Show "most recent" in anti-spam debug page 2013-01-24 19:25:07 +11:00
Michael Save
adae930469 Raw HTML editing 2013-01-24 19:16:25 +11:00
Marcin Łabanowski
09f4a08601 [EDIT] restore previous behaviour (editing of html, not bbcode) 2013-01-23 19:06:13 +01:00
Marcin Łabanowski
5cc2a67e63 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into HEAD
Conflicts:
	mod.php
2013-01-23 18:58:38 +01:00
Marcin Łabanowski
d0e3206808 Revert "[EDIT] added dummy form"
This reverts commit 1a2c859996.
2013-01-23 18:54:48 +01:00
Marcin Łabanowski
3c1bf92f9d Revert "[EDIT] basic edit support"
This reverts commit 9fec3646fa.

Conflicts:
	inc/mod/pages.php
2013-01-23 18:54:41 +01:00
Michael Save
b15b38b505 Major fixes and clean-up for edit form 2013-01-24 04:16:09 +11:00
asiekierka
940e6c657b [EDIT] basic edit support 2013-01-24 03:53:23 +11:00
asiekierka
153fb156fe [EDIT] added dummy form 2013-01-24 03:53:06 +11:00
Marcin Łabanowski
6990cab263 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-21 13:17:13 +01:00
Michael Save
4f58617507 Copyright and license update for 2013. 2013-01-20 21:23:46 +11:00
Marcin Łabanowski
f6b7b3901a Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-19 16:23:02 +01:00
Michael Save
7666d93a11 Merge branch 'newkey' of https://github.com/Macil/Tinyboard 2013-01-19 18:47:01 +11:00
Macil Tech
ef7c998b02 Add field_disable_subject and field_disable_reply_subject config options. 2013-01-19 01:37:48 -06:00
Macil Tech
903bf5e9b3 Remove now redundant single-column thread key from posts_* tables. 2013-01-19 01:20:55 -06:00
Macil Tech
e45efbfe87 Handle posts without filenames.
If a post doesn't have a filename (such as because of a post event
changing it), then don't show an empty filename with the post.
2013-01-19 00:39:29 -06:00
Macil Tech
417b765a47 Add (thread, id) multi-column key to optimize rebuilding index pages.
This SQL command can be used to add the key to existing board tables:
create index `thread_id` on posts_%s (`thread`, `id`);
2013-01-19 00:13:01 -06:00
asiekierka
aac31c9c19 [EDIT] basic edit support 2013-01-08 07:52:13 +01:00
asiekierka
09d787b2ec [EDIT] added dummy form 2013-01-08 04:35:22 +01:00
asiekierka
6e56588d3e added Fluttershy recent theme and theme picker 2013-01-06 13:40:33 +01:00
asiekierka
380e5251e3 refactored head away from templates 2013-01-06 09:41:00 +01:00
Marcin Łabanowski
a134ec11d1 Added recent_dark stylesheet for recent template, need to be changed currently in style.php though 2013-01-02 05:49:04 +01:00
Marcin Łabanowski
82f506622c image identification: add imgops.com button 2012-12-28 19:08:25 +01:00
asiekierka
1962476e22 add config root to JS side 2012-12-24 18:21:21 +01:00
Marcin Łabanowski
0d4d8ab210 attention bar: move before post form 2012-12-24 03:52:32 +01:00
Marcin Łabanowski
f5c1dedb65 attention bar: fixed after translation 2012-12-24 03:43:48 +01:00
Marcin Łabanowski
c3cae8849f attention bar: cleanup stylesheets 2012-12-24 03:39:47 +01:00
asiekierka
2adeef7770 fixed to english 2012-12-23 19:01:59 +01:00
asiekierka
9c826550e8 pasek atencji ukonczony 2012-12-23 18:37:44 +01:00
asiekierka
1199bc7154 pasek atencji dodany do templates 2012-12-23 18:10:18 +01:00
Marcin Łabanowski
5a538ac319 Implement image identification buttons using regex.info/exif, google images and tineye 2012-12-23 04:38:20 +01:00
asiekierka
3ed7a9c491 fixed template 2012-12-22 17:50:12 +01:00
asiekierka
85fefb5a17 added imgcaptcha files 2012-12-22 17:38:49 +01:00
asiekierka
545c4ce35a removed junk 2012-12-22 17:26:00 +01:00
asiekierka
c385d47c2c Added tinyboard integration stuff 2012-12-22 17:25:52 +01:00
Thermionix
86ec0b5c86 added favicon to recent.html template 2012-10-04 11:55:30 +10:00
Michael Save
8e3ef4ebfe bugfix: security token forgotten for ban form in view_ip.html 2012-08-28 02:24:29 +10:00
Michael Save
493e34165f minor design change 2012-08-28 01:47:26 +10:00