7650 Commits

Author SHA1 Message Date
Zixaphir
e66006686f Release appchan x v2.9.29. 2014-06-22 08:39:48 -07:00
Zixaphir
c59f3c12c0 Fix #723 2014-06-22 08:32:32 -07:00
Zixaphir
7a9f998a1a Missed one 2014-06-22 08:09:53 -07:00
Zixaphir
ef4a4889d3 Revert flex changes. 2014-06-22 07:55:38 -07:00
Zixaphir
ee841e6f44 CSS updates 2014-06-22 07:44:27 -07:00
Zixaphir
64c9c139c1 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Images/FappeTyme.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
2014-06-22 07:13:41 -07:00
Zixaphir
f103fd0301 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
2014-06-22 07:04:25 -07:00
Mayhem
a0b8dc7c47 Release 4chan X v3.20.15. 2014-06-20 23:31:48 +02:00
Mayhem
7a8a64e368 Fix #1688. 2014-06-20 13:46:13 +02:00
Mayhem
dcc92a97a4 Fixes as reported by @ccd0. 2014-06-19 15:17:19 +02:00
Mayhem
41c22af15f GM2 incoming! 2014-06-19 04:34:37 +02:00
Zixaphir
4e739e7249 Merge pull request #758 from hotdogman/patch-3
markdown fix
2014-06-17 23:57:56 -07:00
hotdogman
6e2c0d4db5 markdown fix 2014-06-17 22:41:10 -05:00
Mayhem
ace1dc878c rebeccablacktech has HSTS enabled.
Close #1683
2014-06-17 17:38:23 +02:00
Mayhem
e8eca6c919 Close #1682 2014-06-15 13:57:12 +02:00
Zixaphir
44da2a44ab Merge pull request #751 from hotdogman/patch-1
Update archives.json
2014-06-14 23:33:23 -07:00
hotdogman
0fd1ded779 Update archives.json 2014-06-15 00:59:14 -05:00
hotdogman
85832cfb0a Update archives.json 2014-06-15 00:56:11 -05:00
Mayhem
896f7cb75d Merge pull request #1680 from woxxy/v3
Merging Dark Cave in Foolz, enabling /co/ in Foolz
2014-06-14 20:45:52 +02:00
Enzo Moretti
07dac05a4d Merging Dark Cave in Foolz, enabling /co/ in Foolz 2014-06-14 20:41:08 +02:00
Mayhem
6d8501e842 Update archives.json
fuuka.warosu.org -> warosu.org
chan.installgentoo.com is kill
Move Deniable Plausibility before Foolz Beta.
2014-06-13 13:48:28 +02:00
Mayhem
e4506ea489 Merge pull request #1676 from hotdogman/patch-1
Remove /g/ from Deniable Plausibility
2014-06-13 13:06:45 +02:00
hotdogman
1e37f287da Remove /g/ from Deniable Plausibility
Deniable Plausibility stopped archiving /g/, they instead redirect to archive.installgentoo.com now
2014-06-13 03:28:33 -05:00
Mayhem
62ca05ac86 Release 4chan X v3.20.14. 2014-06-13 02:30:39 +02:00
Mayhem
f6bf39e4c3 Bring back proper box model for the catalog.
Effectively reverts:
- 3bc3aabc05347945fb1497e9f2e724e008436d03
- eb26a09ce575b75f53d7c5477aee9ecfe37a9b04
2014-06-13 02:28:53 +02:00
Mayhem
42729c4a47 Disable Download Link. Close #1646 2014-06-13 02:09:14 +02:00
Mayhem
cc4ff57993 Don't double number captchas when reporting too. 2014-06-13 01:55:41 +02:00
Mayhem
a2d0f1ed96 Don't try to refresh the index on /f/. #1662 2014-06-13 01:52:36 +02:00
Mayhem
2d4499380e Remove Remember Subject config. 2014-06-13 01:44:00 +02:00
Mayhem
4c17333f53 Fix #1669. 2014-06-13 01:42:45 +02:00
Mayhem
3e23d567ad Fix #1675. 2014-06-13 01:36:19 +02:00
Mayhem
c3979d5459 Merge pull request #1632 from saxamaphone69/patch-2
Remove prefixed box-sizing
2014-06-13 01:26:41 +02:00
Mayhem
d243e06079 Update deps. 2014-06-13 01:25:04 +02:00
Brandon
994296f2cc fix /f/ sauce 2014-06-05 01:49:34 -07:00
Mayhem
25d5d8e5f7 Merge pull request #1666 from thebladeee/patch-1
Update archives.json
2014-06-02 12:54:20 +02:00
Blade
139490a59d Update archives.json 2014-06-02 03:42:49 -04:00
Mayhem
adcae611b2 Merge pull request #1665 from thebladeee/v3
k
2014-06-02 01:30:07 +02:00
Blade
c56de4396c k
k
2014-06-01 19:27:36 -04:00
Mayhem
dcef66f13f Merge pull request #1661 from pleebe/patch-1
flash archive merged with the rest of 4plebs
2014-05-30 22:48:33 +02:00
Noble pleb
be4e2d8447 flash archive merged with the rest of 4plebs 2014-05-30 23:44:08 +03:00
Zixaphir
b94ebd5d83 Release appchan x v2.9.29. 2014-05-29 10:39:09 -07:00
Zixaphir
e0f0eabee4 Merge remote-tracking branch 'origin/v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-05-29 10:35:18 -07:00
Zixaphir
6a2b382be4 Fix Title Link
Fix zixaphir/appchan-x#733, Fix zixaphir/appchan-x#732
2014-05-29 10:31:01 -07:00
Zixaphir
718513e5ef Release appchan x v2.9.28. 2014-05-27 18:46:46 -07:00
Zixaphir
1ef6701563 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-05-27 18:46:12 -07:00
Zixaphir
f4adf7b72b Linkify fix 2014-05-27 18:45:23 -07:00
Zixaphir
010f0173fc Merge fail 2014-05-27 14:08:05 -07:00
Zixaphir
e4a5701a91 Release appchan x v2.9.27. 2014-05-27 12:43:41 -07:00
Zixaphir
e9d0f21509 Release appchan x v2.9.26. 2014-05-27 12:42:12 -07:00
Zixaphir
13236e18d3 Merge branch 'master' of github.com:zixaphir/appchan-x
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-05-27 12:39:51 -07:00