Commit graph

7786 commits

Author SHA1 Message Date
nixel2007
9b4c7b3fdc Adds escaping in {change} find 2015-03-04 00:15:45 +03: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
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
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
7de6fcf5fd Added Artisan access to LevelComponents. 2015-03-01 20:59:50 -08:00
divyanshu013
ae5aafb24a Added /account link to logged in username for #1635
Clicking on the username should point to /account page of the logged in user.
2015-03-02 01:38:47 +05:30
Nick Winter
dc56a50b75 Handling empty context objects in i18n edit view. 2015-03-01 09:40:14 -08:00
Nick Winter
81b4cfed15 Merge pull request #2449 from popey456963/master
Connect over HTTPS from CONTRIBUTING.MD
2015-03-01 08:23:47 -08:00
Popey456963
5b6f7582ec Revert "Revert "Connect over HTTPS""
This reverts commit 1e9242c707.
2015-03-01 16:16:25 +00:00
Popey456963
1e9242c707 Revert "Connect over HTTPS"
This reverts commit b108c58217.
2015-03-01 16:16:22 +00:00
Popey456963
b108c58217 Connect over HTTPS 2015-03-01 16:16:16 +00:00
Nick Winter
2767fbc7aa Even less emphasis on recent games, for #2448. But we might need something different due to the time-clustered nature of submissions leading to an uneven distribution. 2015-03-01 07:57:21 -08:00
Nick Winter
26c5c17eab Fixed #2427. 2015-03-01 07:51:24 -08:00
divyanshu013
e66d94c59f Bug fix for layout problem in German subscribe for #2409
A small fix adjusting the font sizes.
2015-03-01 20:08:14 +05:30
divyanshu013
fac48752fa A small fix for confusing Hero Modal weaopons list for #1774 2015-03-01 20:08:14 +05:30
Imperadeiro98
321808695f Merge pull request #2446 from nixel2007/master
Update ru.coffee
2015-03-01 13:32:08 +00:00
nixel2007
e1cfd9763f Update ru.coffee
tip_open_source_contribute and clear_storage
2015-03-01 16:11:09 +03:00
Imperadeiro98
f3e7018c88 Re-ordered contributor classes...
... in community view according to contribute page order.
2015-03-01 11:25:23 +00:00
Imperadeiro98
81c234723b Update pt-PT.coffee 2015-03-01 11:20:53 +00:00
Nick Winter
8e37505197 Merge pull request #2442 from DotTry/patch-3
Updated Translation
2015-02-28 16:12:25 -08:00
Nick Winter
c9be09474c Merge pull request #2441 from Coderaulic/patch-1
Update ja.coffee
2015-02-28 16:11:35 -08:00
Nick Winter
f5668a1f09 Merge pull request #2440 from nixel2007/master
Update ru.coffee
2015-02-28 16:11:06 -08:00
Nick Winter
2954925d3b Merge branch 'FedericoTomas-patch-7' 2015-02-28 16:10:05 -08:00
Nick Winter
b79458d819 Merged es-419.coffee. 2015-02-28 16:09:49 -08:00
Nick Winter
a5f1b6b98d Merge branch 'tboutefara-patch-1' 2015-02-28 16:07:49 -08:00
Nick Winter
6de70308aa Merged ar.coffee. 2015-02-28 16:07:34 -08:00
Nick Winter
62b6191862 Merge pull request #2435 from Khoffee/patch-1
Update names.coffee
2015-02-28 16:05:58 -08:00
Nick Winter
62a21acdd0 Merge pull request #2432 from DotTry/patch-1
Added 13 names.
2015-02-28 16:03:41 -08:00
Nick Winter
5bbe330136 Propagated i18n. 2015-02-28 16:00:55 -08:00
Nick Winter
6789a8d6bc Rearranging tip_open_source_contribute link. 2015-02-28 16:00:04 -08:00
Nick Winter
2f9de1a9b2 Merge pull request #2438 from kojoidrissa/master
New Loading messages/Tips
2015-02-28 15:55:23 -08:00
Nick Winter
8df67f993c Merge pull request #2437 from laituan245/issue2430
Fixed issue #2430
2015-02-28 15:52:35 -08:00
DotTry
914817abe9 Updated Translation
A couple of lines.
2015-02-28 17:00:43 -06:00
Coderaulic
0c056769bb Update ja.coffee
Translated all of About Page.
Some minor fix and one off translations here and there.
2015-02-28 14:43:18 -08:00
nixel2007
8f1ef498b5 Update ru.coffee
Fix spelling
2015-03-01 01:39:49 +03:00
Kojo Idrissa
93cc73b490 Merge remote-tracking branch 'upstream/master' 2015-02-28 16:08:12 -06:00