10075 Commits

Author SHA1 Message Date
ccd0
1aba932f8b Revert change to gallery condition.
Thumbnails should not be excluded from the gallery unless they were
already deleted when we loaded the page.
2015-02-06 10:03:25 -08:00
ccd0
f2a498a5dd Merge from Appchan X: src/General/UI.coffee
(The UI.checkbox changes were merged in previous commit e1b63d4a9965aaa5d63e15fd84788921a53def72.)
2015-02-05 22:21:35 -08:00
ccd0
ce1b7301e8 Merge from Appchan X: src/General/Settings.coffee 2015-02-05 22:12:21 -08:00
ccd0
1a3b3012db Merge from Appchan X: src/General/Main.coffee 2015-02-04 16:57:59 -08:00
ccd0
7c32cb37c9 Merge branch 'master' into zixaphir-merge 2015-02-04 15:18:49 -08:00
ccd0
928955021f Release 4chan X v1.9.23.6. 2015-02-04 01:45:40 -08:00
ccd0
b74cf487f6 Pause and mute videos when removing them from the document. 2015-02-04 01:33:21 -08:00
ccd0
a59a036a07 Fix Gallery.error so it can be removed from the image/video. 2015-02-04 01:11:34 -08:00
ccd0
081125fca8 Release 4chan X v1.9.23.5. 2015-02-03 17:02:51 -08:00
ccd0
9f0cfd8e24 Show WebM title on mouseover. 2015-02-03 16:59:05 -08:00
ccd0
cce9da3cf5 Release 4chan X v1.9.23.4. 2015-02-03 11:47:16 -08:00
ccd0
b24ff9d282 Thread posts with multiple quotes provided all of them are ancestors of the last. 2015-02-03 11:45:38 -08:00
ccd0
db9788feff Release 4chan X v1.9.23.3. 2015-02-03 10:40:48 -08:00
ccd0
0000359e6b Merge branch 'bstable' into bbeta
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2015-02-03 10:38:57 -08:00
ccd0
b3f22e4bb2 Release 4chan X v1.9.22.7. 2015-02-03 10:37:55 -08:00
ccd0
0d6d5304fb Revert "Enable pinning of watched threads by default"
This reverts commit 50b98e2a4b7cf207d30b4d6e0240fa2eadd1ce04.
2015-02-03 10:35:43 -08:00
ccd0
8bc8530bea Merge branch 'master' into zixaphir-merge 2015-02-03 01:50:01 -08:00
ccd0
bd13746425 Merge commit '8c17090b3dbc03d50f4e0cabc448eeb6a4e33076' into zixaphir-merge 2015-02-03 01:49:44 -08:00
ccd0
ad26ace94d Release 4chan X v1.9.23.2. 2015-02-03 01:30:13 -08:00
ccd0
aa1d2cda7f Fix custom navigation for unlisted board links (e.g. /qa/) and the 4chan Twitter link. #309 2015-02-03 01:26:35 -08:00
ccd0
8c17090b3d Merge from Appchan X: src/General/Header.coffee 2015-02-03 00:26:13 -08:00
ccd0
e1b63d4a99 Follow Zixaphir in adding space to label in UI.checkbox.
Change settings checkbox (where space was unwanted) to HTML template.
2015-02-03 00:23:44 -08:00
ccd0
7136baeceb Merge from Appchan X: src/General/Header.coffee 2015-02-03 00:17:09 -08:00
ccd0
343c044761 Follow Zixaphir in adding space to label in UI.checkbox.
Change settings checkbox (where space was unwanted) to HTML template.
2015-02-02 22:59:06 -08:00
ccd0
afc505c42e Merge from Appchan X: src/General/Config.coffee 2015-02-02 22:14:34 -08:00
ccd0
747c9f9aad Merge branch 'get-refactor' into zixaphir-merge
Conflicts:
	src/General/Get.coffee
2015-02-02 21:34:57 -08:00
ccd0
332e00342e Merge from Appchan X: src/General/Get.coffee
deferred: adding dataset.fullID for simpler Get.thread/postFromRoot
2015-02-02 21:12:27 -08:00
ccd0
845ebcfad4 Release 4chan X v1.9.23.1. 2015-02-02 19:56:55 -08:00
ccd0
3214f9cd0e Allow hyphens in filter highlight CSS classes. #316 2015-02-02 19:55:37 -08:00
ccd0
b06d3d77ec Add manager capcode. 2015-02-02 19:28:31 -08:00
ccd0
45f8caf2d2 Fix a few more Build.staticPath. 2015-02-02 19:14:39 -08:00
ccd0
e38887df0d Merge from Appchan X: src/General/Build.coffee 2015-02-02 19:13:51 -08:00
Zixaphir
00541ba898 Speed E the fuck up
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Globals.coffee
2015-02-02 19:06:31 -08:00
ccd0
a993cb8244 Merge branch 'master' into zixaphir-merge
Conflicts:
	src/Quotelinks/QuoteThreading.coffee
2015-02-02 12:02:21 -08:00
ccd0
5e78654bdb Release 4chan X v1.9.23.0. 2015-02-02 03:32:35 -08:00
ccd0
9b868b760b Add link to extract titles from WebM metadata. 2015-02-02 02:49:28 -08:00
ccd0
7ab7b178ff Merge branch 'bstable' 2015-02-02 00:11:18 -08:00
ccd0
0e3d00acf0 Release 4chan X v1.9.22.6. 2015-02-02 00:07:12 -08:00
ccd0
97cc25799d Revert "Make 'Image Hover in Catalog' a suboption of 'Image Hover'."
This reverts commit afb1f0a57249398a2f840d6dad2a96c17b1e981a.

Conflicts:
	src/Images/Volume.coffee
2015-02-02 00:05:29 -08:00
ccd0
36a95f5709 Merge branch 'bbeta' 2015-02-01 18:43:50 -08:00
ccd0
ea546ecfb8 Release 4chan X v1.9.22.5. 2015-02-01 18:25:22 -08:00
ccd0
9881cfb2da Another unwanted comprehension. 2015-02-01 18:22:57 -08:00
ccd0
d46cda1002 Make scroll wheel volume adjustments finer at low volumes. 2015-02-01 18:13:49 -08:00
ccd0
136be3763f Turning off threading should hide the "Thread New Posts" link.
Also simplify a little.
2015-02-01 16:28:51 -08:00
ccd0
742184d2c0 Merge from Appchan X: src/Quotelinks
deferred: QuoteBacklinks.coffee, QuoteMarkers.coffee, and related changes (including change in QuoteInline.qiQuote)
2015-02-01 16:12:36 -08:00
ccd0
f89904f4e4 Edit changelog note a bit. 2015-02-01 16:09:03 -08:00
ccd0
0ec6b290a6 Merge from Appchan X: src/Quotelinks
deferred: QuoteBacklinks.coffee, QuoteMarkers.coffee, and related changes (including change in QuoteInline.qiQuote)
2015-02-01 15:42:37 -08:00
ccd0
c70921e176 Merge branch 'master' into zixaphir-merge
Conflicts:
	src/Filtering/Filter.coffee
	src/General/Index.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee
2015-02-01 13:41:36 -08:00
ccd0
891394af41 Release 4chan X v1.9.22.4. 2015-02-01 11:47:34 -08:00
ccd0
63e0398f51 Fix syncing of mute/volume settings between tabs. 2015-02-01 11:46:21 -08:00