Zixaphir
64c9c139c1
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/Archive/archives.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Settings.coffee
src/Images/FappeTyme.coffee
src/Posting/QR.coffee
src/Posting/QR.post.coffee
2014-06-22 07:13:41 -07:00
Zixaphir
f103fd0301
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
package.json
src/Archive/archives.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/Unread.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Posting/QR.post.coffee
2014-06-22 07:04:25 -07:00
Mayhem
42729c4a47
Disable Download Link. Close #1646
2014-06-13 02:09:14 +02:00
Mayhem
2d4499380e
Remove Remember Subject config.
2014-06-13 01:44:00 +02:00
Zixaphir
c04c83f915
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Header.coffee
src/General/Main.coffee
src/General/css/font-awesome.css
src/General/html/Features/Index-navlinks.html
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadStats.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Theming/Banner.coffee
2014-05-03 06:20:04 -07:00
Zixaphir
47a726daca
I don't know why this was changed. Long filenames are shit.
2014-05-03 02:52:39 -07:00
Zixaphir
94332e2f62
Duplicate Config option
2014-05-03 02:05:09 -07:00
Zixaphir
523d6bd9c4
Merge branch 'ccd0' into v3
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx.crx
builds/crx/script.js
src/General/Build.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Navigate.coffee
src/General/css/style.css
src/General/html/Build/post.html
src/General/html/Features/Index-navlinks.html
src/General/lib/post.class
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
src/Miscellaneous/Banner.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Posting/QR.post.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/Quotify.coffee
2014-05-03 02:03:35 -07:00
ccd0
4fe98beb41
update setting description
2014-04-29 04:09:32 -07:00
ccd0
823eace903
begin work on restoring comment expansion
2014-04-19 21:44:13 -07: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
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
a7695e3f4b
default keybinds conflicted with text selection
2014-04-13 17:44:13 -07:00
ccd0
1182047357
more indexing changes
2014-04-12 18:41:05 -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
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
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
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
be50e4b1f4
add 'Expand videos' setting
2014-04-07 21:17:19 -07:00
Zixaphir
d2727c4054
Implement webm thumbnail replacement.
2014-04-07 10:33:52 -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
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
31eac580aa
implement duckness's upgrade nag disabling option
2014-04-06 10:17:26 -07:00
Zixaphir
8536ae3d37
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
builds/updates.xml
latest.js
package.json
2014-04-04 16:12:31 -07:00
Zixaphir
4b28626410
Merge branch 'ccd0' into v3
...
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx/script.js
src/Images/ImageHover.coffee
src/Posting/QR.coffee
2014-04-04 16:10:07 -07:00
Zixaphir
6dcbb80070
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
builds/updates.xml
latest.js
package.json
2014-04-04 16:01:06 -07:00
Zixaphir
e4c395a7cd
Merge branch 'ccd0' into v3
...
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
src/Archive/Redirect.coffee
src/Images/ImageExpand.coffee
2014-04-04 15:41:15 -07:00
ccd0
07d5b9eeb8
global sound option
2014-04-04 15:35:16 -07:00
ccd0
26576b4420
video hover
2014-04-04 15:09:56 -07:00
ccd0
03c25ee34a
add video expansion
2014-04-04 11:56:10 -07:00
Zixaphir
4d46c17073
Merge branch 'vampiric'
2014-04-03 15:33:39 -07:00
Zixaphir
b662cf2366
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/css/style.css
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
2014-04-03 15:19:41 -07:00
Zixaphir
4756274a73
Merge branch 'ccd0' into v3
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
src/Posting/QR.coffee
2014-04-03 14:58:07 -07:00
ccd0
bf6e918d0d
Release 4chan X v1.4.2.
2014-04-02 21:47:46 -07:00
Brandon
fd840d822c
QR Slideup and Tabbed Slideup
...
* upstream/master:
move that where it belongs
fix uploading swfs on /f/
Release appchan x v2.9.10.
Release 4chan X v3.19.5.
Fix captchas, again. #1531
Lets just build that so that we don't have to do so many logic checks
Lets pretend we're smarter than we really are!
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
2014-04-02 20:12:35 -07:00
Zixaphir
53db0118a3
Compact File Text
2014-03-23 18:41:26 -07:00
Zixaphir
fe7d37196f
Merge branch 'v3'
...
Also add Backlink Icons from OneeChan
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
2014-03-23 18:25:34 -07:00
Zixaphir
e459069ae6
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/Config.coffee
src/General/css/style.css
src/Miscellaneous/AnnouncementHiding.coffee
src/Miscellaneous/InfiniScroll.coffee
src/Posting/QR.coffee
2014-03-13 18:12:44 -07:00
Zixaphir
9b9a2980aa
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
README.md
css/style.css
html/General/Header.html
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Settings.coffee
src/Miscellaneous/AnnouncementHiding.coffee
2014-03-13 14:30:39 -07:00
Zixaphir
f685dfe750
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/css/style.css
2014-03-10 12:49:26 -07:00
Zixaphir
0e68fe013f
Separate Quote Markers into options again.
...
Still better than it was in terms of code, tho
2014-03-10 08:55:14 -07:00
Mayhem
06da6b0c9e
Nuke Announcement Hiding setting.
2014-03-10 09:17:33 +01:00
