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
|
2064baa227
|
Release 4chan X v1.7.7.
|
2014-04-10 08:59:12 -07:00 |
|
ccd0
|
2889c17e32
|
Release 4chan X v1.7.6.
|
2014-04-10 01:40:53 -07:00 |
|
ccd0
|
d7ba6cf31d
|
Release 4chan X v1.7.5.
|
2014-04-09 03:04:15 -07:00 |
|
ccd0
|
cde38b64dd
|
Release 4chan X v1.7.4.
|
2014-04-08 20:11:23 -07: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
|
1dc57bda8f
|
Release 4chan X v1.7.3.
|
2014-04-07 22:03:46 -07:00 |
|
Zixaphir
|
d215221c71
|
Merge branch 'ccd0' into v3
Conflicts:
LICENSE
builds/4chan-X.user.js
builds/crx.crx
builds/crx/script.js
src/General/Build.coffee
src/Miscellaneous/ExpandThread.coffee
|
2014-04-07 11:26:21 -07:00 |
|
ccd0
|
a35f547cdd
|
Release 4chan X v1.7.2.
|
2014-04-07 03:40:08 -07:00 |
|
ccd0
|
d3397a952c
|
Release 4chan X v1.7.1.
|
2014-04-06 23:59:30 -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
|
711c4587da
|
Release 4chan X v1.7.0.
|
2014-04-06 16:25:39 -07:00 |
|
ccd0
|
11c721a056
|
Skipping 4chan X v1.6.0.
Conflicts:
CHANGELOG.md
|
2014-04-06 16:13:57 -07:00 |
|
ccd0
|
3836813e07
|
Release 4chan X v1.6.0.
|
2014-04-06 10:23:24 -07:00 |
|
ccd0
|
782fd7ad05
|
Merge branch 'v3' of https://github.com/zixaphir/appchan-x
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
|
2014-04-05 18:21:07 -07:00 |
|
ccd0
|
dcda06c40c
|
Merge commit '4b2862641095ffe5a25514fcc82458c72c601543' of https://github.com/zixaphir/appchan-x
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx/script.js
|
2014-04-05 17:36:35 -07:00 |
|
ccd0
|
9245af7a68
|
Release 4chan X v1.5.2.
|
2014-04-04 22:18:54 -07:00 |
|
Zixaphir
|
f6353729eb
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
package.json
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
src/Miscellaneous/FileInfo.coffee
src/Posting/QR.coffee
|
2014-04-04 20:24:12 -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 |
|
ccd0
|
12feb7dc9b
|
Release 4chan X v1.5.1.
|
2014-04-04 15:43:53 -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 |
|
Mayhem
|
f04f411018
|
Release 4chan X v3.20.0.
|
2014-04-05 00:35:50 +02:00 |
|
Mayhem
|
92ac7893d3
|
Update deps.
|
2014-04-04 23:33:01 +02:00 |
|
ccd0
|
3e6dfea6ae
|
Release 4chan X v1.5.0.
|
2014-04-04 13:37:08 -07:00 |
|
ccd0
|
1d6d0518a3
|
Release 4chan X v1.4.7.
|
2014-04-03 16:43:10 -07:00 |
|
ccd0
|
3fa34d3e69
|
fix updates.xml
|
2014-04-03 16:29:35 -07:00 |
|
ccd0
|
f53752c20c
|
use gh-pages for updates
|
2014-04-03 15:59:40 -07:00 |
|
ccd0
|
1aed06b412
|
Release 4chan X v1.4.6.
|
2014-04-03 15:00: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
|
f6dece4b80
|
Release 4chan X v1.4.5.
|
2014-04-03 14:07:56 -07:00 |
|
ccd0
|
6c06100f23
|
Release 4chan X v1.4.4.
|
2014-04-03 12:52:24 -07:00 |
|
ccd0
|
798b2bf2e4
|
Release 4chan X v1.4.3.
|
2014-04-03 05:11:01 -07:00 |
|
ccd0
|
bf6e918d0d
|
Release 4chan X v1.4.2.
|
2014-04-02 21:47:46 -07:00 |
|
Mayhem
|
a4bd81de54
|
Release 4chan X v3.19.5.
|
2014-04-03 01:47:47 +02:00 |
|
Mayhem
|
c5dfd248e6
|
Release 4chan X v3.19.4.
|
2014-03-27 21:31:58 +01:00 |
|
Mayhem
|
2930df7098
|
Release 4chan X v3.19.3.
|
2014-03-20 16:33:49 +01: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
|
d649e5e21e
|
Release 4chan X v3.19.2.
|
2014-03-12 11:42:35 +01:00 |
|
Mayhem
|
d878d1fb4f
|
Update deps.
|
2014-03-12 11:33:39 +01:00 |
|
Mayhem
|
84a53c5d41
|
Release 4chan X v3.19.1.
|
2014-03-10 09:32:15 +01:00 |
|
Mayhem
|
adeb601bd1
|
Update deps.
|
2014-03-10 09:13:08 +01:00 |
|
Zixaphir
|
5a1bebf14d
|
Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
src/Posting/QR.coffee
|
2014-03-01 14:53:36 -07:00 |
|
Kabir Sala
|
3362e3a436
|
Release 4chan X v1.4.1.
|
2014-03-01 18:53:03 +01: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 |
|
Zixaphir
|
553a5a9133
|
Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/script.js
src/General/Index.coffee
src/Posting/QR.coffee
|
2014-02-28 19:37:26 -07:00 |
|
Mayhem
|
5581281c2e
|
Update deps.
|
2014-02-27 15:01:13 +01:00 |
|
Kabir Sala
|
4adbe5a8d9
|
Release 1.4.0
|
2014-02-24 22:56:18 +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 |
|
Zixaphir
|
6884039627
|
Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/script.js
src/Archive/Redirect.coffee
src/Posting/QR.coffee
|
2014-02-23 08:49:32 -07:00 |
|
Mayhem
|
9816866889
|
Release 4chan X v3.19.0.
|
2014-02-22 14:51:58 +01:00 |
|