123 Commits

Author SHA1 Message Date
ccd0
0461c2607e Gruntfile: Fix overwriting of web page images. 2014-12-29 12:12:23 -08:00
ccd0
709246fbdd Code cleanup: Remove unnecessary escaping. 2014-12-20 17:31:22 -08:00
ccd0
42c59df4e1 Code cleanup. 2014-12-20 17:21:30 -08:00
ccd0
0af7fb727b Merge branch 'Stable' into Beta
Conflicts:
	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-12-14 12:41:31 -08:00
ccd0
c919a8672b Use JSHint. 2014-12-14 12:14:56 -08:00
ccd0
76507b6a34 Merge commit '68dbb73' into noscript; allow selection of noscript or Javascript captcha.
Similar to reverted merge commit c7433d9271717df3f0f8d64e22abf73e85f8a5ca.

Conflicts:
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-12-12 17:59:14 -08:00
ccd0
8832897d3a Revert "Merge branch 'old-captcha'; allow selection of old or new captcha."
This reverts commit c7433d9271717df3f0f8d64e22abf73e85f8a5ca, reversing
changes made to 68dbb73c4eceec13cdc56550f8181adc28ab65a2.
2014-12-10 14:30:29 -08:00
ccd0
c7433d9271 Merge branch 'old-captcha'; allow selection of old or new captcha. 2014-12-10 01:53:33 -08:00
ccd0
b16e2205ed Fix text content of Linkify ranges, add test. 2014-12-07 03:24:11 -08:00
ccd0
bd96eba5e8 Revert "Revert "make match condition in copy:builds work cross-platform""
This reverts commit 8be82269e28aadf9c7bab93ddb2abf174e2631bd.
2014-11-10 01:49:24 -08:00
ccd0
0ec7fca9b8 Revert "Revert "add beta/dev to userscript names so beta/developement versions can be installed alongside stable""
This reverts commit dbea116828854ad7982e46649aa6e7c9c9346e84.
2014-11-10 01:49:13 -08:00
ccd0
dbea116828 Revert "add beta/dev to userscript names so beta/developement versions can be installed alongside stable"
This reverts commit 047381bb5d6637c2e762c57d3aca53aa587a9b29.
2014-11-10 01:13:06 -08:00
ccd0
8be82269e2 Revert "make match condition in copy:builds work cross-platform"
This reverts commit 74cff28c5351d255937920fdcab8af91df4673f8.
2014-11-10 01:12:59 -08:00
ccd0
38c2872ea9 include template in webpage files 2014-09-29 04:02:31 -07:00
ccd0
b11e6f9120 build github.io webpage from README.md 2014-09-29 03:39:44 -07:00
ccd0
74cff28c53 make match condition in copy:builds work cross-platform 2014-09-28 13:53:42 -07:00
ccd0
92ec24ffe9 take changelog links out of header (created strange anchors) 2014-09-15 00:16:36 -07:00
ccd0
26f32f6658 separate branches to make changelog merges easier 2014-09-14 23:25:59 -07:00
ccd0
af34358bfc add links to old versions
Conflicts:
	CHANGELOG.md
2014-09-14 23:07:19 -07:00
ccd0
fd59f09c28 add explanatory note to changelog
Conflicts:
	CHANGELOG.md
2014-09-14 23:03:49 -07:00
ccd0
047381bb5d add beta/dev to userscript names so beta/developement versions can be installed alongside stable 2014-09-13 21:05:07 -07:00
ccd0
40b68a389d use event page to make HTTP requests from HTTPS pages in Chromium 2014-08-30 17:36:17 -07:00
ccd0
c0028ef1f0 re-automate version changes 2014-08-22 12:39:06 -07:00
ccd0
67bf0a1334 Gruntfile.coffee: fix merge error 2014-08-11 16:11:00 -07:00
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
f73c1c5480 always use Unix line endings 2014-08-11 15:50:04 -07:00
ccd0
3d77301eeb make grunt-shell tasks more portable 2014-08-11 14:12:01 -07:00
ccd0
786506ecaf move version number into meta 2014-08-10 04:20:54 -07:00
ccd0
98bf664330 Merge branch 'archiveupdate' 2014-08-04 13:24:42 -07:00
ccd0
7d84ebfc0a change private key location 2014-08-04 12:34:21 -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
ccd0
2fc7ed9f8e avoid using different CSS for each package 2014-07-19 23:44:13 -07:00
ccd0
43d78f4a19 packing shouldn't be in main build task because it requires key 2014-07-01 12:21:41 -07:00
ccd0
e8fc907b10 setup release process for beta channel 2014-06-30 00:12:19 -07:00
ccd0
7b87885731 add beta and noupdate versions to build script 2014-06-29 22:48:39 -07:00
ccd0
deedfba851 add build switch for test code 2014-06-27 16:56:23 -07:00
ccd0
335ef45af3 Merge branch 'email-fix-reverted' into tests 2014-06-27 14:29:05 -07:00
ccd0
e1d695531b automate testing releases 2014-06-19 01:05:35 -07:00
ccd0
65048751ad add test of HTML building 2014-06-16 19:29:10 -07:00
ccd0
5dd6425f9e CSS order property not used in 4chan X 2014-06-08 13:48:48 -07:00
ccd0
972f0773dc flex no longer needs to be prefixed in Chrome 2014-06-08 13:42:53 -07:00
ccd0
f67675ec11 Release 4chan X v1.7.52. 2014-06-02 04:17:08 -07:00
ccd0
722635d722 Drop navigation between threads/boards with JSON 2014-06-01 17:40:23 -07:00
ccd0
7e25c13987 Support Chrome users on Windows. 2014-05-18 16:35:53 -07:00
ccd0
b263cd73ba remove string interpolation from most HTML files 2014-05-15 00:01:28 -07:00
ccd0
9d65a93c83 another Gruntfile change 2014-04-10 01:35:21 -07:00
ccd0
1419d5f454 update Gruntfile 2014-04-09 22:42:22 -07:00
ccd0
55197a504b remove old updater stuff 2014-04-09 20:53:42 -07:00
ccd0
7f3d330ba4 Add updater for Chrom* extension. 2014-04-03 14:03:05 -07:00