Matt Lott
7620ba00ad
🐛 Remove stripe_invoices API caching
2015-07-09 13:28:55 -07:00
Matt Lott
c25c5e8f97
Improve sub_sponsors API perf
2015-07-09 13:16:57 -07:00
Nick Winter
4f443efd8b
First draft of logic to work out where the code entry points should be.
2015-07-09 12:47:07 -07:00
Nick Winter
fb47efb4f7
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-07-09 12:47:04 -07:00
Matt Lott
591c891b18
Merge branch 'master' into production
2015-07-09 12:21:58 -07:00
Matt Lott
b6724b9d8d
bug:Fix subscriptions API variable naming collision
2015-07-09 12:21:32 -07:00
Nick Winter
dfa0de7521
Bad testing version of code entry point arrow numbering.
2015-07-09 11:45:11 -07:00
Matt Lott
e5f451e906
Merge branch 'master' into production
2015-07-09 10:41:51 -07:00
Matt Lott
6831355649
🐛 Fix subs dashboard monthly churn and perf
...
Use Stripe events API to calculate monthly churn.
Move Stripe API page handling to the client.
2015-07-08 17:34:34 -07:00
Imperadeiro98
a8e59c5302
Updated 'Generate Terrain' strings
2015-07-08 23:20:32 +01:00
Imperadeiro98
ad25f66db0
Update pt-PT.coffee
2015-07-08 22:22:56 +01:00
Nick Winter
be19edb7a1
Merge pull request #2881 from Vikasgupta09/master
...
fix #2867 added i18n to some words of lvl save form
2015-07-07 16:09:53 -07:00
Nick Winter
2f1fb921fe
Merge branch 'j8r-patch-1'
2015-07-07 16:07:52 -07:00
Nick Winter
16407a8ca0
Merged fr.coffee.
2015-07-07 16:07:42 -07:00
Nick Winter
45c249ac27
Not asking for resubscription in buy gems modal if already subscribed.
2015-07-07 11:50:55 -07:00
Nick Winter
51c08eff3b
Propagated i18n.
2015-07-07 11:45:41 -07:00
Nick Winter
07f81755b0
Added deprecation message to old arenas, highlighting new hero arenas instead.
2015-07-07 11:43:38 -07:00
Matt Lott
853f2baf61
Merge branch 'master' into production
2015-07-07 08:21:23 -07:00
Julien Reichardt
9748c80cae
Translation of "concepts" section
2015-07-06 23:57:19 +00:00
Cat Sync
5ab7fd7840
Added 'arguments' to the concepts list, and renamed while loops to just 'Loops', for now
2015-07-06 15:46:18 -04:00
Matt Lott
0c427ff440
Update teachers and sales copy with latest level and hour counts
2015-07-03 13:07:25 -07:00
Matt Lott
f50840a11d
Add headers to campaign level counts script
2015-07-03 13:00:36 -07:00
Matt Lott
ff953dbd5a
Merge branch 'master' into production
2015-07-02 20:04:27 -07:00
Matt Lott
8d258c6943
Update private clans preview image and copy
2015-07-02 18:44:13 -07:00
Matt Lott
6a53237e65
Add member sorting to premium clan dashboard
2015-07-02 15:17:34 -07:00
Imperadeiro98
8a4645ebc6
Updated i18n of 'Status' in clan-details.jade
2015-07-02 21:50:28 +01:00
Matt Lott
a316924576
Add member concept maps to private clans
2015-07-02 13:23:26 -07:00
Matt Lott
a62e0a8fe6
👕 Fix linter warning in mock course details view
...
warn: Linting of app/views/courses/mock1/CourseDetailsView.coffee:
warn: ensure_comprehensions at line 50.
2015-07-02 10:54:22 -07:00
Imperadeiro98
ede3b35368
Fixes to previous merge
2015-07-02 12:47:20 +01:00
Imperadeiro98
74cdc1c3ea
Merge pull request #2882 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-07-02 12:46:17 +01:00
Imperadeiro98
41f2eacff9
Some fixes to previous merge
2015-07-02 12:44:30 +01:00
Imperadeiro98
2f8b0d0b49
Merge pull request #2879 from FedericoTomas/patch-10
...
Update es-419.coffee
2015-07-02 12:43:13 +01:00
Ikuyadeu
8a9ea09eca
Update ja.coffee
2015-07-02 19:20:25 +09:00
Vikas Gupta
4776ff8325
fix #2867 added i18n to some words of lvl save form
2015-07-02 11:40:37 +05:30
Federico Tomas
7e0c5490e0
Update es-419.coffee
...
up guys!.
2015-07-01 23:06:20 -03:00
Matt Lott
af612afcdd
Mock course UI show last expanded complete level
2015-07-01 15:36:33 -07:00
Matt Lott
bee5d53457
Fix clan details html indentation
...
And reorder progress key.
2015-07-01 15:16:21 -07:00
Matt Lott
254d6a9d6b
Add course mock UI for student level progress
2015-07-01 15:16:20 -07:00
Matt Lott
93b41285eb
Merge pull request #2877 from tahmidshahriar/master
...
Add close button to payment methods
Fixes #2694
2015-07-01 13:42:25 -07:00
tahmidshahriar
62b050f6d8
Merge remote-tracking branch 'upstream/master'
2015-07-01 10:54:37 -07:00
tahmidshahriar
f6dd3ce0c8
minimize changes
2015-07-01 10:22:25 -07:00
tahmidshahriar
60e27d386f
add close buttonn to payment methods
2015-07-01 10:20:14 -07:00
Nick Winter
c7dcc1cf9f
Merge branch 'master' into production
2015-06-30 20:52:23 -07:00
Nick Winter
1c5f176c3c
Added recursion to concepts list.
2015-06-30 20:52:10 -07:00
Matt Lott
71fd13276f
Update mock course details page
...
Add individual course session selection, call them classes.
Edit buttons for class name and description.
Rearrange layout.
Update course concept lists to use real values.
Also add class name field to course enrollment page.
2015-06-30 16:53:37 -07:00
Imperadeiro98
90e02cba48
Updated i18n
2015-06-30 20:33:05 +01:00
Imperadeiro98
0ef6dfcc30
Updated i18n in add-thangs-view.jade
2015-06-30 20:33:03 +01:00
Imperadeiro98
92052ceb5b
Update pt-PT.coffee
2015-06-30 19:59:50 +01:00
Nick Winter
4742b23854
Propagated i18n.
2015-06-30 11:29:18 -07:00
Nick Winter
40e1e6b2ac
Merge branch 'master' into production
2015-06-30 11:28:11 -07:00