Zixaphir
ef4a4889d3
Revert flex changes.
2014-06-22 07:55:38 -07:00
Zixaphir
ee841e6f44
CSS updates
2014-06-22 07:44:27 -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
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
Mayhem
60a668f7da
Update deps.
2014-04-29 14:39:44 +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
586a048d6e
Enable video controls!
2014-04-10 23:40:18 -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
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
ccd0
7f3d330ba4
Add updater for Chrom* extension.
2014-04-03 14:03:05 -07:00
ccd0
aa00f8f6f5
fix inclusion of undesired files by build script
2014-04-03 12:15:32 -07:00
Mayhem
a4ef601748
Refactor the catalog thread views business with a class.
2014-01-29 14:32:28 +01: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
Zixaphir
0d29b42a02
This kills the script
...
No, seriously, this commit breaks everything if you open a reply.
It's k, though, that's why this branch exists: so I can break it
all without harming end users and stable development.
Holy carp, though, the amount of errors thrown!
2014-01-09 18:51:49 -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
Zixaphir
ae789f4ad8
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/Index.coffee
src/General/Settings.coffee
src/General/lib/$.coffee
src/Posting/QuickReply.coffee
2013-12-24 16:18:47 -07:00
Zixaphir
b060a9c23e
Cheats.
...
Don't do this. Why am I doing it, then? Because indexOf is so
slooooooooooooooooooooooooooooooooooooooooooooooooooooooooooow
2013-12-24 15:33:39 -07:00
Mayhem
a646d532b2
Split QR.coffee into multiple files.
2013-12-19 04:34:37 +01:00
Mayhem
7eb8af1755
Clean before releasing.
2013-12-09 11:37:50 +01:00
Zixaphir
34140232fb
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/ThreadHiding.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/css/font-awesome.css
src/General/lib/notice.class
src/General/meta/metadata.js
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
worksforme.png
2013-11-23 12:56:42 -07:00
Zixaphir
a3c1afa5cd
Merge -- probably bugged until I sort out everything
...
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
changelog-old
css/style.css
html/General/Settings.html
html/Monitoring/ThreadUpdater.html
html/Monitoring/ThreadWatcher.html
html/Posting/QR.html
package.json
src/Filtering/ThreadHiding.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/lib/post.class
src/General/meta/manifest.json
src/Images/ImageExpand.coffee
src/Meta/banner.js
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/ExpandThread.coffee
src/Miscellaneous/Keybinds.coffee
src/Miscellaneous/Nav.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/ThreadWatcher.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
2013-11-22 17:25:06 -07:00
Mayhem
b8dac71456
Bumping should checkout the main branch before anything else.
2013-11-03 13:58:52 +01:00
Mayhem
bc72f0f763
Create importHTML function, and use it.
2013-11-02 19:21:05 +01:00
Mayhem
47710a7c6e
Build the pagelist dynamically.
2013-11-02 19:21:05 +01:00
Zixaphir
9a07882566
Release appchan x v2.4.1.
2013-10-14 00:57:15 -07: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
7812001d96
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
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/css/style.css
src/Posting/QuickReply.coffee
2013-09-24 14:46:24 -07:00
seaweedchan
6d4da42eb2
Merge Mayhem X
2013-09-22 03:57:03 -07:00
Zixaphir
847078db53
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
json/archives.json
package.json
src/Filtering/Anonymize.coffee
src/General/Config.coffee
src/General/lib/post.class
src/Linkification/Linkify.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QuickReply.coffee
2013-09-20 05:45:04 -07:00
Mayhem
acffb4b7de
Update deps.
2013-09-20 11:26:46 +02:00
Mayhem
995695bcef
Grunt task options can work on a global level.
2013-09-07 13:05:19 +02:00
Zixaphir
d4a3bc8a17
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-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/Settings.coffee
src/General/css/font-awesome.css
src/Images/FappeTyme.coffee
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
2013-08-24 13:57:27 -07:00
Zixaphir
8e4d88eb16
Port Appchan's Gallery
2013-08-22 12:28:55 -07:00
Zixaphir
ccc0335b79
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
LICENSE
css/style.css
html/Monitoring/ThreadWatcher.html
json/archives.json
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/img/favicons/empty.gif
src/Linkification/Linkify.coffee
src/Miscellaneous/ExpandComment.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
2013-08-22 12:10:33 -07:00
Zixaphir
3e2bfee617
Pretty much finish up the Gallery
2013-08-20 09:04:56 -07:00
Zixaphir
1facbe7dc1
Get Flex actually working
2013-08-19 09:06:31 -07:00
Jordan Bates
a847b8d5e3
Release 4chan X v1.2.34.
2013-08-19 07:41:10 -07:00
noface
202d7617e3
Add Linkification.
2013-08-18 20:53:08 +02:00
Zixaphir
72e3fc2585
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/html/Features/QuickReply.html
src/General/img/favicons/xat-/unreadDead.png
src/General/img/favicons/xat-/unreadDeadY.png
src/General/img/favicons/xat-/unreadNSFW.png
src/General/img/favicons/xat-/unreadNSFWY.png
src/General/img/favicons/xat-/unreadSFW.png
src/General/img/favicons/xat-/unreadSFWY.png
src/General/meta/banner.js
src/General/meta/metadata.js
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
2013-08-18 11:17:07 -07:00
Zixaphir
d15f8ee728
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
css/style.css
html/Posting/QR.html
img/changelog/3.2.0/0.png
package.json
src/General/Get.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Notice.coffee
src/General/Notification.coffee
src/General/Settings.coffee
src/General/img/icon.gif
src/General/lib/notification.class
src/Monitoring/Favicon.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteOP.coffee
2013-08-17 20:33:48 -07:00
Mayhem
9efb04435c
fixes
2013-08-17 17:53:44 +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
Mayhem
a19381763f
Use load-grunt-tasks instead of matchdep.
2013-08-16 00:26:37 +02:00
Zixaphir
bc162af707
Remove release task from patches
2013-08-14 04:08:01 -07:00
seaweedchan
2f484d635d
Update updcl
2013-08-14 04:04:44 -07:00
Zixaphir
8442062fb3
Finally fix Release task
2013-08-14 03:44:12 -07:00
Zixaphir
a4b0468698
Revert gruntfile changes
2013-08-14 03:38:18 -07:00
seaweedchan
caf7c67c62
Release 4chan X v1.2.26.
2013-08-12 01:29:44 -07:00
seaweedchan
58d06b4db6
Remove some unwanted changes
2013-08-12 01:21:22 -07:00
