kashire/lainchan
4
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
3,745 Commits 3 Branches 26 Tags 120 MiB
ccc9cff23d
Commit Graph

752 Commits

Author SHA1 Message Date
czaks
a93530e32f update copyright footers in themes 2014-04-20 02:27:54 +02:00
kaf
f83c87b623 Added: /pol/-like flags based on a953229de7 
Conflicts:
	inc/config.php
	templates/post_form.html
 2014-04-19 18:48:17 +02:00
czaks
bfc4df8276 Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration 2014-04-19 00:24:52 +02:00
czaks
e5c48282c4 apply new branding for vichan-devel 2014-04-17 17:11:32 +02:00
czaks
59874b8376 modularize post templates a little more 2014-04-16 15:01:37 +02:00
czaks
48bc9d9e29 add some files missing from the previous commit 2014-04-16 11:58:41 +02:00
czaks
e81ce17fb4 modularize post templates a little bit; try to unify duplicate code 2014-04-16 11:54:41 +02:00
czaks
e08bc5d54d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2014-04-12 20:52:42 +02:00
Michael Reiley
677e428a4d Update copyright years. 2014-04-12 11:12:42 -07:00
czaks
15c0802c06 Disable the sucky chrome autofill 
It used to force login into "embed" field and password into post password.

Disabling autocomplete (at form) didn't work. Recreating the fields either.
Trying to induce default values didn't as well. x-autocompletetype didn't.

What worked – creating two dummy fields:
  <input type='text'>
  <input type='password'>
...just before the real post password.
 2014-04-10 11:44:38 +02:00
czaks
e034b9179d fix paths in templates 2014-04-06 21:48:31 +02:00
czaks
f0b2240b5f Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration 2014-03-25 13:03:37 +01:00
czaks
15810c9bed fix permission name 2014-03-25 12:15:40 +01:00
czaks
b1490bed31 favelaframes is nothing more than frameset AFAIC 2014-03-25 12:09:59 +01:00
czaks
1e92e678a6 add a javascript 2014-03-25 12:09:12 +01:00
czaks
fe95b33022 recent posts link 2014-03-25 12:05:07 +01:00
sinuca
1e78987ef6 Added ukko and favelaframes themes 2014-03-25 11:47:46 +01:00
sinuca
fb2b66e2dd Recent posts functionality 
Conflicts:
	inc/config.php
	inc/mod/pages.php
	mod.php
 2014-03-25 11:35:04 +01:00
sinuca
fc1f1ef315 "Favelog" theme added. Just a catalog with ordering functionality 2014-03-25 11:03:09 +01:00
czaks
75cca1ffb2 fix previous commit 2014-02-24 15:29:26 +01:00
czaks
14c499f9d1 Condense flags into one file. Heads-up for people having custom flags, disable $config['country_flags_condensed'] !!! 2014-02-24 00:06:01 +01:00
czaks
63b9c4db5f local-time.js now supports custom time formats. idea by copypaste 2014-02-23 17:58:16 +01:00
czaks
5a66fdddc2 installer: update to font-awesome 3.0 or 4.0 it was 2014-02-20 10:37:15 +01:00
czaks
5c9c095e84 okay, that dready css rule refered to this... 2014-02-01 21:53:46 +01:00
czaks
1a9e4eaef6 full, working wPaint oekaki implementation; fixes vichan-devel#20 2014-01-31 09:39:39 +01:00
czaks
ff9b684f7e remove old oekaki; see vichan-devel#20 2014-01-29 22:59:29 +01:00
czaks
4636f5b6ef fix watch.js on nonstandard paths; fixes vichan-devel#38 
this commit also adds a modRoot js variable that makes proper
modlinks. also fixed in watch.js
 2014-01-29 22:53:31 +01:00
itsCrafted
a9579e6fa5 Update to Font Awesome 4.0.3 
This will require you to change any icons that use the "icon-iconname"
format. Please consult the FontAwesome docs for more info.
 2014-01-19 14:55:31 -05:00
czaks
c0190bbd64 update google analytics code 2014-01-19 14:54:44 -05:00
czaks
0986f77113 sitemap theme: fix php notice 2014-01-19 14:53:07 -05:00
czaks
1a88ea3271 fix previous commit 2014-01-19 14:45:20 -05:00
czaks
f0a13ea874 unify code with post_thread (see previous commit) 2014-01-19 14:45:14 -05:00
czaks
7ae9b05b28 fix clicking on post ids with dynamically loaded javascript 2014-01-19 14:45:07 -05:00
czaks
3718081470 add missing thumbnails for themes: catalog and sitemap 2014-01-19 14:44:52 -05:00
czaks
198e68d399 remove rrdtool theme; STI told me that it never really worked 2014-01-19 14:44:47 -05:00
czaks
a294fb6952 categories theme: include boardlist for real 2014-01-19 14:44:37 -05:00
itsCrafted
c31cd98b93 Update to Font Awesome 4.0.3 
This will require you to change any icons that use the "icon-iconname"
format. Please consult the FontAwesome docs for more info.
 2014-01-14 21:29:40 +00:00
