2394 Commits

Author SHA1 Message Date
ccd0
b1674bd950 Merge branch '1.8.8.x' into 1.8.9.x
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	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
2014-08-11 16:01:29 -07:00
ccd0
314909c8d2 archive list: prefer HTTPS 2014-08-11 14:08:37 -07:00
vidyamoe
11661f3bc2 Update /v/ archive data. 2014-08-11 14:06:13 -07:00
ccd0
ccfcbba28d Merge branch '1.8.8.x' into 1.8.9.x
Conflicts:
	CHANGELOG.md
	LICENSE
	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
2014-08-10 22:06:44 -07:00
ccd0
8c16997e1f fix escaping oversight 2014-08-10 21:51:35 -07:00
ccd0
4a32154031 bugfix 2014-08-10 15:58:56 -07:00
ccd0
e9242929b2 remove timestamps from build 2014-08-10 04:35:12 -07:00
ccd0
786506ecaf move version number into meta 2014-08-10 04:20:54 -07:00
ccd0
1e8e5206f2 ThreadStats: fix mistake in HTML rewrite 2014-08-09 18:51:39 -07:00
ccd0
6228248c15 Fix "Allow post fetching to work if no archive is selected for thread redirection."
fixes commit c21a8b217f87336b71212169ed71db0c81cb63ee
2014-08-09 18:14:22 -07:00
ccd0
d7d14f10db fix another case of leftover errored image from hover 2014-08-09 18:13:02 -07:00
ccd0
c21a8b217f Allow post fetching to work if no archive is selected for thread redirection. 2014-08-09 15:57:19 -07:00
ccd0
cd260d34da allow all archives to be disabled, take two 2014-08-09 15:23:10 -07:00
ccd0
5d70306979 Revert "allow all archives to be disabled, sort archives with HTTPS support first"
This reverts commit 54687be452c48f5d94f90bc185994f9567349e81.
2014-08-09 15:04:54 -07:00
ccd0
7d7c6712f9 gist embedding: replace purplegene with sandboxed iframe with data: URI which will work on HTTPS 2014-08-09 09:08:45 -07:00
ccd0
54687be452 allow all archives to be disabled, sort archives with HTTPS support first 2014-08-09 08:14:19 -07:00
ccd0
f6206b766f archive settings: edit name, descriptions 2014-08-08 22:32:05 -07:00
ccd0
4d40b30c28 archive features should be disableable 2014-08-08 21:24:41 -07:00
ccd0
41d06c05a3 Merge branch 'archives' 2014-08-07 18:24:03 -07:00
vidyamoe
b1ca3886c1 Add /v/idya archive. 2014-08-07 17:39:01 -07:00
hotdogman
730ac69da9 Warosu has enabled images for /g/ 2014-08-07 17:37:18 -07:00
hotdogman
78dae00ac0 Warosu has enabled images for /g/ 2014-08-07 16:45:26 -05:00
ccd0
e40b0a4bc5 Merge branch 'bugfix' 2014-08-06 21:19:48 -07:00
ccd0
924fab8400 Test HAVE_METADATA in ImageExpand
HAVE_CURRENT_DATA can revert to HAVE_METADATA, in which case
loadeddata will not be fired when video reaches HAVE_CURRENT_DATA
again.
2014-08-06 21:14:04 -07:00
ccd0
98bf664330 Merge branch 'archiveupdate' 2014-08-04 13:24:42 -07:00
ccd0
9b0407754f Merge tag 'beta' into archiveupdate
4chan X v1.8.8.3.

Conflicts:
	CHANGELOG.md
	LICENSE
	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
2014-08-04 13:03:39 -07:00
Blade
e69708dbec Update Love is Over / Nyafuu
Nyafuu is suffering from extended downtime due to VoH's personal situation. I have picked up the boards that only Nyafuu hosted in this .json, and I removed Nyafuu from this list. It can be readded whenever Nyafuu comes back online.
2014-08-04 12:03:13 -07:00
ccd0
790a62d1bd add option to disable mixed content security, workaround for ajax restrictions 2014-08-03 19:53:01 -07:00
ccd0
e70cdc620a clean up cross-origin request code 2014-08-03 18:34:02 -07:00
ccd0
689372e2b3 consolidate archive post fetching code 2014-08-03 12:59:18 -07:00
ccd0
2a5da0a0a9 use Javascript snippets for code in HTML templates 2014-08-03 08:16:23 -07:00
ccd0
cff287c9c3 HTML templates 2014-08-02 22:43:01 -07:00
Zixaphir
7a41feb18f Fix an issue where catalog links were affecting external links zixaphir/appchan-x/#773 (CatalogLinks.coffee part) 2014-08-02 07:40:30 -07:00
ccd0
546f734ce0 use archive when 4chan unreachable, but don't mark post deleted 2014-08-01 22:21:32 -07:00
ccd0
e9ac861ad9 simplify ImageCommon.error 2014-08-01 13:12:11 -07:00
ccd0
5e2ccfee2d image error handling fixes 2014-07-31 10:35:37 -07:00
ccd0
c41b72b765 don't retry image on archive error 2014-07-29 21:50:40 -07:00
ccd0
f11e9c8801 show actual number of dice rolled when 4chan's limit (currently 25) is exceeded 2014-07-29 09:05:33 -07:00
ccd0
f80fe44aea fix image 404 redirect 2014-07-28 00:12:21 -07:00
ccd0
c5e2b2ee78 this fixes the extra errors in the gallery (when leaving an unplayable video) 2014-07-27 17:17:42 -07:00
ccd0
b4b35c1ef3 safer version of workaround 2014-07-27 16:57:52 -07:00
ccd0
feb2f1efb6 add 25px bottom margin to Scroll into view functionality 2014-07-27 16:26:30 -07:00
ccd0
c1e2034d12 don't need this condition anymore 2014-07-27 16:23:48 -07:00
ccd0
28ad96448f make Scroll into view optional 2014-07-27 16:17:58 -07:00
ccd0
f8cbbb749d fix Advance on Contract 2014-07-27 15:50:06 -07:00
ccd0
7f5faea469 WebM contract controls should trigger scroll 2014-07-27 15:21:01 -07:00
ccd0
e07ca00ff4 this got lost somehow 2014-07-27 14:35:29 -07:00
ccd0
bec1646bf5 Page Count in Stats -> default on 2014-07-27 14:10:53 -07:00
ccd0
c267b55741 this doesn't do what we want 2014-07-27 14:07:14 -07:00
ccd0
1aced79126 show controls immediately for nonplaying videos 2014-07-27 13:56:30 -07:00