Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,483 Commits 2 Branches 0 Tags
Commit Graph

15 Commits

Author SHA1 Message Date
ccd0
9c8f0e372c Use @include for better compatibility. 
It shouldn't be any less safe as long as we keep wildcards out of
the scheme and host parts of the URL.
 2015-06-23 12:01:51 -07: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
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
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
f53752c20c use gh-pages for updates 2014-04-03 15:59:40 -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
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
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
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -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