codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
9414 commits 27 branches 0 tags 134 MiB
Commit graph

7362 commits

Author SHA1 Message Date
Imperadeiro98
d2c6540c2d Merge pull request #3137 from evvanderplas/patch-1 
Update nl-NL.coffee: typos, grammar
 2015-10-28 14:33:09 +00:00
Nick Winter
a970f322f9 Merge pull request #3132 from Imperadeiro98/i18n-updates 
Updated i18n across some files
 2015-10-28 06:41:35 -07:00
Nick Winter
cfd6862222 Merge pull request #3129 from Driphter/master 
Added non-mutating methods for Vectors in player code
 2015-10-28 06:38:07 -07:00
Nick Winter
20f2abfb37 Propagate i18n 2015-10-28 06:26:01 -07:00
Nick Winter
ead9cf11df Add Estonian locale stub 2015-10-28 06:25:42 -07:00
Rob
da92e15bfb Give some API properties priority in autocomplete. 2015-10-27 23:23:43 -04:00
Scott Erickson
6e1cb8a1d1 Add owner name to course details page 2015-10-27 17:47:48 -07:00
Scott Erickson
9e04d425cc Levels link in ControlBarView goes to last visited course instance page for course levels 2015-10-27 17:04:07 -07:00
Imperadeiro98
e1b10183eb Some cleanups to subscription-view.jade 2015-10-27 21:57:49 +00:00
Scott Erickson
af7bb08dc3 List courses you are in at the top of /courses 2015-10-27 13:58:45 -07:00
Scott Erickson
a5793630c2 Stop showing ChooseHero tab in GameMenu for course and course-ladder levels 2015-10-27 13:21:39 -07:00
Scott Erickson
7641216fd0 Make not supported mobile message on /courses landing page 2015-10-27 12:43:54 -07:00
Scott Erickson
66afb10f91 Fix a useful trailing whitespace that was removed 
My work machine editor's settings were changed, but not my home editor.
Both have now been fixed. I reviewed the template and this was the only significant
whitespace that was removed, I believe.
 2015-10-27 12:29:32 -07:00
Scott Erickson
b736feb017 Refactor ArticleEditView to use view in template 2015-10-27 12:09:36 -07:00
Scott Erickson
2e666073f1 Refactor SubscriptionView to use view in template 2015-10-27 12:07:16 -07:00
evvanderplas
2af15f7667 Update nl-NL.coffee: typos, grammar 
First obvious typos fixed
 2015-10-27 19:12:46 +01:00
Imperadeiro98
a7b35305de Fixed .spr in cla.jade 2015-10-27 15:07:39 +00:00
Matt Lott
38242eb55e Add /Careers routing entry 2015-10-26 20:39:40 -07:00
Scott Erickson
0869b11f53 Refactor DeltaView to use view in template 2015-10-26 17:00:52 -07:00
Scott Erickson
c10d11f61b Refactor DiplomatView to use view in template 2015-10-26 14:46:35 -07:00
Scott Erickson
45044d06a4 Refactor CLAsView to use view in template 2015-10-26 14:35:42 -07:00
Scott Erickson
58eaec8e6b Refactor MainLadderView to use view in template 2015-10-26 14:23:06 -07:00
Matt Lott
48786372d8 🐛Prevent parallel managed sub unsubscribes 
Our unsubscribe API does not support this.  Removing option from
subscription UI.

Fixes #2976
 2015-10-26 13:45:38 -07:00
Nick Winter
afa410a370 Added Ace of Coders tournament rankings. 2015-10-26 13:30:49 -07:00
Rob Blanckaert
d26daf1dc0 Only show "press enter" for the selected line in autocomplete. 2015-10-26 15:39:22 -04:00
Imperadeiro98
6ee44bd6cc Fixed i18n in infinite_loop.jade 2015-10-26 12:46:06 +00:00
Imperadeiro98
169627af82 Added a missing spr in CLA.jade 2015-10-23 20:49:15 +01:00
Scott Erickson
3df4f26293 Remove a test wrench thrown into CommunityView 2015-10-23 10:50:21 -07:00
Scott Erickson
fad9d0a757 Remove auto-reload delay, see if we can do without it now 
According to a comment now deleted, we had auto reload delay 300ms for race
conditions, mainly onCompile tweaking source map file sourceMappingURL values.
That only happens in production now, though, so let's try removing it for development.

