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

468 Commits

Author SHA1 Message Date
Zixaphir
9199f12ce0 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/Sauce.coffee
 2014-01-28 01:14:01 -07:00
Zixaphir
2ac2286ad5 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	src/General/lib/$.coffee
	src/Images/Sauce.coffee
 2014-01-28 01:11:06 -07:00
Zixaphir
1f49ef2212 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Settings/Settings.html
	src/Miscellaneous/AnnouncementHiding.coffee
 2014-01-26 11:40:50 -07:00
ParrotParrot
985be3113d Added Original filename to Sauce 2014-01-25 22:40:51 +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
Mayhem
c7c8ea9ec5 Add a Reset Settings button. 2014-01-22 16:33:08 +01:00
Mayhem
b0689af89a Release 4chan X v3.15.2. 2014-01-22 09:31:06 +01:00
Mayhem
119f059ea9 Changelog. 2014-01-22 09:30:58 +01:00
Mayhem
ba0830e828 Release 4chan X v3.15.1. 2014-01-20 10:06:29 +01:00
Mayhem
2f23534863 Changelog 2014-01-20 10:05:29 +01:00
Zixaphir
8ad63f968a Release appchan x v2.8.7. 2014-01-19 15:29:48 -07:00
Zixaphir
d0ec506633 Release appchan x v2.8.6. 2014-01-19 05:42:34 -07:00
Zixaphir
45b8b07aec Release appchan x v2.8.5. 2014-01-14 13:13:24 -07:00
Zixaphir
ee2e81f4ea Changelog 2014-01-14 13:12:10 -07:00
Zixaphir
141f9b6dd3 Release appchan x v2.8.4. 2014-01-13 21:09:21 -07:00
Zixaphir
0264edab7d Release appchan x v2.8.3. 2014-01-13 19:58:35 -07:00
Zixaphir
7d4f0be88f Release appchan x v2.8.2. 2014-01-13 19:37:55 -07:00
Zixaphir
217f076824 Changelog 2014-01-13 19:37:22 -07:00
Zixaphir
b1cf10fbd2 Release appchan x v2.8.1. 2014-01-13 13:39:10 -07:00
Zixaphir
646cd06d51 Changelog 2014-01-13 13:38:38 -07:00
Zixaphir
94dd0e555f Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Menu/Menu.coffee
 2014-01-13 13:25:43 -07:00
Jordan
d7b140cc3b Release 4chan X v1.3.2. 2014-01-12 19:55:02 -07:00
Zixaphir
0a8719172c I don't know how that happened 2014-01-12 18:14:52 -07:00
Zixaphir
27f052b3e6 Changelog 2014-01-12 18:14:08 -07:00
Zixaphir
aa48ee519c Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
 2014-01-12 14:56:32 -07:00
Jordan
1c253782e8 Release 4chan X v1.3.1. 2014-01-12 09:51:00 -07:00
Zixaphir
c13cbfce18 Release appchan x v2.8.0. 2014-01-11 21:33:45 -07:00
Zixaphir
bd08bd964d Merge branch 'json' into ajson 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Features/Index-navlinks.html
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/Gallery.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee
 2014-01-11 15:55:46 -07:00
Jordan
3aea514ca1 Release 4chan X v1.3.0. 2014-01-10 09:46:48 -07:00
Jordan
436e138895 Merge Zixaphir X 2014-01-09 17:42:57 -07:00
Zixaphir
9478dabdad Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/General/css/font-awesome.css
 2014-01-09 10:12:28 -07:00
Jordan
7eb6849276 Changelog 2014-01-08 22:16:37 -07:00
Zixaphir
63b09cb803 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/css/font-awesome.css
	src/General/lib/databoard.class
	src/Miscellaneous/ExpandThread.coffee
	src/Monitoring/ThreadUpdater.coffee
 2014-01-07 20:28:47 -07:00
Jordan
08ae1daee8 Release 4chan X v1.2.45. 2014-01-07 03:17:48 -07:00
Zixaphir
9a8e84c7d1 Release appchan x v2.7.5. 2014-01-04 15:38:05 -07:00
Zixaphir
ccfafab5b0 Release appchan x v2.7.4. 2013-12-27 15:54:19 -07:00
Zixaphir
51c7bfeefb Release appchan x v2.7.3. 2013-12-26 14:44:06 -07:00
Zixaphir
b46e61a8d5 Release appchan x v2.7.2. 2013-12-25 20:38:30 -07:00
Zixaphir
147808a7d4 Release appchan x v2.7.1. 2013-12-24 16:53:43 -07:00
Zixaphir
61a9364090 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Miscellaneous/CatalogLinks.coffee
 2013-12-18 16:58:07 -07:00
Zixaphir
d7ceb42446 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/css/font-awesome.css
	src/Miscellaneous/CatalogLinks.coffee
 2013-12-18 16:17:11 -07:00
Zixaphir
5d6b357135 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/lib/post.class
 2013-12-18 12:21:43 -07:00
Zixaphir
1c55dbd8aa Release appchan x v2.7.0. 2013-12-16 20:21:30 -07:00
Zixaphir
e156cc8e9c Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
	src/General/Config.coffee
	src/Images/FappeTyme.coffee
	src/Linkification/Linkify.coffee
 2013-12-16 14:01:47 -07:00
Zixaphir
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -07:00
Zixaphir
a719bbde38 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
 2013-12-16 12:56:09 -07:00
Mayhem
cfbdf1edb5 Release 4chan X v3.15.0. 2013-12-13 14:23:46 +01:00
Mayhem
cf1b6dec3f Changelog. 2013-12-13 01:55:48 +01:00
Mayhem
ceff7c5d5f Add Refreshed Navigation setting. 
Close #1323, #1332.
 2013-12-12 02:03:18 +01:00
Mayhem
f17f9fd441 Anchor hidden threads on the index. 2013-12-12 02:03:18 +01:00