4721 Commits

Author SHA1 Message Date
ccd0
589dbef788 Merge remote-tracking branch 'archives/master' into bstable
Conflicts:
	src/Archive/archives.json
2015-04-13 08:06:54 -07:00
ccd0
c48fa8b2fe Merge branch 'bstable'
Conflicts:
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2015-04-10 12:46:18 -07:00
ccd0
d629ecf91c Merge remote-tracking branch 'archives/master' into bstable 2015-04-10 12:34:17 -07:00
ccd0
76050db6ba Fix missing /f/ tag selector when posting new thread from within thread. 2015-04-08 17:53:58 -07:00
ccd0
b085b9324c Merge branch 'bstable'
Conflicts:
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2015-04-08 02:09:30 -07:00
ccd0
07f2bc0fca Merge remote-tracking branch 'archives/master' into bstable
Conflicts:
	src/Archive/archives.json
2015-04-08 02:03:53 -07:00
ccd0
229a0a5b51 Impose max height on thread watcher when not fixed rather than when not toggleable. #40 2015-04-07 22:53:19 -07:00
ccd0
344f5a7c82 Break up 'Toggleable Thread Watcher' into 'Fixed' and 'Toggleable' parts. #40 2015-04-07 10:11:11 -07:00
ccd0
0615be12de Revert thread watcher remembering whether it was hidden. 2015-04-07 08:43:26 -07:00
ccd0
118848ac2e Add replies-read CSS class to thread watcher lines with a known unread count of 0. 2015-04-06 20:03:30 -07:00
ccd0
528b6fc4b1 Don't clear the unread count of 404'd threads until they're actually visited. 2015-04-06 19:44:38 -07:00
ccd0
ff0e01649e Merge branch 'bstable'
Conflicts:
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2015-04-06 17:06:08 -07:00
ccd0
94559bf388 Add /b/ to fgts archive. 2015-04-06 17:03:07 -07:00
ccd0
2580a12e16 Fix typo. 2015-04-05 21:45:26 -07:00
ccd0
2a087d633d Use CSS for hiding thread watcher close button. 2015-04-05 21:35:56 -07:00
ccd0
7d6614fc36 Remove unused argument. 2015-04-05 19:39:02 -07:00
ccd0
c68e50a346 Merge branch 'bstable'
Conflicts:
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2015-04-05 19:35:56 -07:00
ccd0
d723885331 Fix 'Last Index Refresh' button refreshing twice when Refreshed Navigation is on. #375 2015-04-05 19:31:51 -07:00
ccd0
9a27b74127 Remove close button from non-toggleable thread watcher. 2015-04-05 10:15:14 -07:00
ccd0
7bd3ea3c27 Merge branch 'bstable' 2015-04-05 02:17:40 -07:00
ccd0
071c6b468c Merge remote-tracking branch 'archives/master' into bstable 2015-04-05 02:07:37 -07:00
ccd0
6cb5eeede6 Make toggleable thread watcher remember whether it was hidden. 2015-04-05 00:48:17 -07:00
ccd0
8fdbdad642 Merge branch 'qrfile' 2015-04-04 01:33:51 -07:00
ccd0
e85f3e7b81 Fix bug causing noscript captcha to not work within frames. 2015-04-02 18:05:40 -07:00
ccd0
6ed368ab55 Implement QR file API. 2015-04-01 21:00:33 -07:00
ccd0
27ae66feea Fix posts from original post form not being marked as yours. 2015-04-01 17:07:37 -07:00
ccd0
25470745c4 Merge refresh button in navigation links with the time since last refresh, and make it navigate to the front page. 2015-03-31 02:55:21 -07:00
ccd0
6ad0064f41 Suppress post thumbnails from loading until they are actually inserted into the index.
Hopefully a temporary way of doing this until we get filtering working on JSON
so we don't have to build the posts at all.
2015-03-28 18:27:09 -07:00
ccd0
897bdac327 Merge branch 'master' into html 2015-03-28 16:34:11 -07:00
ccd0
4ee5852107 This one we can populate in the template now. 2015-03-28 16:33:51 -07:00
ccd0
800556091c This one I wanted populated at runtime to avoid diff noise. 2015-03-28 16:30:14 -07:00
ccd0
dded914e41 And a few more conditionals. 2015-03-28 16:24:27 -07:00
ccd0
9836d5ad07 Move HTML template array concatenation into its own function. 2015-03-28 16:11:34 -07:00
ccd0
b2659b91dd Use conditional to simplify some other HTML templates. 2015-03-28 15:33:18 -07:00
ccd0
bf34d8cacb Allow other names here. 2015-03-28 15:11:04 -07:00
ccd0
1c81838a91 Remove unneeded escaping. 2015-03-28 15:06:45 -07:00
ccd0
20b5dac267 Use new templating in catalog. 2015-03-28 13:58:59 -07:00
ccd0
4843bd69d4 Move post building HTML into separate files. 2015-03-28 04:54:12 -07:00
ccd0
2e48834dd5 Quote all the attributes. 2015-03-28 04:34:33 -07:00
ccd0
a09731d30a Use conditional expression in post building. 2015-03-28 02:08:41 -07:00
ccd0
afaf6178e8 Merge branch 'master' into next 2015-03-26 19:12:05 -07:00
ccd0
bda981fb8d Move Firefox image-pasting icon and improve tooltip description. 2015-03-26 19:02:52 -07:00
ccd0
ce3a0370b5 Change CSS classname of hidden original file info: original-file-info -> fileText-original 2015-03-26 18:50:01 -07:00
ccd0
be119b7f17 Merge branch 'qr' into next 2015-03-25 23:32:22 -07:00
ccd0
cd88f81230 More accurate test for dumping to a thread from the index. 2015-03-25 23:31:27 -07:00
ccd0
6968bbac81 Work around delayed thread creation issue. #362 2015-03-25 21:17:52 -07:00
ccd0
4c9c386429 Make post and clone file parsing are consistent. 2015-03-25 02:20:12 -07:00
ccd0
f420c115f9 Fix update beep on filtered posts / your own posts. #366 2015-03-24 21:20:13 -07:00
ccd0
8f7c22d32c Consolidate Unread Favicon code a bit. 2015-03-24 20:44:46 -07:00
ccd0
b26e928ddc Merge branch 'bstable'
Conflicts:
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2015-03-24 10:19:30 -07:00