ccd0
3f64823fc8
fix data loss when HTTP and HTTPS pages are open in different tabs
2014-09-28 12:40:33 -07:00
ccd0
934f54302a
Remove thread pinning.
2014-09-21 13:04:43 -07:00
ccd0
419627cbf2
Merge branch 'master' into catalog
2014-09-18 19:32:17 -07:00
ccd0
9d58a62e16
Archived thread related bugfixes.
2014-09-18 11:32:15 -07:00
ccd0
5df20a84dc
Merge branch 'master' into catalog
...
Conflicts:
src/General/Index.coffee
src/General/lib/thread.class
2014-09-14 13:57:32 -07:00
ccd0
bb2935a8f4
fix crash on deleting nonexistent item
2014-09-13 22:39:56 -07:00
ccd0
1285b3aeff
Merge branch 'master' into catalog
2014-09-13 01:56:37 -07:00
Mayhem
c292f8af7f
Missing braces.
2014-09-12 18:27:35 -07:00
Mayhem
c3e37a8077
Alt+click to pin threads in the catalog.
...
Conflicts:
css/style.css
2014-09-05 22:24:24 -07:00
ccd0
e810af22ca
remove dead feature disconnection code
2014-06-17 22:54:51 -07:00
Zixaphir
b6749b91a5
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
CONTRIBUTING.md
css/style.css
html/General/Settings-section-Main.html
json/archives.json
package.json
src/Archive/Redirect.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/lib/$.coffee
src/General/lib/thread.class
src/Linkification/Linkify.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadStats.coffee
2014-01-22 12:10:34 -07:00
Zixaphir
6bd1d44b68
Unread Count actually requires the nodes to be on the page
...
Unfortunately
2014-01-10 18:55:33 -07:00
Zixaphir
32641549f2
Unread.disconnect()
2014-01-07 16:03:31 -07:00
Zixaphir
a3c1afa5cd
Merge -- probably bugged until I sort out everything
...
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
changelog-old
css/style.css
html/General/Settings.html
html/Monitoring/ThreadUpdater.html
html/Monitoring/ThreadWatcher.html
html/Posting/QR.html
package.json
src/Filtering/ThreadHiding.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/lib/post.class
src/General/meta/manifest.json
src/Images/ImageExpand.coffee
src/Meta/banner.js
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/ExpandThread.coffee
src/Miscellaneous/Keybinds.coffee
src/Miscellaneous/Nav.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/ThreadWatcher.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
2013-11-22 17:25:06 -07:00
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
d15f8ee728
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
css/style.css
html/Posting/QR.html
img/changelog/3.2.0/0.png
package.json
src/General/Get.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Notice.coffee
src/General/Notification.coffee
src/General/Settings.coffee
src/General/img/icon.gif
src/General/lib/notification.class
src/Monitoring/Favicon.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteOP.coffee
2013-08-17 20:33:48 -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
seaweedchan
af21ad07bc
Merge Mayhem X
2013-06-14 03:14:54 -07:00
Jordan Bates
d35932ba0f
Mayhem X, update changelog
2013-05-20 15:13:06 -07:00
Jordan Bates
f4db0a60ff
Merge Mayhem X
2013-05-14 13:32:43 -07:00
Jordan Bates
09baa3feea
Merge Mayhem's structure
2013-04-26 14:04:12 -07:00
