Zixaphir
|
c4fdaea615
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
css/style.css
src/General/Config.coffee
src/General/Main.coffee
src/General/lib/post.class
src/Posting/QuickReply.coffee
|
2013-08-24 13:08:23 -07:00 |
|
Zixaphir
|
ec32e54ef5
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
css/style.css
src/General/Config.coffee
src/General/meta/manifest.json
src/Posting/QuickReply.coffee
|
2013-08-17 21:00:31 -07:00 |
|
seaweedchan
|
2fcbe0bf30
|
Merge Zixaphir X
|
2013-08-14 03:12:10 -07:00 |
|
Zixaphir
|
1f011dfd02
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
html/General/Header.html
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/UI.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteOP.coffee
|
2013-08-14 03:02:03 -07:00 |
|
seaweedchan
|
b9b4efae5e
|
Merge in new thread watcher and change a few things
|
2013-08-13 00:03:29 -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 |
|
Jordan Bates
|
33c1d58d5f
|
Merge Mayhem X
|
2013-05-27 16:14:36 -07:00 |
|
Jordan Bates
|
09baa3feea
|
Merge Mayhem's structure
|
2013-04-26 14:04:12 -07:00 |
|