Zixaphir
|
12c22500a8
|
Fix menu dropmarkers
|
2015-01-12 17:25:45 -07:00 |
|
Zixaphir
|
f158c839aa
|
More merging
|
2015-01-09 19:38:31 -07:00 |
|
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
|
41c22af15f
|
GM2 incoming!
|
2014-06-19 04:34:37 +02:00 |
|
Zixaphir
|
df2a5f3fc0
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
|
2014-03-27 13:55:02 -07:00 |
|
Zixaphir
|
cefb710c04
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
css/style.css
package.json
src/General/Header.coffee
|
2014-03-27 13:50:02 -07:00 |
|
Mayhem
|
2e70268ec2
|
Fix #1514.
|
2014-03-20 16:31:11 +01: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 |
|
Mayhem
|
19e1315760
|
Fix #1503, Fix #1504.
|
2014-03-12 11:36:50 +01: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
|
db5cccc70f
|
Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;)
Conflicts:
css/burichan.css
css/futaba.css
css/photon.css
css/tomorrow.css
css/yotsuba-b.css
css/yotsuba.css
html/General/Settings-section-Main.html
html/General/Settings.html
src/Filtering/PostHiding.coffee
src/General/Build.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Settings.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadUpdater.coffee
|
2014-02-28 19:59:04 -07:00 |
|
Mayhem
|
59f2ca6a51
|
rm as many id attributes in posts as possible.
Add root.dataset.fullID, simplify Get.postFromRoot().
Also figured Menu.toggle() could be simplified since stub of threads do not exist anymore.
|
2014-02-27 19:02:32 +01: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 |
|
Mayhem
|
0fac43ee46
|
Switch the menu button on posts to the fontawesome icon.
|
2014-02-08 18:43:40 +01:00 |
|
Mayhem
|
a234bdb2a5
|
Merge pull request #1412 from MayhemYDG/catalog
Drop support for the inline catalog
|
2014-02-05 18:03:40 +01:00 |
|
Mayhem
|
8951e9cd16
|
Move the sticky/closed icons off of Saint Stallman's face.
|
2014-02-03 14:16:36 +01:00 |
|
Mayhem
|
d6030f7df0
|
Set the catalog thumbnail via background image, save one element.
Also tiny fixes here and there.
|
2014-02-03 13:51:25 +01:00 |
|
Mayhem
|
60e89e3f28
|
Add the menu button to threads in the catalog.
|
2014-02-02 23:30:04 +01:00 |
|
Mayhem
|
1aa467b051
|
Remove all inline catalog-related code.
|
2014-01-29 16:25:52 +01:00 |
|
Zixaphir
|
94dd0e555f
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Menu/Menu.coffee
|
2014-01-13 13:25:43 -07:00 |
|
Jordan
|
d914619e69
|
Revert a bit of menu code for #240
|
2014-01-12 19:32:50 -07:00 |
|
Zixaphir
|
bd08bd964d
|
Merge branch 'json' into ajson
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.meta.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/css/font-awesome.css
src/General/css/futaba.css
src/General/css/photon.css
src/General/css/tomorrow.css
src/General/css/yotsuba-b.css
src/General/css/yotsuba.css
src/General/html/Features/Index-navlinks.html
src/General/html/Monitoring/ThreadWatcher.html
src/Images/Gallery.coffee
src/Menu/Menu.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QR.coffee
|
2014-01-11 15:55:46 -07:00 |
|
Jordan
|
f217d94299
|
Menu button changes, close #223
|
2014-01-09 00:23:43 -07:00 |
|
Zixaphir
|
7cde7eb069
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/Menu/Menu.coffee
|
2013-12-27 15:43:08 -07:00 |
|
Zixaphir
|
43751a00b8
|
Fix zixaphir/appchan-x#514, fix zixaphir/appchan-x#513
|
2013-12-27 15:40:21 -07:00 |
|
Zixaphir
|
996080cab9
|
Merge branch 'v3'
Conflicts:
Gruntfile.coffee
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/Menu/Menu.coffee
src/Posting/QR.coffee
|
2013-12-25 11:23:41 -07:00 |
|
Zixaphir
|
b38f63e313
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
Gruntfile.coffee
src/Filtering/PostHiding.coffee
src/General/Build.coffee
src/General/lib/$.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
|
2013-12-25 10:54:21 -07:00 |
|
Mayhem
|
be8371d4c6
|
Optimize Menu.makeButton().
|
2013-12-20 04:14:53 +01:00 |
|
Zixaphir
|
904316e4e0
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
|
2013-10-13 14:42:58 -07:00 |
|
Zixaphir
|
91cedb3b89
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
html/General/Settings-section-Rice.html
img/changelog/3.9.0/0.png
package.json
src/Images/AutoGIF.coffee
src/Images/RevealSpoilers.coffee
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/IDColor.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteInline.coffee
src/Quotelinks/QuotePreview.coffee
src/Quotelinks/QuoteYou.coffee
src/Quotelinks/Quotify.coffee
|
2013-10-13 13:53:38 -07:00 |
|
Mayhem
|
10e93091d7
|
{Post,Thread}::callbacks => {Post,Thread}.callbacks
|
2013-10-02 11:38:15 +02:00 |
|
Zixaphir
|
bc501dc022
|
Merge branch 'v3'
Conflicts:
.gitignore
CHANGELOG.md
LICENSE
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/html/Monitoring/ThreadWatcher.html
src/Images/ImageExpand.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
|
2013-08-15 23:02:54 -07:00 |
|
seaweedchan
|
2fcbe0bf30
|
Merge Zixaphir X
|
2013-08-14 03:12:10 -07:00 |
|
Zixaphir
|
1f011dfd02
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
html/General/Header.html
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/UI.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteOP.coffee
|
2013-08-14 03:02:03 -07:00 |
|
seaweedchan
|
6b98f8acb4
|
Make classes consistent with Mayhem X
|
2013-08-14 02:41:07 -07:00 |
|
Mayhem
|
3581a235e7
|
Fix post menus in stubs.
Also removed some old arguments, fixed some semantics, added Get.threadFromNode, and used it.
|
2013-08-13 16:29:54 +02:00 |
|
seaweedchan
|
570be575e6
|
Release 4chan X v1.2.27.
|
2013-08-12 01:39:20 -07:00 |
|
seaweedchan
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Zixaphir
|
c53b847099
|
Only Appchan has dropmarkers
|
2013-08-10 02:06:42 -07:00 |
|
Zixaphir
|
00675c32bc
|
Merge branch 'v3'
Conflicts:
builds/crx/script.js
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/Quotelinks/QuoteYou.coffee
|
2013-08-09 19:45:24 -07:00 |
|
Zixaphir
|
ee291bad0c
|
Force stub menu to work
|
2013-08-09 19:21:26 -07:00 |
|
Zixaphir
|
22f4dd698a
|
Force stub menu to work
|
2013-08-09 18:52:49 -07:00 |
|
Zixaphir
|
16b35dffce
|
Merge branch 'v3'
Conflicts:
.gitignore
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/Globals.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/UI.coffee
src/General/css/style.css
src/General/meta/manifest.json
src/Posting/QuickReply.coffee
|
2013-07-21 09:01:27 -07:00 |
|
Zixaphir
|
582d067a10
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
CONTRIBUTING.md
Gruntfile.js
README.md
changelog-old
css/style.css
html/Monitoring/ThreadStats.html
html/Posting/QR.html
json/archives.json
package.json
src/Archive/Redirect.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/html/Settings/Filter-guide.html
src/General/lib/$.coffee
src/General/lib/clone.class
src/General/lib/post.class
src/Images/ImageHover.coffee
src/Menu/Menu.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuotePreview.coffee
src/Quotelinks/Quotify.coffee
|
2013-07-21 08:39:40 -07:00 |
|
Mayhem
|
90f75de0e2
|
Simplify Menu code.
|
2013-06-25 16:42:03 +02: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 |
|
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 |
|