6027 Commits

Author SHA1 Message Date
Zixaphir
b7d6fa2659 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
2013-12-16 14:05:03 -07:00
Zixaphir
0e1b8c099c Forgot a return
Also consistency.
2013-12-16 14:03:30 -07:00
Zixaphir
e156cc8e9c Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
	src/General/Config.coffee
	src/Images/FappeTyme.coffee
	src/Linkification/Linkify.coffee
2013-12-16 14:01:47 -07:00
Zixaphir
0cafd9ae61 Merge @mahkoh's embedding fixes 2013-12-16 13:45:56 -07:00
Zixaphir
cc5cf4f124 Update archives 2013-12-16 13:41:12 -07:00
Zixaphir
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -07:00
Zixaphir
a719bbde38 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
2013-12-16 12:56:09 -07:00
Zixaphir
b396ef982f Fix a couple more classes 2013-12-16 12:25:39 -07:00
Mayhem
1f411efb1e Refactor Index.sort and fix hidden+highlighted threads should be at the end. 2013-12-14 18:00:57 +01:00
Mayhem
cfbdf1edb5 Release 4chan X v3.15.0. 2013-12-13 14:23:46 +01:00
Mayhem
9e6cff93ac Merge pull request #1353 from MayhemYDG/index
[WIP] Index navigation improvements - EP03
2013-12-12 16:56:27 -08:00
Mayhem
cf1b6dec3f Changelog. 2013-12-13 01:55:48 +01:00
Mayhem
f34288511b Use the Last-Modified header's date for the index refresh timer.
Instead of showing how long has it been since we refreshed the index,
we show how long has it been since the index has changed on 4chan's side.
That'll be a more meaningful timer when 4chan freezes for example.
2013-12-12 02:18:53 +01:00
Mayhem
3928ae08e0 Fix #1365. 2013-12-12 02:10:53 +01:00
Mayhem
ceff7c5d5f Add Refreshed Navigation setting.
Close #1323, #1332.
2013-12-12 02:03:18 +01:00
Mayhem
f17f9fd441 Anchor hidden threads on the index. 2013-12-12 02:03:18 +01:00
Zixaphir
bdba59eccc Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.coffee
	package.json
	src/Miscellaneous/Keybinds.coffee
2013-12-09 19:00:56 -07:00
Mayhem
d90f461dc1 Update CONTRIBUTING.md 2013-12-09 12:37:22 +01:00
Mayhem
91faa199e4 Move console errors guide to the FAQ. 2013-12-09 12:07:00 +01:00
Mayhem
389bdd7a1e Update CONTRIBUTING.md. 2013-12-09 11:52:37 +01:00
Mayhem
7eb8af1755 Clean before releasing. 2013-12-09 11:37:50 +01:00
Mayhem
542803ade0 Release 4chan X v3.14.3. 2013-12-09 11:25:59 +01:00
Mayhem
6396f4a554 Changelog. 2013-12-09 11:25:35 +01:00
Mayhem
26f0fca675 Fix #1376. 2013-12-09 11:18:24 +01:00
Mayhem
0f259b488d Remove useles div.fileInfo for delted files. 2013-12-09 11:03:02 +01:00
Mayhem
e22aa713b3 axe -> axis 2013-12-07 13:58:44 +01:00
Mayhem
6441852793 Fix #1372. 2013-12-07 13:39:55 +01:00
Mayhem
1609e4996b Fix #1371.
Xpaths are fabulous.
2013-12-07 13:36:48 +01:00
Zixaphir
33bc02d8b0 Release appchan x v2.6.4. 2013-12-06 17:31:20 -07:00
Zixaphir
b5f12847d0 Merge branch 'master' of github.com:zixaphir/appchan-x 2013-12-06 17:29:56 -07:00
Zixaphir
e5e8d3b564 Merge branch 'v3'
Conflicts:
	builds/crx/script.js
2013-12-06 17:29:47 -07:00
Zixaphir
8b14d8bd8f Fix header positions 2013-12-06 17:22:47 -07:00
Zixaphir
6c47fb300a Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Header.coffee
2013-12-06 17:20:48 -07:00
Zixaphir
adaa09aaaa Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Fix some issues with previous merge.

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Header.coffee
	src/Linkification/Linkify.coffee
2013-12-06 17:11:36 -07:00
Mayhem
d46660e633 Only set the file info margin for replies, not OPs. 2013-12-07 00:22:25 +01:00
Mayhem
cff5f21e39 Release 4chan X v3.14.2. 2013-12-07 00:04:23 +01:00
Mayhem
3efffe8a6e Fix 4chan X for markup change. 2013-12-07 00:03:55 +01:00
Mayhem
1e621a7fe4 Fix #1363. 2013-12-05 17:45:00 +01:00
Zixaphir
8fc3a6e329 Merge pull request #493 from mahkoh/liveleak
fix liveleak embed
2013-12-02 20:06:29 -08:00
mahkoh
5930bc031b fix liveleak embed 2013-12-02 22:29:14 +01:00
Mayhem
5e8b5ea7a1 Merge pull request #1361 from aeosynth/link
linkification: only 1 level of balanced parens
2013-12-02 04:17:23 -08:00
James Campos
089090d3c5 linkification: only 1 level of balanced parens 2013-12-02 04:03:38 -08:00
Mayhem
62c81eb5eb Merge pull request #1356 from pleebe/patch-1
Update archives.json
2013-11-29 11:04:03 -08:00
Noble pleb
d71e0951c9 Update archives.json
archiving /pol/ now too
2013-11-29 21:00:19 +02:00
Zixaphir
30b6c08922 Release appchan x v2.6.3. 2013-11-27 17:36:31 -07:00
Zixaphir
12adc14ea0 Release appchan x v2.6.2. 2013-11-27 17:18:16 -07:00
Zixaphir
33c8bdc32d Release appchan x v2.6.1. 2013-11-27 17:04:13 -07:00
Zixaphir
89910d43c5 Release appchan x v2.6.0. 2013-11-27 16:32:35 -07:00
Zixaphir
2f7dd5a185 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
2013-11-26 12:22:13 -07:00
Zixaphir
cadbea75b2 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
2013-11-26 12:19:19 -07:00