czaks
cdb988c6d4 rename banner class to board_image in order to evade some adblock rules 2014-01-06 16:38:48 +01:00
czaks
56742a5f9a i prefer for the top ads to be over the boardlist 2014-01-06 03:28:37 +01:00
czaks
1b706ddc92 update google analytics code 2014-01-05 06:14:20 +01:00
czaks
4202e8123d sitemap theme: fix php notice 2014-01-04 18:18:35 +01:00
czaks
b36cb115ae solution of (our) quick-reply and antispam conflict 2014-01-04 01:42:16 +01:00
czaks
08e4fd9a0a declare active_page for page.html template 2013-12-25 18:31:35 +01:00
czaks
c918953d33 catalog theme: integrate with the styling framework of tinyboard; allow for js 2013-12-25 17:46:13 +01:00
czaks
9d8718d01a fix previous commit 2013-12-25 14:24:17 +01:00
czaks
dfd32615f3 unify code with post_thread (see previous commit) 2013-12-25 14:23:16 +01:00
czaks
c23c792a21 fix clicking on post ids with dynamically loaded javascript 2013-12-25 14:16:28 +01:00
czaks
0d34594904 add missing thumbnails for themes: catalog and sitemap 2013-12-24 17:06:08 +01:00
czaks
ef927882e0 remove rrdtool theme; STI told me that it never really worked 2013-12-24 16:41:11 +01:00
czaks
09b7b6a116 categories theme: include boardlist for real 2013-12-24 16:35:27 +01:00
czaks
fbb3fe2df8 ukko: hiding boards was not permanent 2013-12-24 16:29:14 +01:00
czaks
37fe209290 fix sql error in ukko when using db prefix. thank you based bush 2013-12-22 20:18:10 +01:00
czaks
f5657caf24 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5 
Conflicts:
	inc/config.php
	install.php
	post.php
	stylesheets/style.css
 2013-11-11 21:54:35 +01:00
Michael Foster
c8062fbf76 CSRF more mod pages 2013-09-23 16:48:56 +10:00
Michael Foster
04cfeaf01c hide expired cache shit 2013-09-23 10:38:06 +10:00
Michael Foster
6eefc5ea2a . 2013-09-23 10:26:13 +10:00
Michael Foster
4ce6218ba0 Some APC libraries/versions do stuff differently. 2013-09-23 10:24:29 +10:00
Michael Foster
fcbc211314 Fixed weird bug with ?/debug/sql trying to allocate a few GB on some instances. Assuming bug with APCu. 2013-09-23 10:21:18 +10:00
Michael Foster
39be89ba49 ?/debug/apc 2013-09-23 10:11:16 +10:00
Michael Foster
902da76433 don't show ban appeal for short bans 2013-09-21 12:58:12 +10:00
Michael Foster
a9b7f9b1bc begin implementation of in-built ban appealing 2013-09-21 12:51:23 +10:00
czaks
99a2e1cf3d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5 
Conflicts:
	js/quick-reply.js
 2013-09-18 09:00:22 -04:00
Michael Foster
d13f30b39f js/settings.js: Simple config stuff for javascript extensions 2013-09-18 14:40:39 +10:00
czaks
8ca495e5b8 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5 
Conflicts:
	inc/config.php
 2013-09-17 19:12:19 -04:00
Michael Foster
57e4292e9d Improvements to showing post in ban 2013-09-18 08:56:04 +10:00
Michael Foster
3471f7c668 Optionally show post user was banned for 2013-09-18 08:47:34 +10:00
czaks
6cb7eb939e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5 
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	install.php
	js/quick-reply.js
	post.php
	templates/index.html
 2013-09-17 10:43:44 -04:00
