kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity
2,882 Commits 3 Branches 26 Tags 120 MiB
c68865c845
Commit Graph

591 Commits

Author SHA1 Message Date
czaks
b0312d4d36 ukko: fix for new new Post and new Thread syntax 2013-08-16 10:13:06 -04:00
czaks
146243c473 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
0565e2119d Bugfix: Thumbnail sizes (thumbx => thumbwidth, etc.) 2013-08-16 23:25:32 +10:00
Michael Foster
0ad1c03997 Optional "flag style" and "flag alt" modifiers 2013-08-16 23:12:40 +10:00
Michael Foster
a9fe4ea2db Change flag_country to just flag 2013-08-16 22:12:25 +10:00
Michael Foster
4876a27232 Much better post modifiers: raw HTML, ban messages, etc. 2013-08-16 21:25:56 +10:00
Michael Foster
b666886416 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
4f855cf3b3 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
0de0bc6ceb Optional: Allow uploading by URL 2013-08-12 22:51:46 +10:00
czaks
d3b0a55dd9 noko50: small fixes in template 2013-08-11 17:52:35 -04:00
czaks
8534e2cc80 Merge branch 'noko50-new-dev11' of http://github.com/fallenPineapple/Tinyboard 
Conflicts:
	inc/functions.php
 2013-08-11 17:49:29 -04:00
czaks
fa9bf536c3 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
aecfc37510 Rename ban_page_message to ban_page_extra 2013-08-11 21:30:02 +10:00
ctrlcctrlv
9ee598ee81 Option to have a message on the ban page 2013-08-11 21:29:42 +10:00
ctrlcctrlv
39f542704b Option to have a message on the ban page 
Conflicts:
	inc/config.php
 2013-08-11 21:29:02 +10:00
ctrlcctrlv
acb4c47a9f Allow for HTML in the board subtitle 
Conflicts:
	inc/config.php
 2013-08-11 21:08:19 +10:00
fallenPineapple
12ee85beaf Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
czaks
ef4cf16a73 fix submit button not showing when topic disabled (after merge) 2013-08-09 17:36:07 -04:00
ctrlcctrlv
efcec13439 Option to have a message on the ban page 2013-08-09 19:55:25 +00:00
ctrlcctrlv
ecb15c7dcb Option to have a message on the ban page 2013-08-09 19:52:19 +00:00
ctrlcctrlv
78ea9af97c Oekaki 2013-08-08 22:15:59 +00:00
ctrlcctrlv
d4a1ae3595 Advertisements 2013-08-08 21:57:52 +00:00
ctrlcctrlv
7205801ced Optionally use email selectbox 2013-08-08 19:30:05 +00:00
ctrlcctrlv
b8921508fe Allow for HTML in the board subtitle 2013-08-08 18:58:44 +00:00
czaks
16ae5177f7 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-05 06:23:20 -04:00
czaks
2cc0769f54 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
a84c4510fc Merge branch 'master' of github.com:vichan-devel/Tinyboard 
Conflicts:
	js/post-hider.js
 2013-08-05 06:03:40 -04:00
