166 Commits

Author SHA1 Message Date
Zixaphir
ceef9f9edc Fix a bunch of Unread features. 2014-08-17 18:50:21 -07:00
Zixaphir
bc94a3d98c Fix #679 2014-07-31 14:18:15 -07:00
Zixaphir
a0223a8db2 Unbreak a bunch of replace webm thumbnail features. 2014-07-17 13:36:54 -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
Zixaphir
1229786aa5 Merge branch 'v3' 2014-05-03 07:09:44 -07:00
Zixaphir
541882103a Fix backlinks 2014-05-03 07:05:28 -07:00
Zixaphir
c04c83f915 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Theming/Banner.coffee
2014-05-03 06:20:04 -07:00
Zixaphir
e8a3f65c5f Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
2014-05-03 06:09:14 -07:00
Zixaphir
a1601d8825 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Monitoring/ThreadStats.coffee
2014-05-03 02:45:58 -07:00
Zixaphir
523d6bd9c4 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/css/style.css
	src/General/html/Build/post.html
	src/General/html/Features/Index-navlinks.html
	src/General/lib/post.class
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/Banner.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/Quotify.coffee
2014-05-03 02:03:35 -07:00
ccd0
bf45917000 Merge branch 'newnames'
Conflicts:
	src/General/lib/post.class
2014-04-19 16:57:17 -07:00
Zixaphir
d74834d406 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-04-19 16:56:16 -07:00
Zixaphir
26f491a0cc Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
2014-04-19 16:54:50 -07:00
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
ccd0
ac3b09e385 small improvements to file info parsing 2014-04-19 11:24:09 -07:00
ccd0
a54957689a better filename parsing; should fix conflict with Exlinks 2014-04-19 10:41:22 -07:00
ccd0
7aeb46abb9 transition to new HTML 2014-04-19 00:28:19 -07:00
ccd0
6c3a0619f6 remove src, thumb from image links 2014-04-12 21:57:40 -07:00
ccd0
c0ea6f8e95 update quote link regexp to accept /thread/ 2014-04-12 21:28:31 -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
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
d9d2ceb9b1 Merge branch 'ccd0' into v3
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/Get.coffee
	src/Images/Gallery.coffee
2014-04-07 18:35:18 -07:00
ccd0
1ef501fc91 set up clones of videos properly 2014-04-07 17:38:00 -07:00
ccd0
deeba623a0 contract thumbnails in hover preview
... and don't clone the video element
2014-04-07 15:48:56 -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
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
e4c395a7cd Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/Images/ImageExpand.coffee
2014-04-04 15:41:15 -07:00
ccd0
03c25ee34a add video expansion 2014-04-04 11:56:10 -07:00
Zixaphir
0ad639c4a9 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-03-26 15:21:29 -07:00
Zixaphir
f6ea1ed52c Don't clean empty data. 2014-03-26 11:16:05 -07:00
Zixaphir
fe7d37196f Merge branch 'v3'
Also add Backlink Icons from OneeChan

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-03-23 18:25:34 -07:00
Zixaphir
e20a822481 Since we already are generating keys, lets use them. 2014-03-23 17:46:21 -07:00
Zixaphir
4c52d0ee05 comments 2014-03-20 15:19:24 -07:00
Zixaphir
2ac35d9fc8 Move userMascots and userThemes out of Sync storage.
lelwat
2014-03-20 11:17:17 -07:00
Zixaphir
f903abd165 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-03-14 17:09:32 -07:00
Zixaphir
be4be5a94b Fix post fetching 2014-03-14 17:08:00 -07:00
Zixaphir
b19149cd15 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-03-14 16:03:17 -07:00
Zixaphir
ca9abdc4e7 Remove Main.callbacknodes 2014-03-14 16:02:19 -07:00
Zixaphir
a3437ff0ae Merge branch 'v3' 2014-03-11 16:01:24 -07:00
Zixaphir
6bb31cc845 Filtered posts are now added to the PostHiding DataBoard
Fixes #632
2014-03-11 15:59:47 -07:00
Zixaphir
3dd84a69ac Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-03-11 14:57:15 -07:00
Zixaphir
3f438d55ff Tighten up Get.threadFromRoom, Get.contextFromNode 2014-03-11 11:57:30 -07:00
Zixaphir
f685dfe750 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/css/style.css
2014-03-10 12:49:26 -07:00
Zixaphir
c6954ee1bb Forgot a couple. 2014-03-10 08:57:19 -07:00
Zixaphir
fe8c67e03e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/CustomCSS.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteYou.coffee
2014-03-06 20:15:45 -07:00
Zixaphir
5ec17d3477 Fix an oopsie 2014-03-03 12:53:01 -07:00
Zixaphir
7c28da181b Fix ExpandThread without JSON Navigation 2014-03-03 12:41:26 -07:00
Zixaphir
052f491191 Add missing files. 2014-03-03 00:05:42 -07:00