1334 Commits

Author SHA1 Message Date
Zixaphir
d5a2f609da Let's try seeing if moot will let us not have to force-disable his ads. 2014-04-20 08:28:56 -07:00
Zixaphir
1df9bab835 Force flags. 2014-04-20 08:23:29 -07:00
Zixaphir
0c9a2b9006 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-04-20 08:10:51 -07:00
Zixaphir
871d7820b7 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
2014-04-20 07:15:14 -07:00
Mayhem
71a88631ef Fix #1573. 2014-04-20 13:22:25 +02:00
Zixaphir
03041505af Change defaults to look more like 4chan 2014-04-19 16:57:38 -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
Mayhem
0280214f43 Fix file text building, and spoiler filename parsing. 2014-04-20 01:19:53 +02:00
Mayhem
aa7cf349e8 Fix filename parsing. Close #1568 2014-04-20 00:58:31 +02: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
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
4b3f4d1baf Merge branch 'ccd0' into v3
Conflicts:
	builds/crx.crx
	src/General/Index.coffee
	src/Miscellaneous/Keybinds.coffee
2014-04-12 18:02:25 -07:00
ccd0
ca216894ff "page 0" -> "front page" 2014-04-12 17:21:34 -07:00
ccd0
5ab31d5e75 fix JSON navigation history bugs 2014-04-12 17:02:08 -07:00
ccd0
daff73a2c4 begin migration to new URLs 2014-04-12 09:55:06 -07:00
Mayhem
c7b7795261 Start supporting new semantics. 2014-04-12 18:01:03 +02: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
88b0b0b32f Gallery reflows. 2014-04-10 23:25:46 -07:00
Zixaphir
28eebe0183 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
2014-04-10 23:08:43 -07:00
ccd0
ff057d4f29 configure videos opened in new tab 2014-04-10 01:33:11 -07:00
ccd0
55197a504b remove old updater stuff 2014-04-09 20:53:42 -07:00
ccd0
60f869d818 add .webm, .pdf support to gallery 2014-04-09 02:55:32 -07:00
Nebukazar
823464ce64 Small fixes
Quote Threading disabled by default
Added missing titles to Header icons
Download Link should now appear in the Menu
2014-04-09 01:57:42 +02:00
Zixaphir
b00390b980 Merge branch 'ccd0' into v3
Rebase ImageExpand implemention off ccd0's

Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/Images/ImageExpand.coffee
2014-04-08 14:46:15 -07:00
ccd0
c4962b015a point to the issues page 2014-04-07 21:25:50 -07:00
ccd0
0a3bdbe2c9 fix spacing in settings 2014-04-07 21:22:07 -07:00
ccd0
be50e4b1f4 add 'Expand videos' setting 2014-04-07 21:17:19 -07:00
Zixaphir
7fc970f4c4 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
2014-04-07 18:58:17 -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
cb838359cf Status check 2014-04-07 11:41:25 -07:00
Zixaphir
b04317bf92 Resolve a QR console error 2014-04-07 11:38:04 -07:00
Zixaphir
d2727c4054 Implement webm thumbnail replacement. 2014-04-07 10:33:52 -07:00
Mayhem
fba314e05a Pause videos when they are not visible. #1538 2014-04-07 11:06:34 +02:00
ccd0
c1b1b66ae3 .webm in file shortening 2014-04-06 22:51:55 -07:00
Zixaphir
e286c247ea Merge branch 'ccd0' into v3
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
2014-04-06 22:45:30 -07:00
Zixaphir
13605179cd WebM Gallery Mode. 2014-04-06 22:40:16 -07:00
Zixaphir
23cc92d7cc Sort that shit, yo 2014-04-06 21:58:12 -07:00
ccd0
98514dd986 this should get width fitting working again
hopefully it doesn't break anything else
2014-04-06 21:38:44 -07:00
Zixaphir
46f29fd094 Fix an endless recursion loop 2014-04-06 21:20:58 -07:00
Zixaphir
824f4d3e78 Correctly this time, please 2014-04-06 21:03:29 -07:00
Zixaphir
68a76a25f2 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
	src/General/UI.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
2014-04-06 20:47:38 -07:00
Zixaphir
a2cacec59a Fix header autohide not showing on hover. 2014-04-06 20:33:01 -07:00
ccd0
0f38b9c467 Revert "css fix"
This reverts commit 80b2eae41b62249f728bbdbdcacf649c2620e82b.

Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
2014-04-06 20:10:35 -07:00
ccd0
b2f4a8daf0 turn JSON navigation off by default 2014-04-06 19:21:23 -07:00
ccd0
47eea2a57a implement duckness's upgrade nag disabling option 2014-04-06 16:10:05 -07:00
ccd0
0f770459c0 get new hover working in catalog
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/UI.coffee
	src/Images/ImageHover.coffee
2014-04-06 16:06:11 -07:00
ccd0
74ef633fd7 better approach to hover css
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-06 16:04:36 -07:00