9 Commits

Author SHA1 Message Date
Zixaphir
efb0ee27bf Release appchan x v2.0.3. 2013-05-10 16:48:16 -07:00
Zixaphir
35b99cdbda Release appchan x v2.0.2. 2013-05-09 03:55:25 -07:00
Zixaphir
597d2fcb76 Release appchan x v2.0.1. 2013-05-08 06:25:24 -07:00
Zixaphir
6d7245ccf1 Release appchan x v2.0.0. 2013-05-07 21:43:11 -07:00
Zixaphir
a03d2b241c Start getting ready to move everything to stable. 2013-05-07 21:36:32 -07:00
Zixaphir
48bdc81f01 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/css/style.css
2013-05-07 19:16:02 -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
Zixaphir
21a0bba285 Merge branch 'v3' into Av2
Conflicts:
	Gruntfile.coffee
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/appchan-x.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/code/main.coffee
	src/code/posting/qr.coffee
	src/css/burichan.css
	src/css/futaba.css
	src/css/photon.css
	src/css/style.css
	src/css/tomorrow.css
	src/css/yotsuba-b.css
	src/css/yotsuba.css
	src/features.coffee
	src/img/favicons/Original/unreadDead.gif
	src/img/favicons/Original/unreadNSFW.gif
	src/img/favicons/Original/unreadSFW.gif
	src/img/favicons/dead.gif
	src/img/favicons/empty.gif
	src/img/favicons/ferongr/unreadDead.gif
	src/img/favicons/ferongr/unreadNSFW.gif
	src/img/favicons/ferongr/unreadSFW.gif
2013-04-16 21:02:47 -07:00
Zixaphir
30880e499a Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.meta.js
	css/style.css
	lib/ui.coffee
	package.json
	src/features.coffee
	src/qr.coffee
2013-04-14 15:36:26 -07:00