8361 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nick Winter	9b34d4e166	Ooops, that was just for testing.	2015-02-26 16:04:57 -08:00
Nick Winter	1221265d08	Merge branch 'master' into production	2015-02-26 15:28:30 -08:00
Nick Winter	5128eae284	Added access to unpublished levels for 'artisan' permissions.	2015-02-26 15:21:08 -08:00
Szabolcs Gelencser	b138001205	for issue #2406	2015-02-26 23:42:37 +01:00
Nick Winter	e881aec7d7	Account button shouldn't show up for anonymous players.	2015-02-26 14:35:41 -08:00
Nick Winter	77bca72002	Added A/B test on whether Signs and Portents or Forgetful Gemsmith is the fourth level. Ran and completed some A/B tests. Turned level indicator in CampaignView white.	2015-02-26 14:24:00 -08:00
Szabolcs Gelencser	eb30daf07a	use nav.profile for i18n	2015-02-26 21:57:05 +01:00
Szabolcs Gelencser	a6ad04af53	Add navbar to profile	2015-02-26 12:19:32 -08:00
Nick Winter	22e7bb8643	Merge branch 'master' into production	2015-02-26 11:34:02 -08:00
Nick Winter	32a95afbd0	Allowing reordering of levels in Campaign. Reversing CampaignEditor levels before save so that when the save magically reverses them again, the order is preserved.	2015-02-26 11:33:07 -08:00
Matt Lott	52bc660391	Add external subs script	2015-02-26 08:44:56 -08:00
Nick Winter	7d2c99acd7	Added attack/health/speed tooltip explanations on hero picker stat comparison bars.	2015-02-26 08:02:22 -08:00
Imperadeiro98	0339d9077a	Merge pull request #2410 from Imperadeiro98/master ... Some fixes	2015-02-26 14:50:35 +00:00
Imperadeiro98	d4c64457b4	Update en.coffee	2015-02-26 14:49:33 +00:00
Imperadeiro98	6a6cd83252	Fixed i18n in about page	2015-02-26 14:48:58 +00:00
Imperadeiro98	ed2f498917	Added i18n to subscribe price	2015-02-26 14:41:40 +00:00
Nick Winter	259718efce	Merge branch 'master' into production	2015-02-25 21:48:07 -08:00
Nick Winter	d310fa9476	Harrowland was being slow in simulator for some reason.	2015-02-25 21:47:57 -08:00
Nick Winter	6868dafb84	Merge branch 'master' into production	2015-02-25 18:41:56 -08:00
Nick Winter	df4b98a9bf	Added a new 'artisan' permission, which can edit most of the things admins can, but with less uncomfortable ultimate power.	2015-02-25 18:41:39 -08:00
Nick Winter	7e889a2a80	Simulating games for Harrowland, now, too. Alternative way of loading hero when sticking with same hero from within level when changing inventory.	2015-02-25 18:09:55 -08:00
Nick Winter	3be2b6406d	Admins are now automatically premium.	2015-02-25 17:45:01 -08:00
Nick Winter	4e11870be0	Fixed bug with anonymous players' email addresses not making it through.	2015-02-25 17:39:54 -08:00
Nick Winter	c8c76e6b74	Trying to track down the cause of InventoryModal loading without a hero assigned.	2015-02-25 16:19:49 -08:00
Nick Winter	b6d8ceafb0	Updating team page and avatars.	2015-02-25 15:40:50 -08:00
Matt Lott	b0665527ed	🐛Update analytics aggregation script slugify ... Mad Maxer: Redemption	2015-02-25 15:05:41 -08:00
Nick Winter	a2a78286da	Fixed #2407 by implementing styles for new subscribe-in-gem-shop design.	2015-02-25 14:24:32 -08:00
George Saines	9adb59f9ad	fixing the buy gems background	2015-02-25 14:21:32 -08:00
Nick Winter	714ff0a249	Merge pull request #2408 from laituan245/master ... Update hero-victory-modal.sass (Issue 1917)	2015-02-25 13:59:52 -08:00
laituan245	e73208f8e8	Update hero-victory-modal.sass	2015-02-26 06:03:17 +09:00
Nick Winter	15ca65f226	Further disabled employer portal for now.	2015-02-25 12:38:51 -08:00
Nick Winter	d58d151b8c	Got rid of debugging code that was making Hour of Code stuff always show up.	2015-02-25 12:32:59 -08:00
Nick Winter	a66e1c5389	Retoring next level highlight arrow for players who are very new when they click off a selected level.	2015-02-25 11:58:03 -08:00
Nick Winter	9be8c55d6f	Started some new Thang name categories for #53.	2015-02-25 11:50:43 -08:00
Matt Lott	8e7183cc51	Merge branch 'master' into production	2015-02-25 11:41:38 -08:00
Matt Lott	39d393c52f	🐛Fix analytics API slugify	2015-02-25 11:39:26 -08:00
Nick Winter	13f9d71cca	You can now use bitcoin to buy gems.	2015-02-25 11:33:51 -08:00
Nick Winter	dec201ad22	Removed watcher emails for overloaded watchers.	2015-02-25 11:16:57 -08:00
Nick Winter	1ab8274c43	Added a clear storage button to the campaign editor.	2015-02-25 11:09:15 -08:00
Imperadeiro98	075f7630ed	Merge pull request #2405 from angryelven-jdd/master ... Update de-DE.coffee	2015-02-25 17:21:50 +00:00
angryelven-jdd	6654cfb410	Update de-DE.coffee ... translated subscription section	2015-02-25 16:05:06 +01:00
Nick Winter	14b03b572d	Merge branch 'master' into production	2015-02-24 18:21:39 -08:00
Nick Winter	1c14059d92	Better console logging for Vectors and shapes.	2015-02-24 18:21:33 -08:00
George Saines	88ebd5f46b	adding subscribe option to buy gems modal	2015-02-24 17:40:50 -08:00
Imperadeiro98	289ddb0a4f	Removed unneeded strong tag from last merge	2015-02-24 21:54:13 +00:00
Imperadeiro98	05cb04968a	Merge pull request #2404 from ChaosCat/patch-3 ... Update he.coffee	2015-02-24 21:51:32 +00:00
Shady Kamal	431b9dca85	Update he.coffee	2015-02-24 23:42:47 +02:00
Nick Winter	be625cbfbe	Merge pull request #2403 from divyanshu013/master ... Bug fix for long hero button text in Russian for #1918	2015-02-24 12:56:55 -08:00
Imperadeiro98	c174cc35fa	Merge pull request #2401 from popey456963/master ... Update teacher.jade	2015-02-24 20:49:13 +00:00
Popey456963	e5c71d0c6a	Changed aimed to recommended	2015-02-24 20:46:49 +00:00