443 Commits

Author SHA1 Message Date
Zixaphir
d87a889a67 Release appchan x v2.0.4. 2013-05-15 10:51:13 -07:00
Zixaphir
ffaf95ef68 Indent Replies 2013-05-15 09:23:13 -07:00
Zixaphir
70d1d758ec Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-05-15 09:00:09 -07:00
Zixaphir
e4bdad43c7 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 2013-05-15 08:41:47 -07:00
Jordan Bates
f91702b984 Option affects lack of captcha warning as well 2013-05-15 06:11:01 -07:00
Jordan Bates
51dee38f95 Redundancy 2013-05-15 03:41:57 -07:00
Jordan Bates
61813b28d7 Add Mistyped Captcha Errors option 2013-05-15 03:38:31 -07:00
Jordan Bates
68678e671a Revert Mayhem's unread scrolling changes
Too buggy. Threads often don't scroll at all.
2013-05-15 02:43:35 -07:00
Zixaphir
c2fb771fc1 Merge branch 'v3'
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
2013-05-14 19:44:04 -07:00
Zixaphir
dc4c3a5e41 close #303 2013-05-14 19:42:58 -07:00
Jordan Bates
514450be9b Release 4chan X v1.2.4. 2013-05-14 19:39:22 -07:00
Jordan Bates
fc732df167 Mayhem X 2013-05-14 19:29:56 -07:00
Zixaphir
f3d3360300 Close #304 2013-05-14 19:23:22 -07:00
Jordan Bates
2550ab73c1 QR shortcut and link changes
Don't close QR if Persistent, and
Don't close QR on Reply to Thread click
2013-05-14 19:16:55 -07:00
Jordan Bates
b1e06601aa @zixaphir in charge of not making small mistakes :3 2013-05-14 18:08:11 -07:00
Jordan Bates
f4db0a60ff Merge Mayhem X 2013-05-14 13:32:43 -07:00
Zixaphir
4b8b9ad493 Merge branch 'v3'
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	src/General/Settings.coffee
2013-05-14 13:15:39 -07:00
Zixaphir
722e2ebb5d Quoted Title 2013-05-14 12:53:33 -07:00
Zixaphir
57f37a3811 oops. 2013-05-14 12:25:58 -07:00
Zixaphir
86b5b0931c *yawn* 2013-05-14 12:19:07 -07:00
Zixaphir
f6b930a33f Consistency. 2013-05-14 11:45:48 -07:00
Zixaphir
1debf61f2e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-05-14 11:40:38 -07:00
Jordan Bates
7afe8e150e Restyle archiver options 2013-05-14 10:26:53 -07:00
Zixaphir
4a0223d6cd Add some fancy xpath for quote inline workaround. 2013-05-14 09:56:33 -07:00
Zixaphir
1bb474d28f Add board selection to the archive selection.
Close seaweedchan/issues/80
2013-05-14 09:40:50 -07:00
Zixaphir
6bc0e8de92 close seaweedchan/issues/78 2013-05-14 08:57:45 -07:00
Jordan Bates
f11f06c6d6 Release 4chan X v1.2.3. 2013-05-14 08:12:57 -07:00
Jordan Bates
4b0b8df894 Change watcher icon to heart 2013-05-14 07:46:25 -07:00
Jordan Bates
0148aa32d1 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-05-13 22:08:14 -07:00
Jordan Bates
e28116ee3e Dont add - Catalog to title, #69
Didn't work very well anyway.
2013-05-13 22:03:11 -07:00
Zixaphir
78e2d19b55 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 2013-05-13 15:15:59 -07:00
Zixaphir
2074474395 Don't want it, don't need it. 2013-05-13 15:15:08 -07:00
Zixaphir
a507e2c855 Don't use HTTPS for mascots unless we're on HTTPS 2013-05-13 09:30:55 -07:00
Jordan Bates
f4e3629b4c Remove Archive section, put back into Advanced 2013-05-13 07:17:19 -07:00
Jordan Bates
c9858fe863 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-05-13 06:13:36 -07:00
Jordan Bates
ee5635795c Close #73 2013-05-12 22:08:30 -07:00
Jordan Bates
1fc31411f5 Fix @DoodleChan's styling issues, #69 2013-05-12 21:54:13 -07:00
Jordan Bates
7ce69dc091 Fix #75 2013-05-12 21:44:38 -07:00
Zixaphir
36e11ff921 Fix file redirection.
This was all my bad.
2013-05-12 15:34:29 -07:00
Zixaphir
249a739bfc Add @MayhemYDG's archive redirection 2013-05-12 09:00:00 -07:00
Zixaphir
a61e9e703f Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	changelog-old
	json/archives.json
	src/Monitoring/ThreadUpdater.coffee
2013-05-12 07:00:30 -07:00
seaweedchan
39dc661c83 Release 4chan X v1.2.2. 2013-05-11 05:09:24 -07:00
seaweedchan
de497f1d03 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-05-11 05:06:23 -07:00
seaweedchan
045b1aa788 Change description 2013-05-11 05:03:59 -07:00
seaweedchan
c158e0475a Fix #71 2013-05-11 04:58:24 -07:00
seaweedchan
f0f1fdb0b5 Give in and add fixed thread watcher option 2013-05-11 04:31:02 -07:00
Zixaphir
56518cadd2 Merge branch 'v3'
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
2013-05-10 23:00:10 -07:00
Zixaphir
0bb1a4db18 Fix Nav.scroll 2013-05-10 22:59:14 -07:00
Zixaphir
0c8a7bf29d Fix settings importing. 2013-05-10 22:49:59 -07:00
Jordan Bates
8302329b4c Make .current bold 2013-05-10 17:12:25 -07:00