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

638 Commits

Author SHA1 Message Date
Zixaphir
41ec3933cd Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Navigate.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Posting/QR.coffee
 2014-04-19 15:48:11 -07:00
Zixaphir
33943a06eb Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Build.coffee
	src/General/Main.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Monitoring/ThreadUpdater.coffee
 2014-04-12 18:13:21 -07:00
Zixaphir
4b3f4d1baf Merge branch 'ccd0' into v3 
Conflicts:
	builds/crx.crx
	src/General/Index.coffee
	src/Miscellaneous/Keybinds.coffee
 2014-04-12 18:02:25 -07:00
ccd0
8a5cd7a610 Release 4chan X v1.7.8. 2014-04-12 10:00:46 -07:00
ccd0
a0e86e9396 update CHANGELOG 2014-04-12 09:59:53 -07:00
Mayhem
c7b7795261 Start supporting new semantics. 2014-04-12 18:01:03 +02:00
Zixaphir
ea47aefd93 Merge branch 'v3' 
Conflicts:
	.gitignore
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Settings.html
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/ThreadWatcher.coffee
 2014-04-11 00:29:52 -07:00
Zixaphir
28eebe0183 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
 2014-04-10 23:08:43 -07:00
ccd0
2064baa227 Release 4chan X v1.7.7. 2014-04-10 08:59:12 -07:00
ccd0
795d71c238 update CHANGELOG 2014-04-10 08:58:19 -07:00
ccd0
2889c17e32 Release 4chan X v1.7.6. 2014-04-10 01:40:53 -07:00
ccd0
340bbd7220 update CHANGELOG 2014-04-10 01:38:46 -07:00
ccd0
d7ba6cf31d Release 4chan X v1.7.5. 2014-04-09 03:04:15 -07:00
Mayhem
259fd0cc89 Release 4chan X v3.20.4. 2014-04-09 10:51:14 +02:00
Mayhem
06e6f84867 Handle webm playback errors with image expansion. 2014-04-09 10:04:51 +02:00
ccd0
cde38b64dd Release 4chan X v1.7.4. 2014-04-08 20:11:23 -07:00
Zixaphir
b00390b980 Merge branch 'ccd0' into v3 
Rebase ImageExpand implemention off ccd0's

Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/Images/ImageExpand.coffee
 2014-04-08 14:46:15 -07:00
ccd0
1dc57bda8f Release 4chan X v1.7.3. 2014-04-07 22:03:46 -07:00
Zixaphir
7fc970f4c4 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
 2014-04-07 18:58:17 -07:00
Zixaphir
d215221c71 Merge branch 'ccd0' into v3 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Build.coffee
	src/Miscellaneous/ExpandThread.coffee
 2014-04-07 11:26:21 -07:00
ccd0
a35f547cdd Release 4chan X v1.7.2. 2014-04-07 03:40:08 -07:00
Mayhem
c1846c01ad Release 4chan X v3.20.3. 2014-04-07 11:26:56 +02:00
Mayhem
3dc8a6de5e Changelog. 2014-04-07 11:26:17 +02:00
ccd0
d3397a952c Release 4chan X v1.7.1. 2014-04-06 23:59:30 -07:00
Zixaphir
68a76a25f2 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
	src/General/UI.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
 2014-04-06 20:47:38 -07:00
ccd0
711c4587da Release 4chan X v1.7.0. 2014-04-06 16:25:39 -07:00
ccd0
47eea2a57a implement duckness's upgrade nag disabling option 2014-04-06 16:10:05 -07:00
ccd0
81f1dbf0fb work around FF forever-loading bug, other tweaks 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-06 16:09:09 -07:00
ccd0
3836813e07 Release 4chan X v1.6.0. 2014-04-06 10:23:24 -07:00
ccd0
31eac580aa implement duckness's upgrade nag disabling option 2014-04-06 10:17:26 -07:00
ccd0
d32b923ac5 work around FF forever-loading bug, other tweaks 2014-04-06 09:58:34 -07:00
Mayhem
0815e008bb Release 4chan X v3.20.2. 2014-04-06 15:46:24 +02:00
Mayhem
9215c06d55 Fix webm upload. #1533 2014-04-06 15:46:02 +02:00
ccd0
782fd7ad05 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
 2014-04-05 18:21:07 -07:00
ccd0
dcda06c40c Merge commit '4b2862641095ffe5a25514fcc82458c72c601543' of https://github.com/zixaphir/appchan-x 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-05 17:36:35 -07:00
Zixaphir
a3845d843b Release appchan x v2.9.15. 2014-04-05 05:40:46 -07:00
Zixaphir
81eb21797e Release appchan x v2.9.14. 2014-04-05 05:33:40 -07:00
Zixaphir
eb91edaf6d Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
 2014-04-05 05:33:14 -07:00
Mayhem
bbb92b2dc7 Release 4chan X v3.20.1. 2014-04-05 14:07:57 +02:00
Mayhem
12b6fee222 Changelog. 2014-04-05 14:07:50 +02:00
Zixaphir
616b2fbc2a Release appchan x v2.9.13. 2014-04-05 01:11:06 -07:00
ccd0
9245af7a68 Release 4chan X v1.5.2. 2014-04-04 22:18:54 -07:00
Zixaphir
453ebe7e74 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
 2014-04-04 20:28:21 -07:00
Zixaphir
f6353729eb Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/FileInfo.coffee
	src/Posting/QR.coffee
 2014-04-04 20:24:12 -07:00
Zixaphir
ca287336b1 Release appchan x v2.9.12. 2014-04-04 17:32:20 -07:00
Zixaphir
8536ae3d37 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
 2014-04-04 16:12:31 -07:00
Zixaphir
4b28626410 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageHover.coffee
	src/Posting/QR.coffee
 2014-04-04 16:10:07 -07:00
Zixaphir
6dcbb80070 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
 2014-04-04 16:01:06 -07:00
Zixaphir
db7e039b88 Changelog 2014-04-04 15:50:36 -07:00
ccd0
12feb7dc9b Release 4chan X v1.5.1. 2014-04-04 15:43:53 -07:00