1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-27 17:00:52 +01:00
Commit Graph

594 Commits

Author SHA1 Message Date
ctrlcctrlv
18a103a68d Make it so oekaki can be disabled 2013-08-17 17:36:38 +00:00
czaks
b7948c8e3d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/display.php
2013-08-16 16:06:54 -04:00
Michael Foster
b2580d4a18 Bugfix: post.filex => post.fileheight, etc. 2013-08-17 04:07:32 +10:00
czaks
de148485a6 ukko: fix for new new Post and new Thread syntax 2013-08-16 10:13:06 -04:00
czaks
e440851526 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
2013-08-16 10:07:24 -04:00
Michael Foster
5353e38328 Bugfix: Thumbnail sizes (thumbx => thumbwidth, etc.) 2013-08-16 23:25:32 +10:00
Michael Foster
cca020be80 Optional "flag style" and "flag alt" modifiers 2013-08-16 23:12:40 +10:00
Michael Foster
2cc9eb468a Change flag_country to just flag 2013-08-16 22:12:25 +10:00
Michael Foster
44e16593b6 Much better post modifiers: raw HTML, ban messages, etc. 2013-08-16 21:25:56 +10:00
Michael Foster
5fdc0878c9 A few modifications:
1. Finally, clean up some of the crappy code in inc/display.php; no more extreme clutter. new Thread() and new Post() take an array as the first parameter now.

2. Poster country flags. Currently requires the "geoip" extension.

3. Give post images a classname. This was also long-overdue.
2013-08-16 21:08:01 +10:00
czaks
13e0e451da Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
2013-08-13 14:46:16 -04:00
Michael Foster
44590b5756 Optional: Allow uploading by URL 2013-08-12 22:51:46 +10:00
czaks
95c95cb85b noko50: small fixes in template 2013-08-11 17:52:35 -04:00
czaks
0c52d1b93c Merge branch 'noko50-new-dev11' of http://github.com/fallenPineapple/Tinyboard
Conflicts:
	inc/functions.php
2013-08-11 17:49:29 -04:00
czaks
24b1adc501 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html
2013-08-11 09:50:33 -04:00
Michael Foster
9695c327db Rename ban_page_message to ban_page_extra 2013-08-11 21:30:02 +10:00
ctrlcctrlv
2278762000 Option to have a message on the ban page 2013-08-11 21:29:42 +10:00
ctrlcctrlv
edd197586f Option to have a message on the ban page
Conflicts:
	inc/config.php
2013-08-11 21:29:02 +10:00
ctrlcctrlv
48ac445038 Allow for HTML in the board subtitle
Conflicts:
	inc/config.php
2013-08-11 21:08:19 +10:00
fallenPineapple
42f6b8e0bb Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
czaks
a8738268b3 fix submit button not showing when topic disabled (after merge) 2013-08-09 17:36:07 -04:00
ctrlcctrlv
de4c965b4d Option to have a message on the ban page 2013-08-09 19:55:25 +00:00
ctrlcctrlv
68bd3150f1 Option to have a message on the ban page 2013-08-09 19:52:19 +00:00
ctrlcctrlv
013ca134be Oekaki 2013-08-08 22:15:59 +00:00
ctrlcctrlv
3204b57b5b Advertisements 2013-08-08 21:57:52 +00:00
ctrlcctrlv
52b7254d4b Optionally use email selectbox 2013-08-08 19:30:05 +00:00
ctrlcctrlv
074217ec3c Allow for HTML in the board subtitle 2013-08-08 18:58:44 +00:00
czaks
35c9bdb5f5 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-05 06:23:20 -04:00
czaks
585f75fcaf Revert "Merge branch 'master' of github.com:vichan-devel/Tinyboard"
This reverts commit a84c4510fc, reversing
changes made to a8327c3a37.
2013-08-05 06:17:01 -04:00
czaks
c3def0e453 Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	js/post-hider.js
2013-08-05 06:03:40 -04:00
Michael Foster
cad9d9ea6a remove maximum-scale in <meta name="viewport"> 2013-08-05 05:05:38 -04:00
czaks
3686878eb4 ukko: further fixes; should now provide a smooth overboard experience 2013-08-04 01:36:56 -04:00
czaks
5544657a96 ukko: finally fixed that post (du|multi)plication problem 2013-08-04 00:15:56 -04:00
czaks
53cb3d5a72 ukko: another fix 2013-08-03 22:17:25 -04:00
czaks
a508be77a5 ukko: fix thread duplication 2013-08-03 21:59:05 -04:00
czaks
8f7367d925 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/functions.php
	templates/generic_page.html
	templates/index.html
2013-08-03 19:05:25 -04:00
Michael Foster
ad5570ada2 Update $config['try_smarter']. Should be working now. 2013-08-03 17:42:34 -04:00
Michael Foster
a3a490c7f2 Web config editor: board configs 2013-08-03 06:26:17 -04:00
Michael Foster
3ed82677e4 Web editor: Don't add newlines in comments 2013-08-03 05:44:39 -04:00
Michael Foster
0afd69d975 Web config editor: Write "MOD", "JANITOR", etc. to instance-config instead of just int representations 2013-08-03 05:41:01 -04:00
Michael Foster
3a0ed6fad3 Better error handling/displaying with $config['debug'] and $config['verbose_errors'] 2013-08-03 00:22:28 -04:00
Michael Foster
6936d8dd2f Forgot to commit this 2013-08-02 22:06:32 -04:00
Michael Foster
d59e74f394 Major config.php cleanup and a few minor misc fixes. 2013-08-02 20:52:58 -04:00
Michael Foster
e445c88d1d Installer improvements 2013-08-02 16:19:20 -04:00
czaks
926f18aab9 ukko: bugfixes 2013-08-02 04:36:08 -04:00
czaks
d86eb2669c ukko: implement ukko hide 2013-08-02 04:20:57 -04:00
czaks
cff33c3b64 ukko: javascript major refactor 2013-08-02 03:16:34 -04:00
czaks
2c32231f41 Revert "Disable autocomplete": this breaks access to post text after an error, at least in Firefox
This reverts commit 90b82b1a06.
2013-08-02 00:09:23 -04:00
czaks
6ed8e8752e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-02 00:09:07 -04:00
Michael Foster
01494dccce Installer: Nicer pre-installation test 2013-08-02 00:08:37 -04:00
czaks
d1a5e9d2cf Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/stripes.css
	stylesheets/testorange.css
	stylesheets/wasabi.css
2013-08-01 23:43:20 -04:00
czaks
25ede1e194 Revert "Disable autocomplete": this breaks access to post text after an error, at least in Firefox
This reverts commit 90b82b1a06.
2013-08-01 23:31:35 -04:00
Michael Foster
695d50be8c Simple file editor replacement for ?/config (optional). Issue #127 2013-08-01 17:18:10 -04:00
Michael Foster
538e88b7bd Web config editor: Use a <select> for JANITOR/MOD/ADMIN permissions 2013-08-01 15:20:25 -04:00
czaks
6eb3971b6a Add optional database table prefix (issue #118; see issue comments for details) 2013-08-01 01:16:20 -04:00
czaks
926b2c31ed Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
Michael Foster
801bd56689 Better/fixed jQuery styling and slightly improved js/inline-expanding.js accuracy (when jQuery is enabled) 2013-08-01 00:27:54 -04:00
Michael Foster
d379224e3f Add optional database table prefix (issue #118; see issue comments for details) 2013-07-31 22:14:26 -04:00
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