Commit Graph

420 Commits

Author SHA1 Message Date
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 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
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