Michael Foster
1248e329d2 remove maximum-scale in <meta name="viewport"> 2013-08-05 05:05:38 -04:00
czaks
e2b5ec9354 ukko: further fixes; should now provide a smooth overboard experience 2013-08-04 01:36:56 -04:00
czaks
f2427ca392 ukko: finally fixed that post (du|multi)plication problem 2013-08-04 00:15:56 -04:00
czaks
ddcad35f6c ukko: another fix 2013-08-03 22:17:25 -04:00
czaks
c2ba0bc7bf ukko: fix thread duplication 2013-08-03 21:59:05 -04:00
czaks
a0855cdcf5 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
a3fbff2259 Update $config['try_smarter']. Should be working now. 2013-08-03 17:42:34 -04:00
Michael Foster
424de7561d Web config editor: board configs 2013-08-03 06:26:17 -04:00
Michael Foster
eb3fc990f5 Web editor: Don't add newlines in comments 2013-08-03 05:44:39 -04:00
Michael Foster
0d1bfa47f1 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
1d37e81ade Better error handling/displaying with $config['debug'] and $config['verbose_errors'] 2013-08-03 00:22:28 -04:00
Michael Foster
6ecda16be3 Forgot to commit this 2013-08-02 22:06:32 -04:00
Michael Foster
4fce9b63ae Major config.php cleanup and a few minor misc fixes. 2013-08-02 20:52:58 -04:00
Michael Foster
9e7fbf927c Installer improvements 2013-08-02 16:19:20 -04:00
czaks
3922677968 ukko: bugfixes 2013-08-02 04:36:08 -04:00
czaks
73b5cf5a08 ukko: implement ukko hide 2013-08-02 04:20:57 -04:00
czaks
6f6a20af8e ukko: javascript major refactor 2013-08-02 03:16:34 -04:00
czaks
5710575d1d 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
a15e0ffa98 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-02 00:09:07 -04:00
Michael Foster
f06978659b Installer: Nicer pre-installation test 2013-08-02 00:08:37 -04:00
czaks
1ed45ebe9e 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
dc84ccc6a8 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
5a44c50811 Simple file editor replacement for ?/config (optional). Issue #127 2013-08-01 17:18:10 -04:00
Michael Foster
6b6f32949d Web config editor: Use a <select> for JANITOR/MOD/ADMIN permissions 2013-08-01 15:20:25 -04:00
czaks
9343651d90 Add optional database table prefix (issue #118; see issue comments for details) 2013-08-01 01:16:20 -04:00
czaks
168a4d73cc Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
Michael Foster
5bf0e7f7e7 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
a052a791b5 Add optional database table prefix (issue #118; see issue comments for details) 2013-07-31 22:14:26 -04:00
czaks
cefd5517ac Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 21:36:54 -04:00
Michael Foster
ea2b8cce07 Bugfix: HTML injection in post editing (introduces and fixes yet another bug) 2013-07-31 21:24:17 -04:00
czaks
83844b5e3e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/functions.php
 2013-07-31 21:03:13 -04:00
Michael Foster
328484bee7 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
b35ea55763 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	templates/thread.html
 2013-07-31 19:25:04 -04:00
czaks
6317a70152 header abstraction: abstracted also in thread.html 
Conflicts:
	templates/page.html
	templates/thread.html
 2013-07-31 17:14:10 -04:00
czaks
c0abd1d851 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:02:30 -04:00
Michael Foster
6cdf603875 Fix last commit; Make Tinyboard Twig extension more mb-safe 2013-07-31 16:38:09 -04:00
Michael Foster
d692bce686 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
55c7146d88 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
317f616e82 Accidentally included header.html twice 2013-07-31 05:06:29 -04:00
asiekierka
b01417be44 added Fluttershy recent theme and theme picker 2013-07-31 04:32:57 -04:00
Marcin Łabanowski
15d2c3e28a 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
123a72d7de Convert to UNIX line endings 2013-07-31 04:28:26 -04:00
czaks
61a305a1a2 js i18n: misc fixes; quick-reply.js i18n 
Conflicts:
	tools/i18n_compile.php
 2013-07-31 04:13:29 -04:00
czaks
701cf42eef main.js: added preliminary translation functions for javascript 2013-07-31 04:11:01 -04:00
Marcin Łabanowski
daca11113e image identification: add imgops.com button 2013-07-31 04:00:29 -04:00
Marcin Łabanowski
7c8bbe8527 Implement image identification buttons using regex.info/exif, google images and tineye 2013-07-31 04:00:22 -04:00
czaks
b7d884ef45 recaptcha: fix for https 2013-07-31 03:58:28 -04:00
Michael Foster
1ffabe2b93 fix header.html merge 2013-07-31 03:55:55 -04:00
asiekierka
a9f3f44c5f 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
ee23ec1e24 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 03:18:11 -04:00
Michael Foster
90b82b1a06 Disable autocomplete 2013-07-31 02:38:40 -04:00
czaks
96bcf5dd1e 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
bb2868896c Ability to hide IP addresses from mod log 2013-07-31 00:04:57 -04:00
Michael Foster
889945f50c 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
8efab06616 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
793042ee6c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	js/inline-expanding.js
 2013-07-29 23:17:37 -04:00
Michael Foster
1759ac2ea3 Post search: Search other fields too 2013-07-29 20:20:07 -04:00
czaks
9a27feca01 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-29 18:16:24 -04:00
Michael Foster
d44b4f19a8 See last commit 2013-07-29 16:31:36 -04:00
Michael Foster
e0bc0a622d Post serach results: link to posts with ?/ 2013-07-29 16:26:32 -04:00
czaks
4257191acd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-29 16:26:10 -04:00
Michael Foster
c8e93f04d2 Update search results template 2013-07-29 16:24:11 -04:00
Michael Foster
58306bdc63 Search posts 2013-07-29 16:18:06 -04:00
Michael Foster
c0e0a5db7d Error in news template 2013-07-29 13:14:21 -04:00
czaks
cea7881749 categories theme: i18n some strings 2013-07-28 16:47:32 -04:00
czaks
98187303d7 categories theme: fix title displaying twice, put boardlist there instead 2013-07-28 16:47:24 -04:00
czaks
b31487b53d categories theme: i18n some strings 2013-07-27 01:43:09 -04:00
czaks
e2b1034f09 categories theme: fix title displaying twice, put boardlist there instead 2013-07-27 01:38:03 -04:00
czaks
e3cb427fee ukko: fix javascript interoperation 2013-07-27 00:57:12 -04:00
czaks
35f8730f40 ukko: fix top boardlist losing its fixed status 2013-07-27 00:13:54 -04:00
czaks
4e609da2b7 fix merge 2013-07-23 10:34:23 -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
Michael Foster
46edec0f2d 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
ab0c5ee481 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
f0aee74523 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
Michael Foster
6ba8f3f7de 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
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 49afb685c8, reversing
changes made to 2451a0f29c.

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
3596e429bf 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
629d616de5 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
Czterooki
bc1bc9f6ef 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
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
Michael Foster
b776e0a7f0 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
Czterooki
aef4425592 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
f8ca3aa418 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
Michael Foster
19766c4e0e Bugfix: Warning when in CLI-mode 2013-07-19 06:20:22 -04:00
czaks
5547591b87 catalog: fix previous commit 2013-07-18 16:16:43 -04:00
czaks
a5a1f00223 catalog: translation fix 2013-07-18 16:13:48 -04:00
czaks
aa9844ae2a sitemap theme: fix notice when rebuilding using tools/rebuild.php from CLI 2013-07-18 15:31:22 -04:00
czaks
fa66b96240 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	post.php
 2013-07-18 15:19:03 -04:00
Michael Foster
e4bd9a6886 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
de4b5b3962 Quick catalog theme bugfix 2013-07-18 11:40:21 -04:00
copypaste
461d98b945 Catalog theme 2013-07-18 11:34:04 -04:00
copypaste
f5d378fab5 Catalog theme 2013-07-18 11:30:00 -04:00
czaks
8c72c8a432 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-17 22:17:37 -04:00
Michael Foster
7e95e80c25 New theme: XML sitemap generator 2013-07-17 10:17:28 -04:00
czaks
786ac5c55c recaptcha: fix for https 2013-07-16 13:18:55 -04:00
czaks
7bdb96a16b 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
aadb57f2a2 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
c8f30550af $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
29b10c88db Outputting thread subject in header/title (issue #122) 2013-07-16 02:48:20 -04:00
Michael Foster
34dc31c50e Remove search section from dashboard as it is currently nonexistent in the latest version. 2013-07-16 01:14:42 -04:00
czaks
da9f367f2f js i18n: misc fixes; quick-reply.js i18n 2013-07-03 01:04:08 -04:00
czaks
74f4c7da18 main.js: added preliminary translation functions for javascript 2013-07-02 23:10:00 -04:00
Marcin Łabanowski
6961f5b8b5 post_form: move submit button upper when thread field is disabled 2013-07-02 18:05:40 -04:00
czaks
802fd16d46 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
da57f51c87 templates/post_thread.html: changed windows-type endlines to unix-type 2013-06-24 08:44:19 -04:00
czaks
3bcf88e842 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
24a520485d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	templates/page.html
 2013-06-21 16:41:39 -04:00
Michael
0ac9dd5f25 Merge pull request #115 from Macil/miscfixes 
Miscellaneous fixes
 2013-06-18 10:45:13 -07:00
Michael
cbc3bd0c0a 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
a5e5cd03e6 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
4ad1ce13b1 Include non-compiled javascript in page.html too. 2013-06-18 11:55:51 -05:00