6662 Commits

Author SHA1 Message Date
ccd0
6bcf07ece6 Merge branch 'master' into page1 2014-04-12 21:29:29 -07:00
ccd0
c0ea6f8e95 update quote link regexp to accept /thread/ 2014-04-12 21:28:31 -07:00
ccd0
4ecd6f8cfe res -> thread 2014-04-12 21:16:01 -07:00
ccd0
ba67c7daea Merge branch 'master' into page1 2014-04-12 20:56:47 -07:00
ccd0
6cad2ae377 rewrite relative URL to tolerate slugs 2014-04-12 20:54:45 -07:00
ccd0
bb08d503a9 Merge branch 'master' into page1
Conflicts:
	src/General/Index.coffee
	src/Monitoring/ThreadStats.coffee
2014-04-12 20:39:12 -07:00
ccd0
3206724aea fix nonrebuilding of index
Also hide page list in threads instead of deleting.
2014-04-12 20:22:49 -07:00
ccd0
67ddd00d7b stop page list from appearing in threads 2014-04-12 19:54:03 -07:00
ccd0
1a3f1f5af2 fix Thread Stats bug 2014-04-12 19:34:00 -07:00
ccd0
1d29f64451 indexing bugfixes 2014-04-12 18:52:37 -07:00
ccd0
1182047357 more indexing changes 2014-04-12 18:41:05 -07:00
ccd0
102e5de01e Merge branch 'master' into page1
Conflicts:
	src/General/Index.coffee
2014-04-12 18:40:07 -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
8812d4b326 post building should not depend on JSON navigation 2014-04-12 17:56:44 -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
b6e5d206f1 update page numbering in Index.coffee 2014-04-12 12:02:28 -07:00
ccd0
8a5cd7a610 Release 4chan X v1.7.8. 2014-04-12 10:00:46 -07:00
ccd0
a0e86e9396 update CHANGELOG 2014-04-12 09:59:53 -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
ccd0
1ee5c11968 restore non-JSON navigation keybinds 2014-04-12 04:03:27 -07:00
Mayhem
10ee666e7d rm tmp conversion of hiddenThreads. 2014-04-12 02:03:01 +02:00
Zixaphir
586a048d6e Enable video controls! 2014-04-10 23:40:18 -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
Zixaphir
08aa9b4624 cleanup? 2014-04-10 22:28:27 -07:00
ccd0
2064baa227 Release 4chan X v1.7.7. 2014-04-10 08:59:12 -07:00
ccd0
795d71c238 update CHANGELOG 2014-04-10 08:58:19 -07:00
fgts
2184c6060f Update archives.json 2014-04-10 08:49:25 -07:00
Mayhem
a4b9c303ab Don't leave an extra > when quoting. 2014-04-10 15:34:52 +02:00
Mayhem
57d97e51eb Merge pull request #1553 from fgts/patch-2
Update archives.json
2014-04-10 13:02:44 +02:00
fgts
a2cddaf7cd Update archives.json 2014-04-10 11:53:48 +01:00
ccd0
2889c17e32 Release 4chan X v1.7.6. 2014-04-10 01:40:53 -07:00
ccd0
340bbd7220 update CHANGELOG 2014-04-10 01:38:46 -07:00
ccd0
43ff113fe9 forgot to add this file 2014-04-10 01:35:37 -07:00
ccd0
9d65a93c83 another Gruntfile change 2014-04-10 01:35:21 -07:00
ccd0
ff057d4f29 configure videos opened in new tab 2014-04-10 01:33:11 -07:00
ccd0
1419d5f454 update Gruntfile 2014-04-09 22:42:22 -07:00
ccd0
55197a504b remove old updater stuff 2014-04-09 20:53:42 -07:00
ccd0
855b41f29c remove obsolete/unmaintained files from builds directory 2014-04-09 20:30:59 -07:00
Mayhem
5aa0c3f36d Oops, video.load() actually sets the autoplaying flag to true. 2014-04-09 14:40:55 +02:00
Mayhem
9bb234ab5e Better handling of videos inside of clones. 2014-04-09 14:28:21 +02:00
ccd0
d7ba6cf31d Release 4chan X v1.7.5. 2014-04-09 03:04:15 -07:00
ccd0
60f869d818 add .webm, .pdf support to gallery 2014-04-09 02:55:32 -07:00
Mayhem
259fd0cc89 Release 4chan X v3.20.4. 2014-04-09 10:51:14 +02:00
Mayhem
221973c786 Better asap test for image hover. 2014-04-09 10:34:42 +02:00
Mayhem
662cff6396 Don't keep running waitExpand's asap func when the image error'd. 2014-04-09 10:20:32 +02:00
Mayhem
06e6f84867 Handle webm playback errors with image expansion. 2014-04-09 10:04:51 +02:00