Original comment added: 5104f0a1e7
Michael deleted it :( 6d7864c415
 2015-10-23 10:47:01 -07:00
Scott Erickson
921054d53f Improve brunch re-compile speed by updating bunch libraries 
Also fixed a couple templates newer brunch complained about.
 2015-10-23 10:09:34 -07:00
Imperadeiro98
8a8d8c9d23 Fixed use of i18n in popover 2015-10-23 16:54:42 +01:00
Imperadeiro98
09422910f7 Updated i18n 2015-10-23 16:49:05 +01:00
Scott Erickson
b475815e41 Refactor InvoicesView to use view in template 2015-10-22 15:26:52 -07:00
Scott Erickson
cd065f3ba6 Refactor TeachersFreeTrialView to use view in template 2015-10-22 15:23:04 -07:00
Scott Erickson
9de50ac181 Refactor CLAView to use view in template 2015-10-22 15:16:32 -07:00
Nick Winter
4af6162c5c Replace simple loop docs with while-true docs in course levels 2015-10-22 10:29:10 -07:00
Scott Erickson
ddf351aac7 Refactor PaymentsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
680eb04285 Refactor AccountSettingsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
9a29c26cc8 Refactor HomeView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
94d29d2e8a Move trailing slash removal to client Router, make client route "/play/" work for facebook 2015-10-21 16:55:48 -07:00
Scott Erickson
57c5384ec1 Refactor editor:save-new-version from a mediator event to a normal Backbone event 
Part of a push to move away from global subscriptions when 'local' ones will do.
 2015-10-21 15:34:07 -07:00
Driphter
73e3afa5f8 Added non-mutating methods for player code 2015-10-21 18:30:10 -04:00
Scott Erickson
6636051765 Refactor HomeView to use new event callback naming guideline 
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
 2015-10-21 14:18:13 -07:00
Scott Erickson
452e6467b4 Refactor PrepaidView to use new event callback naming guideline 
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
 2015-10-21 14:16:44 -07:00
Scott Erickson
cef4fc0794 Refactor AccountSettingsView to use new event callback naming guideline 
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
 2015-10-21 14:02:04 -07:00
Rob
1ff97243ad Hello, yes this is Rob. 2015-10-21 08:46:12 -07:00
Imperadeiro98
9b06d53856 Fixed previous merge 2015-10-20 18:25:07 +01:00
snarkota
343f6c378c Update lt.coffee 
More translation strings
 2015-10-20 19:35:45 +03:00
Matt Lott
3ed755076b Enable while True auto yielding for all level types 2015-10-20 06:42:46 -07:00
Nick Winter
b03091c35d Merge pull request #3123 from UltCombo/iframe-style 
Remove iframe borders using CSS instead of DOM
 2015-10-20 06:15:54 -07:00
UltCombo
2c97238a7f Remove iframe borders using CSS instead of DOM 
This patch makes iframe borders render identically in all supported browsers (i.e. no border).

Although Chrome does not displays borders around iframes by default, Firefox and Edge (IE) had visible iframe borders prior to this patch. This is because, as [previously mentioned](https://github.com/codecombat/codecombat/pull/3122#discussion_r42338590), the DOM property was mistyped as `frameborder` when it should be `frameBorder`.

As this is presentational issue, it feels more appropriate to fix it using CSS. Therefore, I've removed the buggy JS code and added a generic CSS solution to reset iframes' border styling.
 2015-10-19 22:58:51 -02:00
Matt Lott
cc642e7254 Auto yield while True loops for course levels 2015-10-19 16:46:53 -07:00
Nick Winter
2539814687 Merge pull request #3122 from UltCombo/help-video-fullscreen 
Allow embedded help videos to go fullscreen
 2015-10-19 12:40:28 -07:00
UltCombo
c02b311efa Allow embedded help videos to go fullscreen 2015-10-19 03:44:19 -02:00
AkaKaras
e1e8dc33d2 zh-hans typos 2015-10-18 21:17:13 -04:00
AkaKaras
11baf3fd61 megre 2015-10-18 21:08:51 -04:00
AkaKaras
1d6d6011d8 zh-HANS and zh-HANT translation 
both i18n are done, also had fix some typos
 2015-10-18 21:05:40 -04:00
Imperadeiro98
1a664b519a Uncommented strings from last merge 2015-10-18 15:39:03 +01:00
Imperadeiro98
a900cc003f Merge pull request #3120 from artinhuang/master 
Update to zh-HANS.coffee
 2015-10-18 15:35:16 +01:00
artinhuang
3c7bb3443c Modify some description,and add the new translations. 2015-10-18 18:39:49 +08:00
Imperadeiro98
13f30ca16a Uncommented strings from last merge 2015-10-18 11:23:42 +01:00
snarkota
23670b9f25 Update lt.coffee 
First lines of lithuanian translation
 2015-10-17 21:09:50 +03:00
Nick Winter
5f8ab8a212 Added support for test campaigns that don't save their levels/achievements 2015-10-16 16:06:53 -07:00
Sam Soffes
d2052980c4 Send sign out message directly 2015-10-16 15:02:33 -07:00
Nick Winter
d5288a254b Remove Ace of Coders tournament blurb from home page 2015-10-16 14:55:58 -07:00
Sam Soffes
59f987e105 Check for new iPad User-Agent 2015-10-16 14:42:25 -07:00
Imperadeiro98
3d1e5f1e34 i18n account dropdown 'Prepaid Codes' 2015-10-15 21:41:47 +01:00
RUSLAN LÓPEZ CARRO
bf8da65060 Update es-419.coffee 2015-10-15 12:48:53 -05:00
Imperadeiro98
63d7df538c Fixed previous merge 2015-10-15 15:21:10 +01:00
Imperadeiro98
f72f786803 Merge pull request #3116 from Fokusnica/master 
changed and added some ru and uk locales
 2015-10-15 15:18:58 +01:00
Derevianko Liubov
58ba08ddb7 changed and added some ru and uk locales 2015-10-15 17:10:12 +03:00
Nick Winter
e15b30893f Note tournament end, undo tournament simulation bias 2015-10-15 06:32:52 -07:00
Jlit1001
a788533d13 1. simplify regex for email testing 
2. keep valid emails in text area
 2015-10-14 22:29:15 -07:00
Scott Erickson
844bc942b3 Fix #2785 2015-10-14 16:01:09 -07:00
Scott Erickson
cbf6032c68 Merge branch 'origin/spritesheets' 2015-10-14 15:03:34 -07:00
Scott Erickson
1f00f5b4b9 Remove vestigial function argument 2015-10-14 15:00:57 -07:00
Scott Erickson
b77626b8ee Minor fixes 
Making sure LayerAdapter doesn't wait for ThangType to load the image more than once.
LayerAdapter skips rendering if there's a prerendered sprite sheet whose image is not loaded.
 2015-10-14 14:48:43 -07:00
Scott Erickson
305cffb5ea Finish hooking up prerendered spritesheets with LayerAdapter 2015-10-14 14:33:26 -07:00
Imperadeiro98
a4d8aec2a7 Added i18n to contributor signup 2015-10-14 21:06:23 +01:00
Scott Erickson
1085731fdd Fix colorConfig prerendered sprite sheet data, comparison 2015-10-14 10:41:10 -07:00
Scott Erickson
39bddb889e Have LayerAdapter use prerendered spritesheets (unfinished) 2015-10-13 16:43:56 -07:00
RUSLAN LÓPEZ CARRO
8e9b46b73c Update es-419.coffee 2015-10-13 18:08:44 -05:00
Nick Winter
74763f0614 Fix experience/gems not showing in HeroVictoryModal 2015-10-13 13:44:25 -07:00
Imperadeiro98
9184566d67 Update pt-PT and standardize new tip 2015-10-13 21:07:21 +01:00
Nick Winter
8209c4a0c7 Propagate i18n 2015-10-13 12:32:51 -07:00
Nick Winter
2336668b09 Actually commit my ru.coffee merge 2015-10-13 12:32:14 -07:00
Scott Erickson
3fc7b71f7a Remove log 2015-10-13 12:31:28 -07:00
Scott Erickson
74a7b53498 Remove vestigial test code 2015-10-13 12:30:18 -07:00
Nick Winter
537ede7740 Merge pull request #3108 from Imperadeiro98/i18n-and-cleanups 
Added i18n to some strings
 2015-10-13 12:27:58 -07:00
Nick Winter
28530f44e6 Merge ru.coffee and uk.coffee 2015-10-13 12:26:28 -07:00
Nick Winter
ac750456b7 Merge ru.coffee and uk.coffee 2015-10-13 12:25:23 -07:00
Nick Winter
0c7169f5c0 Merge pull request #3088 from javatlacati/patch-1 
Update level_loading.jade
 2015-10-13 12:21:19 -07:00
Nick Winter
7584872c9f Fix #3106 introduced by b38a6c50 2015-10-13 08:22:13 -07:00
Imperadeiro98
20371fa146 Indentation re-fix 2015-10-13 16:14:43 +01:00
Nick Winter
d776809e1c Update Hour of Code student flow and tracking, remove signup requirement 2015-10-13 08:12:07 -07:00
Imperadeiro98
2b8856aead Fixed indentation 2015-10-13 16:08:20 +01:00
Imperadeiro98
fbfb80d4bf Added i18n to some strings 2015-10-13 16:05:47 +01:00
Imperadeiro98
c969768800 Merge pull request #3104 from tufik000/patch-2 
Link to Ace of Coders
 2015-10-13 14:58:22 +01:00
Matt Lott
eda10a55ec Update /courses?_ppc= logged out instructions 2015-10-12 21:13:03 -07:00
Scott Erickson
66650452b2 Merge remote-tracking branch 'origin/master' 2015-10-12 16:47:59 -07:00
Scott Erickson
919e0605e9 Add spriteSheets to ThangType, export modal to Thang Editor 
Units can be exported as rastered sprite sheets. This is the first part of the project,
the second part will be having the game use them.
 2015-10-12 16:47:48 -07:00
Scott Erickson
b38a6c5060 Pass all arguments from constructor to initialize in CoreViews, add lodash to default view context 2015-10-12 16:46:30 -07:00
Matt Lott
e1e2be574c Add teacher HoC instructions to /courses 2015-10-12 16:43:46 -07:00
Matt Lott
2aad347166 Add HoC blurb to top of /teachers pages 
Replacing courses beta testing blurb.
 2015-10-12 16:38:28 -07:00
Matt Lott
708f78153b Route /hoc to courses 
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
 2015-10-12 16:25:23 -07:00
Imperadeiro98
56c4c5a1b3 Merge pull request #3105 from AkaKaras/translation 
Translation
 2015-10-12 22:37:35 +01:00
AkaKaras
1a3ab303be zh-hant latest translation 
finally finished the translation, proud of myself (●—●)  b
 2015-10-12 16:54:14 -04:00
tufik000
00170d6821 Link to Ace of Coders 
Changed "torneir" to "torneio" and  "Era dos Programadores" to "Ás dos Programadores"
 2015-10-11 23:02:20 -03:00
Derevianko Liubov
9312d8ad84 added some ru and uk locales 2015-10-11 23:13:07 +03:00
Derevianko Liubov
82c23183c8 added some ru and uk locales 2015-10-11 23:11:20 +03:00
Imperadeiro98
cac0739084 Merge pull request #3101 from HelloSeaNation/patch-2 
Fix another typo
 2015-10-11 20:01:57 +01:00
AkaKaras
3325b91b5a Merge remote-tracking branch 'codecombat/master' into translation 
Conflicts:
	app/locale/zh-HANT.coffee
 2015-10-11 09:15:45 -04:00
AkaKaras
f6217a5626 zh-hant 
translation
 2015-10-11 09:15:28 -04:00
HelloSeaNation
e75413fbe2 Fix another typo 2015-10-11 00:56:37 +13:00
HelloSeaNation
727dce6f2c Fix typo 2015-10-11 00:54:59 +13:00
Tery Lim
0b9e78e2b8 Some zh-HANS translations 
- Translate `prepaid`
- Change `codecombat` => `CodeCombat`
 2015-10-10 22:38:21 +13:00
Tery Lim
124b61a70c Update harry's tips 
`Yer a Wizard,`
 2015-10-10 21:42:02 +13:00
Matt Lott
9ae463ed24 Remove perf killing 'add' event handler from /account/prepaid 2015-10-09 16:03:22 -07:00
Matt Lott
8fce82ce72 Update trial requests approval page query to grab latest 
Used to be limited to first 2000 requests, which was hit on 10/7/15.
 2015-10-09 14:26:04 -07:00
Scott Erickson
2a739ea765 Remove placeholder text in invite email box in course details page 
Already duplicated it outside of the textbox, so it'd be visible even after an email had been entered. This is just removing the old placement.
 2015-10-09 13:45:33 -07:00
Matt Lott
0cb30d9500 Prompt for login in /courses redeem code dialog 2015-10-09 09:32:46 -07:00
Matt Lott
1bd5078ecf 🐛Sort course details nameless members 2015-10-09 09:27:30 -07:00
Imperadeiro98
a74a09a532 Added change to a string 2015-10-09 16:37:19 +01:00
Imperadeiro98
50961e2c68 Update pt-PT.coffee 2015-10-09 16:31:19 +01:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
dcab1eecc0 Update en.coffee 2015-10-09 09:39:15 -05:00
RUSLAN LÓPEZ CARRO
5ff287a511 Update level_loading.jade 2015-10-09 09:35:30 -05:00
Nick Winter
0d6f84cab6 Merginate uk.coffee 2015-10-09 06:08:36 -07:00
Imperadeiro98
442f9d2265 Merge pull request #3092 from kumabotz/patch-2 
Translate careers
 2015-10-09 12:32:54 +01:00
Imperadeiro98
20cd6643c8 Merge pull request #3091 from kumabotz/patch-1 
Update to zh-HANS period ( 。)
 2015-10-09 12:32:18 +01:00
Derevianko Liubov
cf7952149d add some uk locales 2015-10-09 11:06:09 +03:00
Jlit1001
e0be8e94ea 1. email validation when subscribing other users 2015-10-08 21:59:12 -07:00
Jlit1001
b9f0aa1622 1. set periodEnd to the next month if subscription cancelled at periodEnd 2015-10-08 19:43:13 -07:00
Nick Winter
a34e4b3afd Merge pull request #3084 from Imperadeiro98/clean-up 
Cleaned up a couple of files
 2015-10-08 16:25:50 -07:00
Tery Lim
fb29cd1950 Translate careers 2015-10-09 12:03:46 +13:00
Tery Lim
4a26afd9b2 Update to zh-HANS period ( 。) 2015-10-09 11:11:51 +13:00
RUSLAN LÓPEZ CARRO
721b2c024e Update es-419.coffee 2015-10-08 16:35:21 -05:00
Matt Lott
99c20b88fa Don't show seat count when enrolling in free courses 2015-10-08 12:27:53 -07:00
Matt Lott
171678caad Add try out courses blurb to top of /teachers page 2015-10-08 11:51:00 -07:00
RUSLAN LÓPEZ CARRO
853d08b71e Update es-419.coffee 2015-10-08 11:44:13 -05:00
Matt Lott
9e8294fae8 Comment out courses teacher survey UI 
The teacher survey infrastructure does not support courses yet.
 2015-10-08 09:40:40 -07:00
RUSLAN LÓPEZ CARRO
1f1d74fb3b Update level_loading.jade 
How about adding these two quotes? :D
 2015-10-08 11:36:19 -05:00
Nick Winter
7e8b6589d5 Update HipChat links 2015-10-08 06:14:36 -07:00
Matt Lott
a6f4085b13 Update course details progress colors 
Only show not started key when expanded progress.
 2015-10-08 06:10:12 -07:00
Matt Lott
3642ebd58c 🐛Fix course details playtime stats 2015-10-08 06:10:12 -07:00
Matt Lott
1c1a5d4295 /courses student mode when _ppc present 2015-10-08 06:10:12 -07:00
TJ Ledwith
a87ec2bd81 Added a few names. 
Added a few names.
 2015-10-08 07:43:48 -04:00
Matt Lott
a6e3110549 Update course details completed level/concept to light blue 2015-10-07 17:30:16 -07:00
Matt Lott
c3af5324d5 🐛Fix course details average playtime calc 2015-10-07 17:14:56 -07:00
Matt Lott
2767bbb639 Skip seat count selection for free courses 
Default to 9999 instead.
 2015-10-07 17:08:22 -07:00