2956 Commits

Author SHA1 Message Date
Zixaphir
26f491a0cc Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
2014-04-19 16:54:50 -07:00
ccd0
4f8b640e2c preserve hash when removing slugs 2014-04-19 16:26:37 -07:00
Mayhem
0280214f43 Fix file text building, and spoiler filename parsing. 2014-04-20 01:19:53 +02:00
ccd0
2d5b1646ca remove slugs, at least until moot fixes his HTML 2014-04-19 16:10:05 -07:00
ccd0
480f0e295e disable this piece of CSS entirely for now 2014-04-19 15:59:57 -07:00
ccd0
2848580ca4 remove unwanted hr 2014-04-19 15:59:13 -07: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
ccd0
ec03ab524d Merge branch 'page1' 2014-04-19 15:28:56 -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
a7695e3f4b default keybinds conflicted with text selection 2014-04-13 17:44:13 -07:00
ccd0
a452b732fd change res -> thread in JSON API URLs 2014-04-13 01:46:18 -07:00
ccd0
c5b06f6988 Merge branch 'page1' into newnames 2014-04-13 01:38:24 -07:00
ccd0
9fe486d637 Merge branch 'master' into page1 2014-04-13 01:19:02 -07:00
ccd0
9b90698d59 move page list hiding to CSS 2014-04-12 23:58:57 -07:00
ccd0
93178c2967 fix hiding of icons outside header when icons in header are disabled 2014-04-12 23:50:04 -07:00
ccd0
6c3a0619f6 remove src, thumb from image links 2014-04-12 21:57:40 -07:00
ccd0
a5eb42e14b Merge branch 'page1' into newnames 2014-04-12 21:29:52 -07:00
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
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
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