Zixaphir a1601d8825 Merge branch 'mayhem' into v3 ...

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Monitoring/ThreadStats.coffee

2014-05-03 02:45:58 -07:00

..

audio

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

css

Merge branch 'ccd0' into v3

2014-05-03 02:03:35 -07:00

html

Merge branch 'mayhem' into v3

2014-05-03 02:45:58 -07:00

img

Merge commit '4b2862641095ffe5a25514fcc82458c72c601543' of https://github.com/zixaphir/appchan-x

2014-04-05 17:36:35 -07:00

lib

Merge branch 'mayhem' into v3

2014-05-03 02:45:58 -07:00

meta

remove old updater stuff

2014-04-09 20:53:42 -07:00

Build.coffee

Merge branch 'mayhem' into v3

2014-05-03 02:45:58 -07:00

Cheats.coffee

Rethink our indexOf implementation

2014-01-13 12:08:53 -07:00

Config.coffee

Duplicate Config option

2014-05-03 02:05:09 -07:00

Get.coffee

change res -> thread in JSON API URLs

2014-04-13 01:46:18 -07:00

Globals.coffee

I really don't like iterating through objects.

2014-01-14 20:17:44 -07:00

Header.coffee

Merge branch 'ccd0' into v3

2014-05-03 02:03:35 -07:00

Index.coffee

Merge branch 'mayhem' into v3

2014-05-03 02:45:58 -07:00

Main.coffee

Merge branch 'mayhem' into v3

2014-05-03 02:45:58 -07:00

Navigate.coffee

Merge branch 'ccd0' into v3

2014-05-03 02:03:35 -07:00

Settings.coffee

remove src, thumb from image links

2014-04-12 21:57:40 -07:00

UI.coffee

get new hover working in catalog

2014-04-06 16:06:11 -07:00