Commit graph

6042 commits

Author SHA1 Message Date
Nick Winter
6954175fa8 Fixed world.rand.shuffle for arrays of length 0 or 1. 2015-03-06 17:35:11 -08:00
Jorge Klemm
5842481387 Update pt-BR.coffee 2015-03-06 15:16:25 -03:00
Jorge Klemm
b9e2490108 Update pt-BR.coffee 2015-03-06 10:40:02 -03:00
Nick Winter
10f2df3480 Added extra lesson resource links to the Guide. 2015-03-05 08:58:11 -08:00
Imperadeiro98
cbbdd4f3ab Uncommented some headers...
...  and fixed errors from last merge.
2015-03-05 16:32:46 +00:00
Imperadeiro98
40318158c1 Merge pull request #2468 from cookiekrieger/cookiekrieger-patch-2
Cookiekrieger patch
2015-03-05 16:25:42 +00:00
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
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
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
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
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
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
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
Nick Winter
a082d2e05f Merged hu.coffee. 2015-03-02 12:11:54 -08:00
Nick Winter
2fe4be4034 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-03-02 10:23:02 -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
Thejdeep
e6c60a8027 Added a quote 2015-03-02 20:54:30 +05:30
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
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
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
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
b79458d819 Merged es-419.coffee. 2015-02-28 16:09: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
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
Kojo Idrissa
bad3b48af1 reverted "open_source_1" back to "open_source"; changed "open_source_2" to "open_source_contribute" 2015-02-28 15:47:43 -06:00
laituan245
7a19c616c3 Fixed issue #2430 2015-03-01 06:19:35 +09:00
Kojo Idrissa
5812f954f7 added new loading message/tip from prior commit to en-GB & en-US.coffee files 2015-02-28 15:09:12 -06:00
Kojo Idrissa
39f04f0f8b added new load message to level_loading.jade and the English, Traditional Chinese and Simplified Chinese localization files 2015-02-28 15:03:40 -06:00
FedericoTomas
307556d0d1 Update es-419.coffee
now its done, thanks.
2015-02-28 17:03:57 -03:00
Imperadeiro98
2bac9b5607 Merge pull request #2425 from nixel2007/master
Update ru.coffee
2015-02-28 19:48:39 +00:00
Khoffee
b010a9b388 Update names.coffee
Added more names for issue #53
2015-02-28 13:24:20 -06:00
Fahad Iqbal
ea31862e85 Adding a few names 2015-02-28 12:44:54 -06:00
DotTry
d135ba2513 Added 10 names. 2015-02-28 12:39:30 -06:00
FedericoTomas
8cc99adfd6 Update es-419.coffee
Doing some work
2015-02-28 15:32:29 -03:00
Kojo Idrissa
d55e4fecba Added multiple names 2015-02-28 11:58:20 -06:00
nixel2007
6902b7e246 Update ru.coffee 2015-02-28 18:48:36 +03:00
Nick Winter
44008be95f Level Editor doesn't need to load your session or its hero config (or break doing so). Fixed adding unconfigured heroes to levels busting the level. 2015-02-27 21:37:55 -08:00
Matt Lott
86d167394e Remove Segment analytics dependency
Call Google Analytics, Errorception, and Inspectlet directly.
2015-02-27 16:07:41 -08:00
Imperadeiro98
f2f1359e3b Update pt-PT.coffee 2015-02-27 22:54:51 +00:00
Nick Winter
6596912fa4 Propagated i18n. 2015-02-27 14:37:05 -08:00
Nick Winter
00245c69ec Actually activated the previous fix. 2015-02-27 14:07:07 -08:00
Nick Winter
8df779b5a3 Fixed issue of level editor getting super low res when resizing the window when not looking at the ThangsTabView. 2015-02-27 13:49:26 -08:00
Nick Winter
473f9304fd Merge pull request #2412 from h3yduck/navbar_issue
Add "navigation bar" to user profile page (issue 2411)
2015-02-27 13:27:17 -08:00
Szabolcs Gelencser
b022a94cf1 Update hu.coffee 2015-02-27 21:51:42 +01:00
Michael Schmatz
d0d622445f Fixed tracking for non production environments 2015-02-27 14:44:06 -05:00
Michael Schmatz
4efb73d8d7 Switch to new analytics server 2015-02-27 13:45:10 -05:00
Nick Winter
45d4b25c60 Fixed #1048 because I accidentally closed it and then didn't want to reopen it, so figured I might as well fix it as if I meant to do that the whole time. 2015-02-27 09:28:26 -08:00
Szabolcs Gelencser
58f2494c83 update campaign.schema.coffee also 2015-02-27 18:16:16 +01:00
Szabolcs Gelencser
dde3e8cf8f Remove hardcoded treshold values, make it consistent through being able to change the treshold in campaign editor, if desired 2015-02-27 17:33:38 +01:00
Nick Winter
b4e9ee67f0 Added one-minute in-memory server caching for a bunch of common queries. 2015-02-26 17:20:27 -08:00
Nick Winter
9b34d4e166 Ooops, that was just for testing. 2015-02-26 16:04:57 -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
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
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
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
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
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