Commit Graph

3325 Commits

Author SHA1 Message Date
czaks
72c7e28a0e Merge branch 'master' into staging 2014-05-05 17:29:59 +02:00
czaks
e3ac13289d Merge branch 'staging' of github.com:vichan-devel/Tinyboard into staging 2014-05-05 17:29:52 +02:00
czaks
855618b2a0 Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	templates/themes/catalog/catalog.html
	templates/themes/catalog/theme.php
2014-05-05 17:29:34 +02:00
czaks
ab52741a5f catalog.js: should be used only in catalog view 2014-05-05 17:23:49 +02:00
Fredrick Brennan
5039584a5e Fix ?/recent str_replace issue 2014-05-04 19:24:34 -04:00
Fredrick Brennan
664daf8571 Merge branch 'staging' of https://github.com/vichan-devel/vichan into staging 2014-05-04 19:11:43 -04:00
Fredrick Brennan
ac31698b0d Fix hide-images.js for multiimage 2014-05-04 19:11:23 -04:00
czaks
81b0612d56 fug, i replaced finnish locale with pt_BR? 2014-05-04 02:13:37 +02:00
czaks
73eb8c6b58 quick & dirty youtube thumbnails in catalog support 2014-05-04 01:20:12 +02:00
czaks
bac23d22f8 forgot to compile lv_LV locale ;_; 2014-05-04 00:24:12 +02:00
czaks
dafe0d5896 Merge branch 'master' of github.com:vichan-devel/Tinyboard into staging 2014-05-04 00:19:45 +02:00
diggydoc
90666e3674 preliminary lv_LV l10n 2014-05-04 00:17:05 +02:00
neniu
24c31b402a finalize esperanto l10n 2014-05-04 00:13:28 +02:00
czaks
45fdd71b63 fix it more 2014-05-04 00:05:55 +02:00
czaks
8d4104feb0 restore php5.3 compatibility. thx for Kihokki for reporting that 2014-05-03 23:58:24 +02:00
czaks
211c1acec9 actually fix this bug 2014-05-02 19:32:18 +02:00
czaks
9416587d40 fix a bug with multiple images; thanks to saiko of tahta.ch for reporting it 2014-05-02 18:58:21 +02:00
Fredrick Brennan
b1912ba86f Merge branch 'staging' of https://github.com/vichan-devel/vichan into staging 2014-04-30 17:18:44 -04:00
Fredrick Brennan
042e7b9c59 Deprecate postControls(), per-file deletion and spoilering 2014-04-30 17:18:35 -04:00
czaks
0a53fdb3a2 remove quick-reply harder 2014-04-30 22:46:20 +02:00
czaks
4e21e3dbb7 Merge master branch into staging
Conflicts:
	templates/themes/ukko/theme.php
2014-04-30 18:28:46 +02:00
czaks
3545ba1b47 ukko: this return thingy wasn`t needed 2014-04-30 18:28:14 +02:00
czaks
318d75ac27 ukko: mod support for ukko; fixes #23 2014-04-30 18:20:30 +02:00
czaks
776bbeb73e ukko: mod support for ukko; fixes #23 2014-04-30 18:18:55 +02:00
Fredrick Brennan
400df0975f Fix upload-selection for multifile 2014-04-30 10:27:24 -04:00
Fredrick Brennan
dedc531adc Fix inline expanding issue with new styles 2014-04-30 10:21:02 -04:00
Fredrick Brennan
de524c64d9 Attempt to fix styling issue http://i.imgur.com/owHv6sE.png 2014-04-29 20:39:32 -04:00
Fredrick Brennan
24753907eb remove var_dump 2014-04-29 20:18:30 -04:00
Fredrick Brennan
0c9a27e165 Merge branch 'staging' of https://github.com/vichan-devel/vichan into staging 2014-04-29 19:14:26 -04:00
Fredrick Brennan
53e33d414f Fix mod_move for multi image 2014-04-29 19:14:10 -04:00
Fredrick Brennan
2b3942d19d Fix mod_move for multi image 2014-04-29 19:07:13 -04:00
Fredrick Brennan:w
8a73c084de Add webm support to README 2014-04-30 00:36:09 +02:00
Fredrick Brennan:w
c5576120d9 Oekaki instructions 2014-04-30 00:36:05 +02:00
czaks
2adf7d99db integrate favelog into catalog theme; needs more work, code cleanup etc. 2014-04-30 00:14:25 +02:00
czaks
bb5446a93d Merge remote-tracking branch 'origin/br-integration' into staging 2014-04-29 21:35:50 +02:00
czaks
c1aaf78cbb forgot one place to remove quick-reply-old 2014-04-29 21:35:45 +02:00
Fredrick Brennan
8e81c8c669 Merge branch 'staging' of https://github.com/vichan-devel/vichan into staging 2014-04-29 15:20:42 -04:00
czaks
a2d62ce96d fix webm for multiimage 2014-04-29 21:18:37 +02:00
czaks
46802d3f1b fix post event 2014-04-29 21:18:17 +02:00
Fredrick Brennan:w
0557c21845 Add webm support to README 2014-04-29 15:01:34 -04:00
Fredrick Brennan:w
6a1a979ae7 Oekaki instructions 2014-04-29 14:59:17 -04:00
czaks
d57dcc5e6e fix remote upload 2014-04-29 20:50:28 +02:00
czaks
a53f52696e remove post-hider symlink 2014-04-29 20:15:57 +02:00
czaks
18092de0c4 Merge ../pl into staging 2014-04-29 19:53:29 +02:00
czaks
15a65caf9d update wpaint; fix wpaint.js 2014-04-29 19:45:30 +02:00
czaks
b7112050a1 Merge branch 'master' of github.com:vichan-devel/Tinyboard into staging 2014-04-29 18:59:14 +02:00
neniu
eb23552531 update eo l10n 2014-04-29 18:57:37 +02:00
czaks
4287822229 limit the cli debug uptput 2014-04-29 18:48:57 +02:00
czaks
18e9c32a0e limit the cli debug uptput 2014-04-29 18:48:21 +02:00
czaks
b94e39148b remove quick-reply-old. it probably doesn't work now, it certainly isn't
maintained. this is an old cruft and if needed, it needs rewriting.
2014-04-29 18:37:29 +02:00