33 Commits

Author SHA1 Message Date
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
4011f4b8a9 add beta/dev to userscript names so beta/developement versions can be installed alongside stable 2014-09-13 11:00:46 -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
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
7b87885731 add beta and noupdate versions to build script 2014-06-29 22:48:39 -07:00
ccd0
7e25c13987 Support Chrome users on Windows. 2014-05-18 16:35:53 -07:00
ccd0
55197a504b remove old updater stuff 2014-04-09 20:53:42 -07:00
ccd0
3fa34d3e69 fix updates.xml 2014-04-03 16:29:35 -07:00
ccd0
f53752c20c use gh-pages for updates 2014-04-03 15:59:40 -07:00
ccd0
7f3d330ba4 Add updater for Chrom* extension. 2014-04-03 14:03:05 -07:00
Zixaphir
6dd0cac797 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/Monitoring/Favicon.coffee
2014-02-16 01:00:41 -07:00
Kabir Sala
d8a168a549 More work on post from url 2014-02-11 23:37:52 +01:00
Kabir Sala
f0bd6b1b04 Start working on remote upload (Chrome-only so far) 2014-02-11 18:32:23 +01:00
Zixaphir
b6749b91a5 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee
2014-01-22 12:10:34 -07:00
Zixaphir
a3c1afa5cd Merge -- probably bugged until I sort out everything
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	changelog-old
	css/style.css
	html/General/Settings.html
	html/Monitoring/ThreadUpdater.html
	html/Monitoring/ThreadWatcher.html
	html/Posting/QR.html
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/post.class
	src/General/meta/manifest.json
	src/Images/ImageExpand.coffee
	src/Meta/banner.js
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Miscellaneous/Nav.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
2013-11-22 17:25:06 -07:00
Zixaphir
ec32e54ef5 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	css/style.css
	src/General/Config.coffee
	src/General/meta/manifest.json
	src/Posting/QuickReply.coffee
2013-08-17 21:00:31 -07:00
Zixaphir
d15f8ee728 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	css/style.css
	html/Posting/QR.html
	img/changelog/3.2.0/0.png
	package.json
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Notice.coffee
	src/General/Notification.coffee
	src/General/Settings.coffee
	src/General/img/icon.gif
	src/General/lib/notification.class
	src/Monitoring/Favicon.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
2013-08-17 20:33:48 -07:00
Zixaphir
6692dd329b And now that's gone. 2013-08-17 05:41:27 -07:00
seaweedchan
58d06b4db6 Remove some unwanted changes 2013-08-12 01:21:22 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
2fa674c782 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.coffee
	json/archives.json
	src/Archive/Redirect.coffee
	src/General/lib/$.coffee
	src/Monitoring/Unread.coffee
2013-08-04 19:44:42 -07:00
Zixaphir
582d067a10 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	changelog-old
	css/style.css
	html/Monitoring/ThreadStats.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Filter-guide.html
	src/General/lib/$.coffee
	src/General/lib/clone.class
	src/General/lib/post.class
	src/Images/ImageHover.coffee
	src/Menu/Menu.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/Quotify.coffee
2013-07-21 08:39:40 -07:00
Jordan Bates
3535f8919b Meh. Lets just use the crx folder for Opera. 2013-05-28 13:44:57 -07:00
Jordan Bates
a30a5927c8 Opera 15 extension 2013-05-28 12:40:42 -07:00
Zixaphir
6a9e334c02 Generated by CS 2013-05-08 06:14:22 -07:00
Jordan Bates
9845a4c4dc Merge zixaphir x 2013-05-05 22:34:17 -07:00
Zixaphir
2158d35285 Add @detharonil's %Y and more future-proof %y 2013-05-05 17:39:30 -07:00
Jordan Bates
d321baef64 Fix #48 2013-05-03 15:16:40 -07:00
Jordan Bates
9c0dd570dd Check for updates 2013-05-01 11:30:23 -07:00
Jordan Bates
e70514b6ec Finish structure 2013-04-26 14:43:01 -07:00
Jordan Bates
09baa3feea Merge Mayhem's structure 2013-04-26 14:04:12 -07:00