Commit graph

6102 commits

Author SHA1 Message Date
Matt Lott
5264fc6181 🐛Fix subscription view just subscribed alert message 2015-03-13 15:51:47 -07:00
Matt Lott
af89452b93 Merge branch 'sponsored-subs' 2015-03-13 15:19:20 -07:00
Nick Winter
3ff41f5619 Rewriting sample code dynamically to fix findNearestEnemy / findNearest(findEnemies) issues. 2015-03-12 11:08:58 -07:00
Nick Winter
83a72d3030 Merge pull request #2514 from Catsync/mountain-generator
Added mountain terrain generator
2015-03-12 10:42:48 -07:00
Cat Sync
90d7159501 Added mountain terrain generator 2015-03-12 13:31:21 -04:00
Jorge Klemm
b26f9f1f6a Correcting translate word Items to Itens on pt-BR translation 2015-03-12 13:14:38 -03:00
Jorge Klemm
571f69b2de Translate and adjust some words. 2015-03-12 10:57:00 -03:00
Jorge Klemm
a6c39714aa Adding me as a Diplomat. 2015-03-12 10:52:09 -03:00
Nick Winter
3458f2069b Temporary workaround for #2512. Identifying ageRange. Made poll header slightly smaller. 2015-03-11 20:21:54 -07:00
JCesar91
661d94bf33 Update es-419.coffee 2015-03-11 19:42:28 -05:00
Imperadeiro98
9fedd1f838 Some cleanup to play-items-modal.sass file 2015-03-11 22:13:16 +00:00
Nick Winter
a697b35920 Fixed poll fetching for first poll. 2015-03-11 09:01:40 -07:00
Nick Winter
7b20bf469a Merge pull request #2504 from nixel2007/patch-2
More humane view of i18n-editor
2015-03-11 08:16:12 -07:00
nixel2007
e5c8fc4a1c More humane view of i18n-editor
Change the layout to
Description
en
non-en
2015-03-11 16:45:35 +03:00
nixel2007
01c2cfce7c Update play-heroes-modal.sass for ru 2015-03-11 15:41:39 +03:00
laituan245
ae07a69bd7 Fixed issue #2497 2015-03-11 13:01:15 +09:00
laituan245
599f18344e Fixed issue #2497 for 'ru', 'pt-PT', and 'pt-BR' 2015-03-11 12:16:03 +09:00
Nick Winter
4ff4306366 Added latest i18n keys to de-DE.coffee again. Added some bottom margin on Component configuration screen for dropdowns. 2015-03-10 16:13:34 -07:00
Michael Nix
4cf4ae6ad7 fixes typos in de-DE.coffee
Email is actually E-Mail. Email is a different word altogether. Maybe next commit.
2015-03-10 23:36:35 +01:00
Imperadeiro98
68c317d4a2 Update pt-PT.coffee 2015-03-10 22:01:53 +00:00
Imperadeiro98
a2665258da Better styling for pt-PT in subscribe modal 2015-03-10 22:00:09 +00:00
Nick Winter
b0dc743126 Tweaks to #2418. 2015-03-10 14:49:50 -07:00
Nick Winter
f2ab176fd6 Merge pull request #2418 from divyanshu013/master
A small fix for confusing Hero Modal weaopons list for #1774
2015-03-10 14:42:31 -07:00
Nick Winter
0992b7bdea Propagated i18n. 2015-03-10 14:41:53 -07:00
Nick Winter
439e6f7b4e Merged pt-BR.coffee. 2015-03-10 14:40:22 -07:00
Nick Winter
8fc893dd6f Fixed a couple issues with errors during incompletely loaded levels or weird child window global situations using level editor. 2015-03-10 14:37:12 -07:00
Nick Winter
1be0852872 Merge pull request #2496 from nixel2007/patch-1
Update DiplomatView.coffee
2015-03-10 14:28:58 -07:00
Imperadeiro98
f202276917 Some fixes to last merge 2015-03-10 21:18:00 +00:00
Imperadeiro98
beea14697a Merge pull request #2498 from philosomatiker/patch-1
Update de-DE.coffee
2015-03-10 21:12:55 +00:00
Markus Plößer
bec8dca9bc Update de-DE.coffee 2015-03-10 22:00:49 +01:00
Imperadeiro98
74f266f44b Uncommented some translations 2015-03-10 20:55:44 +00:00
Markus Plößer
bd565f9682 Update de-DE.coffee
- some spell checkings corrected;
- translated a few more lines of "teachers" category
2015-03-10 21:14:06 +01:00
Nikita Gryzlov
321ca1eb2b Fix Issue #2495 2015-03-10 20:16:43 +03:00
Nick Winter
9c99fc455a A few poll fixes. 2015-03-10 09:45:21 -07:00
Nick Winter
dc5fb0af14 Sending a couple more offers in the next-steps emails. 2015-03-09 16:32:29 -07:00
Matt Lott
031337e472 Remove GA main.html default code pageview
Pageviews are covered by Backbone plumbing instead.
2015-03-09 12:57:10 -07:00
Matt Lott
5a0a4d1446 No auto-fullscreen for admins 2015-03-09 12:57:10 -07:00
Matt Lott
6db4d72dc4 Track pageviews for manual calls to navigate 2015-03-09 12:57:10 -07:00
Nick Winter
652fb3cd3f Poll doesn't need to saveBackups except in the poll editor. 2015-03-09 11:52:22 -07:00
Nick Winter
54f55b1f9d Adding polls as patchable. 2015-03-09 11:48:13 -07:00
Nick Winter
e58734894a Tweaked style on space-disabling and default-locking by player level. 2015-03-09 10:50:00 -07:00
Nick Winter
f5633f05dc Merge pull request #2414 from h3yduck/lock_issue
Only lock spacebar and default code when the player is lower level (issue 2406)
2015-03-09 10:37:40 -07:00
Nick Winter
18e6907284 Merge pull request #2488 from nixel2007/master
Update ru.coffee. Polls
2015-03-09 10:34:45 -07:00
Nick Winter
57b8c06dc4 Merge pull request #2483 from javatlacati/patch-2
Update es-419.coffee
2015-03-09 10:33:16 -07:00
Nick Winter
76b6ccad30 Merge pull request #2482 from jklemm/master
Translate to pt-br
2015-03-09 10:29:52 -07:00
Nick Winter
efe1b77e9e First poll should be askable. 2015-03-09 09:51:15 -07:00
Nick Winter
495845a633 Storing certain poll results in User object. Showing a poll once per day. 2015-03-09 09:30:51 -07:00
nixel2007
aa98001d36 Update ru.coffee. Polls 2015-03-09 17:11:13 +03:00
jose alves sousa neto
7001bc5b38 Update pt-BR.coffee 2015-03-08 23:08:40 -04:00
Nick Winter
e21360127d Polls! 2015-03-08 16:36:17 -07:00
javatlacati
3a3e445be5 Update es-419.coffee
Some update on translation.
2015-03-08 03:53:37 -06:00
Jorge
dedb001bdd Translate more lines to portuguese brasilian. 2015-03-08 00:49:29 -03:00
Jorge
398ac998ab Merge branch 'master' of https://github.com/jklemm/codecombat 2015-03-07 23:21:35 -03:00
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