Michael Foster
803f0c8ce1 Fix search for new bans table 2013-09-17 09:35:13 +10:00
Michael Foster
3e57bb04d7 Begin upgrade to much better bans table. DO NOT PULL YET; It won't work. 2013-09-17 09:15:24 +10:00
Michael Foster
5d108319eb fix some weirdness 2013-09-16 03:51:36 +10:00
Michael Foster
41a3f9be25 bugfix and work with other stylesheets 2013-09-15 10:29:35 +10:00
Michael Foster
c8f2f00320 fix bug with quick-reply and make it nicer 2013-09-15 07:31:05 +10:00
Michael Foster
9a8cebe4a1 add real quick reply (wtf was the other thing?) 2013-09-15 07:17:02 +10:00
Michael Foster
961e3d3fe0 dock top nav bar in top right corner for now, because it looks shit everywhere else 2013-09-15 05:46:27 +10:00
Michael Foster
92550d5084 Better position of top nav bar? Shit css 2013-09-15 00:53:45 +10:00
Michael Foster
c4a6116722 Optionally show page navigation bar at the top too. 2013-09-15 00:42:20 +10:00
Michael Foster
5da8f28726 Improvements to ?/debug/antispam and ?/debug/recentc 2013-09-09 20:16:13 +10:00
Michael Foster
2fae55c094 debug/sql: show "NULL" for null columns 2013-09-09 19:59:25 +10:00
Michael Foster
a9b93d2760 "Are you sure you want to demote yourself?" 2013-09-09 19:17:18 +10:00
Michael Foster
eea4e42609 Add ability to create custom user/permissions groups 2013-09-09 01:33:51 +10:00
czaks
069f1def9b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	install.php
 2013-09-01 11:25:19 -04:00
Michael Foster
22fcca343f New index in post tables for listing threads slightly faster (index pages) 2013-09-01 22:15:03 +10:00
Michael Foster
cf3173d226 Fix issue #136 2013-09-01 09:57:09 +10:00
Michael Foster
b51fc38783 Some SQL and indexes improvements 2013-09-01 02:04:42 +10:00
ctrlcctrlv
2804c6b775 Merge remote-tracking branch 'upstream/master' (vichan-devel) 2013-08-29 13:43:50 +00:00
ctrlcctrlv
ee52dcb583 Fix number of replies sometimes displaying next to image 2013-08-29 13:41:36 +00:00
czaks
8de81d176c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
 2013-08-29 07:33:19 -04:00
Michael Foster
0bb254fdb3 Critical bugfix: SQL typo 2013-08-29 12:30:16 +10:00
czaks
8503e65858 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/config.php
	inc/functions.php
	install.php
	stylesheets/dark_roach.css
 2013-08-28 12:41:36 -04:00
Michael Foster
f8f375ec30 Sitemap theme: Minimum time between generating, and only generate on post-thread and post-delete 2013-08-28 18:30:01 +10:00
Michael Foster
5aaa6887f6 Add ip index to post tables for faster ?/IP/ (and flood detection, etc.) 2013-08-28 18:02:28 +10:00
Dan Saunders
bb06593ef5 Added post-delete handling on themes that should use it. 2013-08-26 13:36:14 +10:00
czaks
de035f4a7e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	stylesheets/dark_roach.css
	stylesheets/style.css
 2013-08-20 18:22:37 -04:00
Michael Foster
db8173fe62 Remember post password if entered manually 2013-08-20 23:34:41 +10:00
Michael Foster
abfdd38e59 Unicode bi-directional text: Finally a working fix 2013-08-19 23:47:56 +10:00
ctrlcctrlv
db5ce2cb8f Merge remote-tracking branch 'upstream/master' 2013-08-19 13:21:25 +00:00
ctrlcctrlv
fd398f82ed Fix reply moving 2013-08-19 13:20:10 +00:00
Michael Foster
5438d7cf64 add alt="" to flags to make it standards-compliant 2013-08-19 20:31:15 +10:00
czaks
5389b0f358 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-18 19:26:31 -04:00
Michael Foster
d2fdeead64 bidi_cleanup: Just replace with HTML5's <bdi> (for now, at least). The old code was hardly working, and had issued with older PHP versions. 2013-08-19 05:19:54 +10:00
czaks
da1b7d087e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	install.php
 2013-08-18 13:16:31 -04:00
ctrlcctrlv
f8837ad60c Add option to update catalog on new posts as well as new threads 2013-08-19 03:08:02 +10:00
Michael Foster
5051e0572a Missing theme conf type "checkbox" 2013-08-19 02:03:54 +10:00
Michael Foster
844a337e03 Make file and thumb 255 chars 2013-08-18 20:59:46 +10:00
Michael Foster
dcf97d6b5b Add optional modifier: <tinyboard is_file> to tell Tinyboard that even though an image might have a thumbnail, it could still be a non-image upload 2013-08-18 18:17:12 +10:00
czaks
ed16e40e20 upload: add ids for a script for selection 2013-08-17 16:37:15 -04:00
ctrlcctrlv
6cb863005d Edit images in thread/board using Oekaki 2013-08-17 18:56:16 +00:00
ctrlcctrlv
e3600131fc Configurable canvas size 2013-08-17 18:00:26 +00:00
ctrlcctrlv
7c5222ffb5 Make it so oekaki can be disabled 2013-08-17 17:36:38 +00:00
czaks
ca565d07c2 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/display.php
 2013-08-16 16:06:54 -04:00
Michael Foster
8858127498 Bugfix: post.filex => post.fileheight, etc. 2013-08-17 04:07:32 +10:00
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