Imperadeiro98
9aa445ef71
Uncommented some translations from last merge
2015-03-05 16:25:27 +00:00
Imperadeiro98
1b4ef93e25
Merge pull request #2471 from javatlacati/patch-2
...
Update it.coffee
2015-03-05 16:20:33 +00:00
Imperadeiro98
9a5adb43cb
Updated license's year to 2015
2015-03-05 16:13:17 +00:00
Nick Winter
77e306412a
Merge pull request #2469 from nixel2007/master
...
Update copy-i18n-tags.coffee.
2015-03-05 07:24:36 -08:00
Imperadeiro98
da64877e44
Merge pull request #2470 from nixel2007/cc-patch
...
Update ru.coffee
2015-03-05 15:01:19 +00:00
javatlacati
edd86ac87b
Update it.coffee
2015-03-05 05:40:03 -06:00
nixel2007
6fafd51d89
Update ru.coffee. Invoice block
2015-03-05 13:11:57 +03:00
nixel2007
1d793fbdf4
Update ru.coffee
2015-03-05 12:17:24 +03:00
nixel2007
40a7061b39
Update copy-i18n-tags.coffee.
...
No inserting {change} to not translated lines
2015-03-05 11:56:24 +03:00
Nick Winter
2cf23fc481
Merge branch 'master' into production
2015-03-04 17:08:55 -08:00
Nick Winter
1c88881b44
Hooked up a next-steps email to be sent on day two.
2015-03-04 17:08:45 -08:00
Matt Lott
b3655779d1
Merge branch 'master' into production
2015-03-04 15:43:35 -08:00
Matt Lott
cd59b90e37
Add custom payments
...
Example:
https://codecombat.com/account/invoices?a=21600&d=9%20monthly%20subscrip
tions
2015-03-04 15:40:53 -08:00
Nick Winter
942bab554a
Restored lost vi translations, with section headers this time, as caught in #2428 .
2015-03-04 14:49:04 -08:00
Nick Winter
3310e2bdbf
Merge branch 'master' into production
2015-03-04 13:55:51 -08:00
Nick Winter
025f1c5afc
Fixed ellipse-ellipse intersection test.
2015-03-04 13:53:57 -08:00
cookiekrieger
77fb084d29
Update de-DE.coffee
2015-03-04 22:24:27 +01:00
cookiekrieger
3a4115d779
Update de-DE.coffee
2015-03-04 22:12:52 +01:00
Nick Winter
687b21620f
Merge branch 'master' into production
2015-03-04 11:29:21 -08:00
Nick Winter
60db16b1c3
Making all code languages load for level editor to avoid busted level previews. Added CoffeeScript compiler to web worker so we can use Referee extraCode.
2015-03-04 11:29:03 -08:00
Matt Lott
29582cecdf
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-03-04 10:24:15 -08:00
Matt Lott
a66e4aabca
Parent email stats script
2015-03-04 10:24:03 -08:00
cookiekrieger
ce8ff52936
Update de-DE.coffee
...
Sometimes I left the originalcode as a commentary behind the text.
I hope this is allowed.
2015-03-04 18:32:41 +01:00
Imperadeiro98
e63f194fd1
Update pt-PT.coffee
2015-03-04 17:19:28 +00:00
Nick Winter
e6cf298ed3
Propagated i18n. A couple other misc tweaks.
2015-03-04 09:00:32 -08:00
Matt Lott
418536ed60
Turn off mailchimp subscribe for unit tests
2015-03-04 05:50:24 -08:00
Michael Schmatz
f024f25235
Add some indexes
2015-03-04 00:04:16 -05:00
Nick Winter
513e78758e
Merge pull request #2461 from nixel2007/master
...
Adds escaping in {change} find
2015-03-03 13:30:15 -08:00
nixel2007
9b4c7b3fdc
Adds escaping in {change} find
2015-03-04 00:15:45 +03:00
Nick Winter
a2cdab8c71
Merge branch 'master' into production
2015-03-03 09:06:49 -08:00
Nick Winter
a2bbc9c893
Actually saving said referrer information.
2015-03-03 09:06:42 -08:00
Nick Winter
2d18bcf9f0
Recording referrer information. Updating parent email prompt to also show after Signs and Portents if that's the fourth level.
2015-03-03 09:04:53 -08:00
Michael Schmatz
d7e8e2f729
Merge pull request #2460 from codecombat/master
...
Merge into production
2015-03-02 19:22:27 -05:00
Michael Schmatz
d0908f694c
Log app server analytics event to the new analytics server
...
I never managed to get the res.close event (responses from the server
are 0-length) I feel like this is a bug with Node I should report.
2015-03-02 19:02:28 -05:00
Scott Erickson
d0ebd50339
Slight tweak to the subscriptionStats, clearing out duplicate customers gotten from invoices.
2015-03-02 13:19:32 -08:00
Scott Erickson
b04a24880a
Fixed subscriptionStats usage instructions.
2015-03-02 12:44:55 -08:00
Nick Winter
1d277faa28
Merge pull request #2453 from nixel2007/nixel2007-patch-1
...
Adding {change} to files when propagination.
2015-03-02 12:37:39 -08:00
Nick Winter
9e1bf20bdf
Merge branch 'h3yduck-translatehu'
2015-03-02 12:12:07 -08:00
Nick Winter
a082d2e05f
Merged hu.coffee.
2015-03-02 12:11:54 -08:00
Nick Winter
887c9454f6
Removed GSoC banner from README.
2015-03-02 11:33:30 -08:00
Nick Winter
2fe4be4034
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-03-02 10:23:02 -08:00
Nick Winter
46cae6361c
Merge branch 'fahadiqbal1-master'
2015-03-02 10:22:16 -08:00
Nick Winter
0f53605c21
Merged names. Added genders to all name categories. Reordered names so ones we need more are towards the top.
2015-03-02 10:22:04 -08:00
Matt Lott
57bfa86719
🐛 Fix IE9 analytics logging CORS problem
...
There’s limited CORS support on IE9.
2015-03-02 10:11:58 -08:00
Nick Winter
86932cafd6
Merge pull request #2454 from thejdeep/master
...
Added a quote
2015-03-02 08:11:46 -08:00
Thejdeep
e6c60a8027
Added a quote
2015-03-02 20:54:30 +05:30
Nikita Gryzlov
8e28608be3
Adding {change} to files when propagination.
...
Fix Issue #2428 https://github.com/codecombat/codecombat/issues/2428
So, how it works.
Dev change some line in en.coffee.
If he add {change} in comment of this line:
* this {change} will be added to all non-en files for this lines
* {change} will be removed from en.coffee
If there is no comment in non-eu - " # {change}" will be added to line
If there is {change} in non-eu already - no doubles of {change}
Old mechanism of syncing comments from en also not broken - if there is a change in comment in eu and {change} in non-eu then new_comment + {change} will be added to non-eu
2015-03-02 14:28:37 +03:00
Nick Winter
a4629d940d
Merge branch 'master' into production
2015-03-01 22:19:19 -08:00
Nick Winter
bb80db9cd5
Server now thinks it's production whenever it's not localhost:3000, rather than whenever it is codecombat.com.
2015-03-01 22:19:01 -08:00
Nick Winter
c309080fca
Merge branch 'master' into production
2015-03-01 21:13:07 -08:00
