60 Commits

Author SHA1 Message Date
Jordan Bates
5ae3e9e775 Fix #166 2013-08-25 17:20:59 -07:00
seaweedchan
128ff46440 Allow enter key to open file dialog once 2013-08-25 01:17:30 -07:00
seaweedchan
6598b5a45e Merge Zixaphir X 2013-08-25 01:15:47 -07:00
seaweedchan
5eb576d5f0 Fix #164 2013-08-24 23:36:07 -07:00
Zixaphir
c4fdaea615 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Posting/QuickReply.coffee
2013-08-24 13:08:23 -07:00
Jordan Bates
7fa776a9c5 Fix #162 2013-08-23 10:52:33 -07:00
Zixaphir
ccc0335b79 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	css/style.css
	html/Monitoring/ThreadWatcher.html
	json/archives.json
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/img/favicons/empty.gif
	src/Linkification/Linkify.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
2013-08-22 12:10:33 -07:00
Jordan Bates
0442192181 Release 4chan X v1.2.34. 2013-08-19 07:38:57 -07:00
Zixaphir
8570d5e63d Attempt to fix QR not clearing successfully 2013-08-18 10:34:52 -07:00
Zixaphir
7fd7c249dc Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
2013-08-18 10:24:51 -07:00
seaweedchan
60ad20f6a5 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-08-18 06:00:23 -07:00
Zixaphir
110f9fe9aa Fix Notifications 2013-08-18 05:18:25 -07:00
seaweedchan
ba1ba0f113 Some final tweaks to the icons 2013-08-18 04:43:26 -07:00
Zixaphir
ce78a9d403 We're just going to use the CSS we want, not the CSS provided. 2013-08-18 04:06:39 -07:00
seaweedchan
1fb2897baa Some shortcut icon tweaks 2013-08-18 03:42:25 -07:00
seaweedchan
5d763b44f1 QR filename editing tweaks 2013-08-18 01:51:07 -07:00
Zixaphir
decf5e4fab Apply icons to all shortcuts, really.
@seaweedchan: This seems more your forte than mine.
2013-08-17 21:11:00 -07:00
Zixaphir
ec32e54ef5 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	css/style.css
	src/General/Config.coffee
	src/General/meta/manifest.json
	src/Posting/QuickReply.coffee
2013-08-17 21:00:31 -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
Jordan Bates
faa8ee63b0 Lets not use try, catch 2013-08-15 20:44:06 -07:00
Jordan Bates
3026299087 Pale Moon support 2013-08-14 18:34:45 -07:00
seaweedchan
2fcbe0bf30 Merge Zixaphir X 2013-08-14 03:12:10 -07:00
Zixaphir
1f011dfd02 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	html/General/Header.html
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
2013-08-14 03:02:03 -07:00
seaweedchan
b9b4efae5e Merge in new thread watcher and change a few things 2013-08-13 00:03:29 -07:00
Zixaphir
e0895c594a Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-08-12 18:26:39 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
seaweedchan
def4727bb3 Redo error message
Close #134
2013-08-11 23:30:38 -07:00
Zixaphir
34e580f475 ~ 2013-08-10 13:54:03 -07:00
Zixaphir
80884e2bde Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/General/Main.coffee
	src/General/lib/$.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
2013-08-07 13:53:35 -07:00
Zixaphir
cb30242ae8 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/General/Header.coffee
2013-08-05 14:37:23 -07:00
Zixaphir
4317526923 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	.gitattributes
	src/Posting/QuickReply.coffee
2013-07-31 17:39:46 -07:00
Zixaphir
44a2b378ca 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/Posting/QuickReply.coffee
2013-07-24 21:49:24 -07:00
Matt Wilmink
aba70b9f15 Fix #118 2013-07-23 22:46:20 -04:00
Jordan Bates
07cb9074e0 Better error message
Close #96
2013-07-22 08:52:18 -07:00
Jordan Bates
c9ec6b5497 Fix #113 2013-07-22 08:38:49 -07:00
Jordan Bates
3e35ced05e Fix captcha caching across threads 2013-07-22 07:52:02 -07:00
Zixaphir
582d067a10 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	changelog-old
	css/style.css
	html/Monitoring/ThreadStats.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Filter-guide.html
	src/General/lib/$.coffee
	src/General/lib/clone.class
	src/General/lib/post.class
	src/Images/ImageHover.coffee
	src/Menu/Menu.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/Quotify.coffee
2013-07-21 08:39:40 -07:00
seaweedchan
af21ad07bc Merge Mayhem X 2013-06-14 03:14:54 -07:00
Jordan Bates
4481b56851 Mayhem X 2013-05-27 06:13:40 -07:00
seaweedchan
d9cad02d72 Fix #86 2013-05-24 23:40:50 -07:00
Jordan Bates
9462910961 Dont really need a title 2013-05-20 01:07:45 -07:00
Jordan Bates
f4059e723d QR link fixes 2013-05-20 01:05:49 -07:00
seaweedchan
ab8977fb6e Restrict click event to link 2013-05-18 03:43:43 -07:00
Jordan Bates
2f9304840d Higher default cooldown on /q/, thanks moot 2013-05-17 04:41:18 -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
fc732df167 Mayhem X 2013-05-14 19:29:56 -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
Zixaphir
6bc0e8de92 close seaweedchan/issues/78 2013-05-14 08:57:45 -07:00