8chan
|
da4a310d3f
|
Merge ../test
|
2014-05-14 17:54:11 +00:00 |
|
8chan
|
ed54529f29
|
Fix catalog if no files
|
2014-05-14 17:53:59 +00:00 |
|
8chan
|
02d07f02f2
|
Merge https://github.com/vichan-devel/vichan
|
2014-05-14 17:53:36 +00:00 |
|
Fredrick Brennan
|
57cf56ad9b
|
Fix displaying bans
|
2014-05-14 13:51:49 -04:00 |
|
8chan
|
2fff8835a2
|
SWITCH TO 5.0; MERGE VICHAN
|
2014-05-14 16:09:04 +00:00 |
|
8chan
|
3468d324ec
|
Fix failed merge
|
2014-05-12 19:45:42 +00:00 |
|
czaks
|
0f9e2a5a9d
|
Merge branch 'master' of github.com:vichan-devel/Tinyboard
|
2014-05-10 21:58:34 +02:00 |
|
czaks
|
5caed72059
|
Merge ../pl
Conflicts:
post.php
|
2014-05-10 21:58:23 +02:00 |
|
Jano Slota
|
adc7288529
|
Optimized images
|
2014-05-10 21:51:00 +02:00 |
|
Jason Lam
|
ea6c9fbe39
|
use new truncate_filename function
|
2014-05-09 20:37:31 -04:00 |
|
Jason Lam
|
d60be0de98
|
Update poster_id.html
previous code did not work
|
2014-05-08 00:58:42 +02:00 |
|
Jason Lam
|
a611ddcbc4
|
Update poster_id.html
previous code did not work
|
2014-05-07 18:37:48 -04:00 |
|
Jano Slota
|
4c31dec50e
|
Added configurabe image identification
|
2014-05-07 11:14:30 +02:00 |
|
Fredrick Brennan
|
9ef2d02b5c
|
Allow post deletion switch
|
2014-05-05 18:03:51 -04:00 |
|
czaks
|
20cfc8f230
|
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 |
|
8chan
|
4f4267661b
|
Merge ../http
|
2014-05-05 15:05:41 +00:00 |
|
8chan
|
6416152794
|
Fix stylesheet issue for mod
|
2014-05-05 15:05:18 +00:00 |
|
8chan
|
86ae70770c
|
Merge vichan-devel
|
2014-05-05 15:04:41 +00:00 |
|
czaks
|
094b5a21c1
|
quick & dirty youtube thumbnails in catalog support
|
2014-05-04 01:20:12 +02:00 |
|
Fredrick Brennan
|
59e614eb1f
|
Merge branch 'staging' of https://github.com/vichan-devel/vichan into staging
|
2014-04-30 17:18:44 -04:00 |
|
Fredrick Brennan
|
4460b08096
|
Deprecate postControls(), per-file deletion and spoilering
|
2014-04-30 17:18:35 -04:00 |
|
czaks
|
8ad1edf5d7
|
Merge master branch into staging
Conflicts:
templates/themes/ukko/theme.php
|
2014-04-30 18:28:46 +02:00 |
|
czaks
|
7ab87343b7
|
ukko: this return thingy wasn`t needed
|
2014-04-30 18:28:14 +02:00 |
|
czaks
|
d4753786c7
|
ukko: mod support for ukko; fixes #23
|
2014-04-30 18:20:30 +02:00 |
|
czaks
|
d3e03c1125
|
ukko: mod support for ukko; fixes #23
|
2014-04-30 18:18:55 +02:00 |
|
Fredrick Brennan
|
a781ceb041
|
Attempt to fix styling issue http://i.imgur.com/owHv6sE.png
|
2014-04-29 20:39:32 -04:00 |
|
czaks
|
e04cbe9e6f
|
integrate favelog into catalog theme; needs more work, code cleanup etc.
|
2014-04-30 00:14:25 +02:00 |
|
czaks
|
004b0701c1
|
Merge remote-tracking branch 'origin/br-integration' into staging
|
2014-04-29 21:35:50 +02:00 |
|
czaks
|
29ca1decd9
|
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 |
|
czaks
|
7ca6ce25f5
|
Revert "change thumb to file to overcome a nasty bug in upgrading"
This reverts commit b0faa1a7e4 .
|
2014-04-27 16:19:41 +02:00 |
|
czaks
|
8c7505d396
|
change thumb to file to overcome a nasty bug in upgrading
|
2014-04-27 16:05:38 +02:00 |
|
copypaste
|
f178769a0a
|
multiimage posting
|
2014-04-27 15:48:47 +02:00 |
|
8chan
|
7f56103958
|
Search page fix
|
2014-04-23 21:59:41 +00:00 |
|
8chan
|
03dea2173e
|
Merge vichan
|
2014-04-21 13:46:04 +00:00 |
|
czaks
|
a4689d5239
|
fix recentposts theme building null query, throw error instead
|
2014-04-20 23:33:52 +02:00 |
|
czaks
|
dc93b06d90
|
update copyright footers in themes
|
2014-04-20 02:27:54 +02:00 |
|
8chan
|
b1688235dd
|
Merge vichan-devel
|
2014-04-19 20:11:34 +00:00 |
|
8chan
|
8620e96971
|
Re-add board into querystring for banners
|
2014-04-19 20:03:54 +00:00 |
|
8chan
|
071ffaa69c
|
Attempt to fix scroll to anchor issue
|
2014-04-19 20:02:39 +00:00 |
|
8chan
|
6d7dc7d2d5
|
Remove openBoard() from ukko
|
2014-04-19 20:02:15 +00:00 |
|
kaf
|
1c2aa523a3
|
Added: /pol/-like flags based on a953229de7
Conflicts:
inc/config.php
templates/post_form.html
|
2014-04-19 18:48:17 +02:00 |
|
czaks
|
6f39fecb53
|
Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration
|
2014-04-19 00:24:52 +02:00 |
|
czaks
|
388867d67f
|
apply new branding for vichan-devel
|
2014-04-17 17:11:32 +02:00 |
|
8chan
|
c555a88aa9
|
Fix stylechooser
|
2014-04-17 00:41:33 +00:00 |
|
root
|
b30fff7ca7
|
Merge unmerged live changes
|
2014-04-16 15:14:02 +00:00 |
|
root
|
e34fe06db1
|
Merge vichan-devel!
|
2014-04-16 15:05:32 +00:00 |
|
czaks
|
037c29619d
|
modularize post templates a little more
|
2014-04-16 15:01:37 +02:00 |
|
czaks
|
08f3044a7b
|
add some files missing from the previous commit
|
2014-04-16 11:58:41 +02:00 |
|
czaks
|
de2e9ae11a
|
modularize post templates a little bit; try to unify duplicate code
|
2014-04-16 11:54:41 +02:00 |
|
czaks
|
b3628f460e
|
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
|
2014-04-12 20:52:42 +02:00 |
|