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
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Zixaphir
|
af48ff03ea
|
Ensure mascot element is passed around correctly
|
2013-06-03 13:36:40 -07:00 |
|
Jordan Bates
|
b75d47e83b
|
CONTRIBUTING -> README
|
2013-05-15 11:26:06 -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
|
b7087b249e
|
These mistakes happen too often for me to not put them in .gitignore
|
2013-04-28 10:45:31 -07:00 |
|
Jordan Bates
|
4f779ae64d
|
Merge Mayhem X
|
2013-04-28 10:37:12 -07:00 |
|