34 Commits

Author SHA1 Message Date
Zixaphir
1debf61f2e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-05-14 11:40:38 -07:00
Jordan Bates
1fc31411f5 Fix @DoodleChan's styling issues, #69 2013-05-12 21:54:13 -07:00
Zixaphir
d8db801341 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/html/Settings/Advanced.html
2013-05-10 04:58:26 -07:00
Zixaphir
f6de1520ce Fix seaweedchan/4chan-x/issues/62 2013-05-10 04:29:21 -07:00
Zixaphir
5e105642ca Use a textarea for custom navigation. 2013-05-10 04:13:13 -07:00
Jordan Bates
4bc35152e3 Dont add the target, in case of external catalog link 2013-05-10 03:51:42 -07:00
Jordan Bates
6eba459a7b Use , instead of -url 2013-05-10 03:44:27 -07:00
Jordan Bates
f1c2ca4691 External links 2013-05-10 03:25:25 -07:00
Zixaphir
a273828c75 fourchanx-link -> brackets-wrap 2013-05-10 02:55:46 -07:00
Zixaphir
9ce09d216e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Posting/QuickReply.coffee
2013-05-10 02:41:08 -07:00
Jordan Bates
4e7846a7de Add all brackets as .fourchanx-link pseudo-elements, close #67 2013-05-09 23:53:41 -07:00
Jordan Bates
875bc98d0f Catch up to Mayhem, without archive changes 2013-05-09 19:33:33 -07:00
Jordan Bates
3bdf8ef495 Turn shortcut brackets into pseudo-elements, #67 2013-05-09 18:21:37 -07:00
Mayhem
fd5abbc355 Make Main.initStyle start sooner on the catalog. 2013-05-08 23:10:02 +02:00
Zixaphir
5b84565c80 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
2013-05-08 06:24:19 -07:00
Zixaphir
4d365b825d Fix FappeTyme always enabled. 2013-05-08 06:06:57 -07:00
Jordan Bates
20843e8ef7 Remove redundancy 2013-05-08 04:42:40 -07:00
Jordan Bates
4bdd604f0f Fix #63 2013-05-08 03:18:23 -07:00
Zixaphir
cbacb28fa1 Small order change.
Loose file and cruft.
2013-05-08 00:24:44 -07:00
Zixaphir
c40b978e1f Inherited indices too stronk 2013-05-07 23:54:46 -07:00
Zixaphir
57e1d5cf4d Somehow forgot a few... 2013-05-07 21:13:03 -07:00
Zixaphir
7396b327c8 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-05-07 21:09:24 -07:00
Jordan Bates
f6bfd27622 Centered links option 2013-05-07 20:02:19 -07:00
Zixaphir
48bdc81f01 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/css/style.css
2013-05-07 19:16:02 -07:00
Zixaphir
0146f51c4c Header changes. 2013-05-07 18:59:13 -07:00
Jordan Bates
cbc512c46f Fix #58 2013-05-06 22:22:24 -07:00
Zixaphir
ee00d5a3aa Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Posting/QuickReply.coffee
2013-05-03 07:17:59 -07:00
Jordan Bates
1771bcffde Update nyafuu 2013-04-29 14:03:40 -07:00
Zixaphir
77433f5da8 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/img/favicons/Original/unreadDead.gif
	src/General/img/favicons/Original/unreadNSFW.gif
	src/General/img/favicons/Original/unreadSFW.gif
	src/General/img/favicons/dead.gif
	src/General/img/favicons/empty.gif
	src/General/img/favicons/ferongr/unreadDead.gif
	src/General/img/favicons/ferongr/unreadNSFW.gif
	src/General/img/favicons/ferongr/unreadSFW.gif
	src/General/meta/metadata.js
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/features/misc/header.coffee
	src/features/monitoring/favicon.coffee
2013-04-28 21:20:22 -07:00
Nicolas Stepien
8b2eab632b Some custom board nav fixes. 2013-04-29 03:10:44 +02:00
Jordan Bates
4f779ae64d Merge Mayhem X 2013-04-28 10:37:12 -07:00
Nicolas Stepien
010618a6ef Move some html out the code. 2013-04-27 04:30:31 +02:00
Jordan Bates
09baa3feea Merge Mayhem's structure 2013-04-26 14:04:12 -07:00
Nicolas Stepien
a2e87f1200 Structure.
God damn War Thunder, download faster!
2013-04-26 17:40:51 +02:00