czaks
|
585f75fcaf
|
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
|
c3def0e453
|
Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
js/post-hider.js
|
2013-08-05 06:03:40 -04:00 |
|
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 |
|
czaks
|
0a4cfee529
|
ukko: fix javascript interoperation
Conflicts:
js/expand.js
js/hide-threads.js
templates/themes/ukko/ukko.js
|
2013-07-31 04:51:53 -04:00 |
|
czaks
|
1e2c4bda9b
|
javascripts: fixed interactions (BEWARE, inline-expanding.js now requires jquery! fix your configs)
Conflicts:
js/expand.js
js/inline-expanding.js
|
2013-07-31 04:47:50 -04:00 |
|
czaks
|
93a8ac1d05
|
js i18n: expand.js
|
2013-07-31 04:38:23 -04:00 |
|
czaks
|
eed8767039
|
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
|
83bb16cb37
|
Issue #61
|
2013-07-31 00:39:00 -04:00 |
|
czaks
|
c051ceb475
|
fix merge
|
2013-07-27 01:08:26 -04:00 |
|
czaks
|
d723b77d4c
|
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
js/hide-threads.js
js/inline-expanding.js
stylesheets/style.css
|
2013-07-27 01:04:36 -04:00 |
|
czaks
|
940097293c
|
ukko: fix javascript interoperation
|
2013-07-27 00:57:12 -04:00 |
|
czaks
|
b6274dccc3
|
expand.js: fix post order when new posts appear between loading index and expanding
|
2013-07-27 00:28:55 -04:00 |
|
czaks
|
aba0641b16
|
expand.js: fix a weird bug - thread expand not always worked due to post being loaded in DOM, but not put in a right place in a thread, or so, so check if it has been loaded in a thread instead of if it exists in DOM
|
2013-07-27 00:28:43 -04:00 |
|
czaks
|
72bca57af6
|
expand.js: fix post order when new posts appear between loading index and expanding
|
2013-07-26 22:39:00 -04:00 |
|
czaks
|
ea3decb169
|
expand.js: fix a weird bug - thread expand not always worked due to post being loaded in DOM, but not put in a right place in a thread, or so, so check if it has been loaded in a thread instead of if it exists in DOM
|
2013-07-26 22:34:06 -04:00 |
|
Czterooki
|
acf93cda21
|
merge with vichan-gold
|
2013-07-20 00:19:08 -04:00 |
|
Czterooki
|
e1606c3579
|
js/expand.js
|
2013-07-20 00:06:08 -04:00 |
|
czaks
|
478fdc5999
|
js i18n: expand.js
|
2013-07-03 01:17:56 -04:00 |
|
czaks
|
ab146f39c3
|
javascripts: fixed interactions (BEWARE, inline-expanding.js now requires jquery! fix your configs)
|
2013-06-15 01:39:39 -04:00 |
|
Michael Save
|
218c41cbce
|
expand.js: inline thread expanding
|
2012-03-31 21:32:09 +11:00 |
|