380 Commits

Author SHA1 Message Date
Zixaphir
2efd32a0a6 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
2013-08-30 19:35:10 -07:00
Zixaphir
47bdc73f4c Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	css/style.css
	src/Images/ImageExpand.coffee
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
2013-08-30 18:15:47 -07:00
Mayhem
0e3222312c Remove a Chrome bug notice as it didn't seem to actually work. 2013-08-29 16:18:52 +02:00
Zixaphir
1450e61369 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
	src/Images/Gallery.coffee
2013-08-25 10:11:46 -07:00
Zixaphir
4435b84f3f Sometimes, I'm dumb 2013-08-25 09:13:05 -07:00
Zixaphir
d4a3bc8a17 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-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/Settings.coffee
	src/General/css/font-awesome.css
	src/Images/FappeTyme.coffee
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
2013-08-24 13:57:27 -07:00
Mayhem
de82bd3e45 Give CS loops a hand. 2013-08-23 15:34:42 +02:00
NoneGiven
cb498db8df Typo
It just werx
2013-08-23 02:04:19 +02:00
noface
01146f85c5 Close #1255. 2013-08-23 01:04:44 +02:00
Zixaphir
8e4d88eb16 Port Appchan's Gallery 2013-08-22 12:28:55 -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
Zixaphir
2f9e7a06d7 Fix mascot and theme saving 2013-08-21 03:14:48 -07:00
Zixaphir
54b373c688 Small Gallery. I'm not sure where I'm going with it yet. 2013-08-20 04:46:04 -07:00
Mayhem
f4433ccf4c Merge pull request #1246 from MayhemYDG/linkify
Add Linkification.
2013-08-19 15:45:52 -07:00
Mayhem
abedf85973 Disable error reports if localStorage is blocked. 2013-08-19 20:50:48 +02:00
noface
202d7617e3 Add Linkification. 2013-08-18 20:53:08 +02:00
Zixaphir
72e3fc2585 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Features/QuickReply.html
	src/General/img/favicons/xat-/unreadDead.png
	src/General/img/favicons/xat-/unreadDeadY.png
	src/General/img/favicons/xat-/unreadNSFW.png
	src/General/img/favicons/xat-/unreadNSFWY.png
	src/General/img/favicons/xat-/unreadSFW.png
	src/General/img/favicons/xat-/unreadSFWY.png
	src/General/meta/banner.js
	src/General/meta/metadata.js
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
2013-08-18 11:17:07 -07:00
Zixaphir
162f125e43 Fix #432
For the time being, Mascots have been removed from all none-board
pages (excluding Catalog, which is *technically* a board page, and
can already be changed at the users discretion)
2013-08-18 07:47:23 -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
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
Mayhem
b9afef771d Rename the Notification class to Notice.
To avoid conflicts with window.Notification.
2013-08-17 15:46:21 +02:00
Mayhem
030b1278bc Use Font Awesome to replace "QR" end "EAI".
Hopefully this'll make more sense for some users.
2013-08-16 22:43:02 +02:00
seaweedchan
7f52115b38 Banner changing and title editing
from Appchan X
2013-08-16 01:52:28 -07:00
Zixaphir
bc501dc022 Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/ImageExpand.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
2013-08-15 23:02:54 -07:00
Mayhem
a972183286 Use a static array instead of a stray variable for DataBoard keys. 2013-08-14 17:59:54 +02:00
seaweedchan
39d028c888 Add seaweedchan class 2013-08-14 03:35:42 -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
eeb6ee22a4 Remove redundancy 2013-08-13 00:41:04 -07:00
seaweedchan
b8062b0323 Merge Mayhem X 2013-08-13 00:39:05 -07:00
seaweedchan
b9b4efae5e Merge in new thread watcher and change a few things 2013-08-13 00:03:29 -07:00
Zixaphir
6c2c9b281a Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/General/Config.coffee
	src/General/Settings.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-08-12 19:22:37 -07:00
Mayhem
fb28d20870 Shave a line by removing an useless check. 2013-08-13 03:34:09 +02: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
Mayhem
87b8a3c951 Do not warn Firefox users about missing flexbox support anymore.
4chan X assumes Fx22+.
2013-08-13 03:10:01 +02:00
Mayhem
168944277c 4chan X should attempt to handle this Chrome db corruption bug.
This'll warn users about this bug and show them how to fix it.
2013-08-13 03:07:24 +02:00
Mayhem
a1d238b233 Finish Thread Watcher rewrite. #99 2013-08-12 19:21:16 +02:00
Mayhem
6d36518ea9 Remove the Check for Updates setting.
It's not useful enough to justify keeping it.
2013-08-12 17:26:41 +02:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
00675c32bc Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/Quotelinks/QuoteYou.coffee
2013-08-09 19:45:24 -07:00
Zixaphir
8b992d42ed Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/$.coffee
	src/Miscellaneous/Time.coffee
2013-08-09 19:36:40 -07:00
Zixaphir
dbc8e21297 Merge branch 'v3'
Conflicts:
	builds/crx/script.js
2013-08-08 23:56:30 -07:00
Zixaphir
191dc4911f Initial attempt at implementing 404 redirection when 4chan is down
http://github.com/zixaphir/appchan-x/issues/394
2013-08-08 20:25:36 -07:00
Zixaphir
1a4871a01e Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Main.coffee
	src/Posting/QuickReply.coffee
2013-08-08 14:57:35 -07:00
Zixaphir
ee4ece2574 Fix a few features identifying themselves incorrectly
A few refactors to ColorUserIDs
2013-08-08 14:18:44 -07:00
Mayhem
8c95fe1995 Tweak Dice code. #1218 2013-08-08 11:25:03 +02:00
carboncopy
bcbae6c84f display rolled dice while on /tg/ 2013-08-07 15:53:15 -05:00
Mayhem
39f30c1d0e Slightly simplify $.ajax. 2013-08-07 19:55:25 +02:00
Zixaphir
7a093b26ee Use better practices in my own code. 2013-08-06 16:40:51 -07:00
Zixaphir
724aff27b5 Wow. Just... oops. 2013-08-04 23:50:53 -07:00