9081 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alan Hohn	8bf7a29d9e	vagrant node_modules workaround	2015-03-28 22:24:18 -04:00
Alan Hohn	58e05f63fe	add user backup / restore for Vagrant	2015-03-28 18:27:38 -04:00
Nick Winter	11d3f62314	Merge branch 'master' into production	2015-03-28 13:55:06 -07:00
Nick Winter	0b1bb6a4aa	Added admin/pending-patches view. Fixed accepting several kinds of patches. Added keyboard shortcuts for accepting (a) and rejecting (r) patches. Fixed #2490. Fixed #2515. Fixed #2304.	2015-03-28 13:54:44 -07:00
nemoyatpeace	b50c3fbc89	Update the shift-click insertion ... Insertion is now language specific.	2015-03-29 01:14:13 +08:00
Nick Winter	8be5278f98	Merge branch 'master' into production	2015-03-27 16:25:41 -07:00
Nick Winter	37d7b4661c	Possible fix for #2589, but need to test in production.	2015-03-27 16:24:40 -07:00
Matt Lott	532e8133c6	Add graph to sub counts admin page	2015-03-27 15:27:34 -07:00
Matt Lott	1dbb382318	Add auto-refresh to sub counts admin page	2015-03-27 15:27:34 -07:00
Matt Lott	53de6c6134	Add current subscription counts view under the admin page	2015-03-27 15:27:34 -07:00
Nick Winter	155eb4a4a8	Fixed missing disabled success button illustrated image reference.	2015-03-27 14:47:59 -07:00
Popey456963	4309f1108c	Remove Debug	2015-03-27 19:05:55 +00:00
Nick Winter	3137eb05f0	Fix for extra-wide Zero Sum graphic in level info popover.	2015-03-27 11:50:08 -07:00
Popey Gilbert	5b325c7819	Update Vagrantfile	2015-03-27 16:32:04 +00:00
Popey Gilbert	88a2cbeef6	Update Vagrantfile	2015-03-27 16:19:49 +00:00
Imperadeiro98	8d35cea21f	Merge pull request #2586 from nixel2007/ru ... Update ru.coffee. Zero_sum	2015-03-27 15:37:34 +00:00
nixel2007	b2c8f3c1f6	Update ru.coffee. Zero_sum.	2015-03-27 17:23:11 +03:00
Imperadeiro98	a7198d5456	Update pt-PT.coffee	2015-03-27 13:57:53 +00:00
Imperadeiro98	a07523bd04	Merge pull request #2585 from e-jigsaw/archmage-ja ... Translate Archmage page in Japanese	2015-03-27 13:52:50 +00:00
jigsaw	57fb8588b6	Translate Archmage page in Japanese	2015-03-27 16:02:04 +09:00
Nick Winter	647a6ea179	Merge branch 'master' into production	2015-03-26 22:29:27 -07:00
Nick Winter	0e56117642	Fixed adding custom programmableProperties to heroes for specific levels.	2015-03-26 22:29:21 -07:00
Nick Winter	1aec780a39	Merge branch 'master' into production	2015-03-26 22:07:46 -07:00
Nick Winter	4d1babb95e	Propagated i18n for Zero Sum tournament.	2015-03-26 22:06:33 -07:00
Nick Winter	3bfc1a88ce	Slight copy update.	2015-03-26 22:05:52 -07:00
Nick Winter	bbf9628bde	Merge pull request #2582 from AlanHohn/vagrant ... Integrate Vagrant	2015-03-26 21:11:08 -07:00
Nick Winter	ceb81494a0	Preparing for Zero Sum tournament starting tomorrow morning.	2015-03-26 21:05:46 -07:00
Matt Lott	ca761866c0	Update daily Stripe subscriber counts script	2015-03-26 14:12:23 -07:00
Matt Lott	356a70fafa	Update SubscriptionsPerDay.js script	2015-03-26 14:12:23 -07:00
Matt Lott	1841726faf	Purchase event histories script	2015-03-26 14:12:22 -07:00
Alan Hohn	9b22fd2323	Integrate Vagrant	2015-03-26 16:36:38 -04:00
Imperadeiro98	7fa46fac34	Uncommented a translation from last merge	2015-03-26 10:30:19 +00:00
Imperadeiro98	ec00301892	Merge pull request #2578 from matheod/patch-3 ... Add french translation for "teacher" page and polls related content	2015-03-26 10:28:21 +00:00
matheod	07a6273c4b	teachers french translation	2015-03-26 01:17:34 +01:00
Nick Winter	238c36ac74	Merge branch 'master' into production	2015-03-25 16:53:35 -07:00
Nick Winter	7dff105cdf	Insane hackery for #1777 to give us more code editor space, better use of space with tall screens, and scrolling API properties. Watch out for bugs.	2015-03-25 16:47:31 -07:00
matheod	713afaf567	add Poll french translation	2015-03-26 00:34:02 +01:00
matheod	1054f2d293	Add plural at Dégât (damage)	2015-03-26 00:30:56 +01:00
Imperadeiro98	d750c95933	Merge pull request #2573 from matheod/patch-2 ... Correct action_cooldown translation (french translation).	2015-03-25 22:33:55 +00:00
matheod	25cacdd842	Even better translation	2015-03-25 23:22:26 +01:00
matheod	a768846e69	Correct action_cooldown translation.	2015-03-25 23:17:43 +01:00
Imperadeiro98	4e66b906b0	Merge pull request #2572 from matheod/patch-1 ... Two missing spaces on french translation	2015-03-25 21:06:26 +00:00
matheod	b069927983	Add missing space on account page	2015-03-25 21:51:45 +01:00
matheod	1b17836845	Add missing space on diplomat page	2015-03-25 21:29:18 +01:00
Matt Lott	ef0087c8b1	Create bulk prepaids script	2015-03-25 12:23:51 -07:00
Imperadeiro98	a238b8b6db	Fixed indentation in sk.coffee	2015-03-25 12:08:26 +00:00
Imperadeiro98	5259c9ff00	Merge pull request #2571 from cundamic/patch-1 ... Update sk.coffee	2015-03-25 12:05:26 +00:00
cundamic	7732e01b3f	Update sk.coffee ... Why is red default in choose_hero ?	2015-03-25 07:51:08 +01:00
Nick Winter	1feba83fed	Merge branch 'master' into production	2015-03-24 18:57:12 -07:00
Nick Winter	a7244e1567	Tweaking offer triggers.	2015-03-24 18:56:32 -07:00