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

..

mod

Convert to UNIX line endings

2013-07-31 04:28:26 -04:00

themes

added Fluttershy recent theme and theme picker

2013-07-31 04:32:57 -04:00

attention_bar.html

attention bar: cleanup stylesheets

2012-12-24 03:39:47 +01:00

banned.html

$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

boardlist.html

generic boardlist for overboard

2013-06-14 23:57:04 -04:00

generic_page.html

refactored head away from templates

2013-07-31 03:54:18 -04:00

header.html

fix header.html merge

2013-07-31 03:55:55 -04:00

index.html

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

2013-07-31 14:54:20 -04:00

main.js

Convert to UNIX line endings

2013-07-31 04:28:26 -04:00

page.html

refactored head away from templates

2013-07-31 03:54:18 -04:00

post_form.html

recaptcha: fix for https

2013-07-31 03:58:28 -04:00

post_reply.html

Convert to UNIX line endings

2013-07-31 04:28:26 -04:00

post_thread.html

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

2013-07-31 14:54:20 -04:00

posts.sql

Convert to UNIX line endings

2013-07-31 04:28:26 -04:00

report_delete.html

Multiple changes.

2012-03-14 21:48:31 +11:00

search_form.html

post search: one more i18n string

2013-07-20 20:41:54 -04:00

thread.html

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

2013-07-31 14:54:20 -04:00