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 |
|
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 |
|
seaweedchan
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Zixaphir
|
b6c072dfd1
|
Merge branch 'v3'
|
2013-08-11 14:02:04 -07:00 |
|
Zixaphir
|
00093ffd0c
|
Fix building before release
|
2013-08-11 14:00:01 -07:00 |
|
Zixaphir
|
f49d0b8804
|
Merge branch 'v3'
|
2013-08-10 15:35:18 -07:00 |
|
Zixaphir
|
f8f9142576
|
We don't have stable-v3 like Mayhem does
|
2013-08-10 15:34:57 -07:00 |
|
Zixaphir
|
73ea806592
|
Merge branch 'v3'
Conflicts:
Gruntfile.coffee
LICENSE
builds/crx/script.js
|
2013-08-10 14:41:26 -07:00 |
|
Zixaphir
|
6602bb885d
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
package.json
src/Quotelinks/QuoteYou.coffee
|
2013-08-10 14:37:45 -07:00 |
|
Mayhem
|
1d83ccbc12
|
.nex files are not necessary anymore.
|
2013-08-10 15:48:47 +02:00 |
|
Zixaphir
|
ae9b197d3f
|
Merge branch 'v3'
Conflicts:
builds/crx/script.js
src/General/Settings.coffee
|
2013-08-05 14:38:52 -07:00 |
|
Zixaphir
|
cb30242ae8
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
src/General/Header.coffee
|
2013-08-05 14:37:23 -07:00 |
|
Zixaphir
|
df14b3ffa5
|
Merge branch 'v3'
Conflicts:
LICENSE
|
2013-08-05 00:31:16 -07:00 |
|
Zixaphir
|
d2eef4c4c5
|
Restore concat:meta
|
2013-08-05 00:30:32 -07:00 |
|
Zixaphir
|
217f1cd42c
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Main.coffee
src/Linkification/Linkify.coffee
|
2013-08-04 20:10:29 -07:00 |
|
Zixaphir
|
2fa674c782
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
Gruntfile.coffee
json/archives.json
src/Archive/Redirect.coffee
src/General/lib/$.coffee
src/Monitoring/Unread.coffee
|
2013-08-04 19:44:42 -07:00 |
|
Mayhem
|
82d3afba0a
|
Tweak Gruntfile tasks loading.
|
2013-08-03 00:52:16 +02:00 |
|
Mayhem
|
0b6f66ca81
|
A few alignement tweaks.
|
2013-08-03 00:27:36 +02:00 |
|
James Campos
|
eef94f971c
|
Gruntfile.js -> Gruntfile.coffee
Close #1209
|
2013-08-03 00:15:44 +02:00 |
|
Zixaphir
|
a6d05a6115
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/lib/post.class
src/Posting/QuickReply.coffee
|
2013-07-24 22:17:35 -07:00 |
|
Zixaphir
|
44a2b378ca
|
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
package.json
src/Posting/QuickReply.coffee
|
2013-07-24 21:49:24 -07:00 |
|
seaweedchan
|
c34f6693cb
|
Release 4chan X v1.2.22.
|
2013-07-23 01:54:28 -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
|
d2bcf840ff
|
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
src/Archive/Redirect.coffee
|
2013-07-21 08:43:58 -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 |
|
Jordan Bates
|
71e004af9a
|
I'll no longer be supporting the Opera extension.
|
2013-06-27 07:43:07 -07:00 |
|
Zixaphir
|
97b3069af1
|
close #349
|
2013-06-04 10:48:13 -07:00 |
|
Zixaphir
|
2c2a40c0c9
|
Merge branch 'v3'
Conflicts:
.gitignore
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.js
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-06-01 09:00:56 -07:00 |
|
Zixaphir
|
d64c21854b
|
Make Appchan filters work in webkit.
|
2013-06-01 06:06:29 -07:00 |
|
Zixaphir
|
ab630bd21d
|
This is going to take awhile.
|
2013-05-30 14:42:21 -07:00 |
|
Jordan Bates
|
9685885b01
|
Lets use copy instead of compress
|
2013-05-28 13:51:27 -07:00 |
|
Jordan Bates
|
3535f8919b
|
Meh. Lets just use the crx folder for Opera.
|
2013-05-28 13:44:57 -07:00 |
|
Jordan Bates
|
561d3a004b
|
Opera 15 wants .nex
|
2013-05-28 12:58:53 -07:00 |
|
Jordan Bates
|
a30a5927c8
|
Opera 15 extension
|
2013-05-28 12:40:42 -07:00 |
|
Zixaphir
|
c4a008f402
|
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/General/css/style.css
|
2013-05-10 07:19:08 -07:00 |
|
Jordan Bates
|
ac6f6800d6
|
Changelog styling
|
2013-05-10 05:34:05 -07:00 |
|
Zixaphir
|
5b84565c80
|
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
|
2013-05-08 06:24:19 -07:00 |
|
Zixaphir
|
6a9e334c02
|
Generated by CS
|
2013-05-08 06:14:22 -07:00 |
|
Zixaphir
|
93b94ec9d0
|
Merge branch 'v3' into Av2
Conflicts:
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
builds/version
package.json
src/General/Main.coffee
src/General/css/style.css
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteInline.coffee
|
2013-05-06 16:54:39 -07:00 |
|
Jordan Bates
|
d321baef64
|
Fix #48
|
2013-05-03 15:16:40 -07:00 |
|
Zixaphir
|
ee00d5a3aa
|
Merge branch 'v3' into Av2
Conflicts:
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Main.coffee
src/General/css/style.css
src/General/html/Features/QuickReply.html
src/Posting/QuickReply.coffee
|
2013-05-03 07:17:59 -07:00 |
|
Jordan Bates
|
9c0dd570dd
|
Check for updates
|
2013-05-01 11:30:23 -07:00 |
|
Jordan Bates
|
c5cdbd62df
|
Build
|
2013-04-29 14:23:07 -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 |
|
Jordan Bates
|
bec6181d96
|
Create zip file on release
|
2013-04-26 15:28:27 -07:00 |
|