Brandon
|
f969d7e21a
|
fix #714
|
2014-05-03 12:46:16 -07:00 |
|
Zixaphir
|
7514ff41d4
|
Merge branch 'v3'
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
src/General/Main.coffee
|
2014-05-03 06:39:09 -07:00 |
|
Zixaphir
|
fd76d85c07
|
Invalid string
|
2014-05-03 06:37:49 -07: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
|
0fdeae4e77
|
Consolidate dimension-check code into QR.post.
Reduces redundant generation of video/image elements for thumbnail
generation and dimension check code by merging them into one routine
|
2014-05-03 06:05:28 -07:00 |
|
Zixaphir
|
a1601d8825
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
package.json
src/General/Build.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/lib/post.class
src/Monitoring/ThreadStats.coffee
|
2014-05-03 02:45:58 -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 |
|
Zixaphir
|
ca9b0517de
|
Merge some changes from appchan.
|
2014-05-03 01:09:35 -07:00 |
|
Mayhem
|
a9b05047be
|
Build pathnames taking into account the thread slug.
|
2014-04-30 15:30:46 +02:00 |
|
ccd0
|
9c820f123d
|
Revert "fix moot using a dummy Recaptcha key on several pages"
This reverts commit 74f270c3afa2daf8f64ea75d5f02752822a08579.
Looks like moot has fixed the problem, so we won't need this anymore.
|
2014-04-27 10:56:06 -07:00 |
|
ccd0
|
74f270c3af
|
fix moot using a dummy Recaptcha key on several pages
|
2014-04-27 09:07:06 -07:00 |
|
ccd0
|
d0e9ec84ef
|
dispatch 4chanXInitFinished events when in catalog
|
2014-04-26 20:35:38 -07:00 |
|
ccd0
|
da8ba3cf8c
|
change /res/ URLs to /thread/ so our quote links don't reload the page
|
2014-04-20 10:46:32 -07:00 |
|
Zixaphir
|
1df9bab835
|
Force flags.
|
2014-04-20 08:23:29 -07:00 |
|
ccd0
|
823eace903
|
begin work on restoring comment expansion
|
2014-04-19 21:44:13 -07:00 |
|
ccd0
|
4f8b640e2c
|
preserve hash when removing slugs
|
2014-04-19 16:26:37 -07:00 |
|
ccd0
|
2d5b1646ca
|
remove slugs, at least until moot fixes his HTML
|
2014-04-19 16:10:05 -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 |
|
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
|
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
|
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
|
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 |
|
ccd0
|
730f275406
|
remove unneeded entry from feature initialization list
|
2014-04-05 14:20:18 -07:00 |
|
ccd0
|
342672bab3
|
implement length 1 queue of videos to be deleted
|
2014-04-04 22:11:17 -07:00 |
|
Zixaphir
|
d45f737603
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/Main.coffee
src/General/Navigate.coffee
src/Linkification/Linkify.coffee
|
2014-03-20 09:57:27 -07:00 |
|
Zixaphir
|
18db3994b6
|
Backport fixes from master branch
|
2014-03-20 09:37:27 -07:00 |
|
Zixaphir
|
ca45ed6fe1
|
Typo
|
2014-03-19 07:47:22 -07:00 |
|
Zixaphir
|
3174af1c50
|
Fix an issue causing duplicate backlinks to be generated
Actually, it caused a lot of issues, but that was a big one.
|
2014-03-19 07:38:37 -07:00 |
|
Zixaphir
|
b19149cd15
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
|
2014-03-14 16:03:17 -07:00 |
|
Zixaphir
|
ca9abdc4e7
|
Remove Main.callbacknodes
|
2014-03-14 16:02:19 -07:00 |
|
Zixaphir
|
93b8e75cd6
|
Fix appchan not applying styling to non-board pages.
|
2014-03-08 17:18:02 -07:00 |
|
Zixaphir
|
093dfd169f
|
Merge branch 'v3'
|
2014-03-08 16:25:32 -07:00 |
|
Zixaphir
|
c3a71e0ba3
|
>$.ready
|
2014-03-08 16:25:18 -07:00 |
|
Zixaphir
|
d4d4604e4a
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
|
2014-03-08 16:18:59 -07:00 |
|
Zixaphir
|
cf1a4c1cc4
|
Phase out vanilla catalog
|
2014-03-08 16:14:16 -07:00 |
|
Zixaphir
|
fe8c67e03e
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
CONTRIBUTING.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Navigate.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/html/Features/Index-navlinks.html
src/Miscellaneous/CustomCSS.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/QuoteYou.coffee
|
2014-03-06 20:15:45 -07:00 |
|
Zixaphir
|
3237416133
|
Really though, what did that ever accomplish? Why did I do that?
|
2014-03-06 11:01:10 -07:00 |
|
Zixaphir
|
6760d4b948
|
Fix some issues causing Navigation functions to fail.
|
2014-03-03 00:03:55 -07:00 |
|
Zixaphir
|
a4ead91d65
|
Remove some accidental cruft left from incorrectly merging
Fix some QR bugs, remove references to the 'catalog' g.VIEW
And actually put in QuoteMarkers
|
2014-03-02 18:59:35 -07:00 |
|
Zixaphir
|
811e3ccaf3
|
Use our implementation of Navigating between boards
Our custom navigation should now behave similar to Mayhem's, but
with JSON.
|
2014-02-28 18:56:02 -07:00 |
|
Zixaphir
|
6ba92efcd4
|
Start working on fixing things after the last merge
|
2014-02-28 14:48:24 -07:00 |
|
Zixaphir
|
9d95bbea35
|
Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)
Conflicts:
CHANGELOG.md
Gruntfile.coffee
css/burichan.css
css/futaba.css
css/photon.css
css/style.css
css/tomorrow.css
css/yotsuba-b.css
css/yotsuba.css
html/General/Index-navlinks.html
html/General/Settings-section-Rice.html
html/General/Settings.html
html/Posting/QR.html
json/archives.json
package.json
src/Filtering/PostHiding.coffee
src/Filtering/Recursive.coffee
src/Filtering/ThreadHiding.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/lib/$.coffee
src/General/lib/databoard.class
src/General/lib/post.class
src/General/lib/thread.class
src/Images/ImageExpand.coffee
src/Images/RevealSpoilers.coffee
src/Linkification/Linkify.coffee
src/Menu/Menu.coffee
src/Miscellaneous/ExpandThread.coffee
src/Miscellaneous/IDColor.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.cooldown.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/QuoteCT.coffee
src/Quotelinks/QuoteOP.coffee
src/Quotelinks/QuoteStrikeThrough.coffee
src/Quotelinks/QuoteYou.coffee
src/Quotelinks/Quotify.coffee
|
2014-02-23 14:04:45 -07:00 |
|
Zixaphir
|
8fa130c2df
|
Backport @vampiricwulf's flash features
|
2014-02-23 08:32:06 -07:00 |
|
Zixaphir
|
3a8ccfc237
|
Move Flash features into their own function
Also standardize code
|
2014-02-23 08:23:11 -07:00 |
|
Mayhem
|
ce2b9ee170
|
Add post labelling.
|
2014-02-22 00:17:47 +01:00 |
|
Mayhem
|
61510ca272
|
Add {Post,Thread}::{hide,show}(). Merge reply hiding and thread hiding.
|
2014-02-22 00:17:47 +01:00 |
|