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
|
b9b4efae5e
|
Merge in new thread watcher and change a few things
|
2013-08-13 00:03:29 -07:00 |
|
Zixaphir
|
6c2c9b281a
|
Merge branch 'v3'
Conflicts:
builds/crx/script.js
src/General/Config.coffee
src/General/Settings.coffee
src/Miscellaneous/ExpandComment.coffee
src/Monitoring/ThreadWatcher.coffee
|
2013-08-12 19:22:37 -07:00 |
|
Zixaphir
|
e0895c594a
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
css/style.css
src/Archive/Redirect.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/lib/$.coffee
src/General/lib/databoard.class
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/ThreadWatcher.coffee
|
2013-08-12 18:26:39 -07:00 |
|
seaweedchan
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Mayhem
|
35cfa595bf
|
Shave a line.
|
2013-08-11 23:41:49 +02:00 |
|
Mayhem
|
fbe724a174
|
Fix #1162.
|
2013-08-10 23:50:04 +02: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
|
e95d49f70e
|
Un-Mayhem
|
2013-04-29 23:42:59 -07:00 |
|
Nicolas Stepien
|
b18acfcef2
|
Fix #1076.
|
2013-04-30 03:35:55 +02: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
|
09baa3feea
|
Merge Mayhem's structure
|
2013-04-26 14:04:12 -07:00 |
|
Nicolas Stepien
|
a2e87f1200
|
Structure.
God damn War Thunder, download faster!
|
2013-04-26 17:40:51 +02:00 |
|