codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-13 17:21:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
11202 commits 27 branches 0 tags 134 MiB
Commit graph

8182 commits

Author SHA1 Message Date
Nick Winter
9dc6a04f5e Fix #3447 2016-03-07 07:02:01 -08:00
vellrya
eb32320b6f Update ru.coffee 2016-03-07 15:25:29 +03:00
JurianLock
b6f1a5046d Update nl-NL.coffee 2016-03-06 23:16:14 +01:00
Imperadeiro98
ba12f0b7f4 Fix previous merge 2016-03-06 21:39:43 +00:00
JurianLock
01d250caf3 Update nl-NL.coffee 2016-03-06 22:30:09 +01:00
sake12
44cf0931c4 Update pl.coffee 2016-03-06 12:10:53 +01:00
Imperadeiro98
773c640ced Fix build 2016-03-05 15:25:12 +00:00
Imperadeiro98
2442115892 Remove i18n from admin pages 2016-03-05 15:08:27 +00:00
Imperadeiro98
88091cf166 Update pt-PT.coffee 2016-03-05 14:15:52 +00:00
Nick Winter
fb9b169c62 Propagate a big i18n 2016-03-04 15:51:16 -08:00
Nick Winter
1ccad78782 Submit picoCTF solutions, show progress, disable sound 2016-03-04 11:44:43 -08:00
Scott Erickson
0b6390795a Tweak text on admin page 2016-03-04 11:14:18 -08:00
Scott Erickson
a2249f8df1 Add return-to-admin (turn off espionage mode) 2016-03-04 10:43:17 -08:00
Nick Winter
59e8c42ddb Client-side support for beating picoCTF levels 2016-03-03 17:18:24 -08:00
Scott Erickson
47f3223be1 Fix and improve new errors system 
* Fix error property name -> errorName
* showNotyError can handle Backbone error callbacks where jqxhr is second param
* showNotyError correctly shows JSON error message or name
* Add timeout to showNotyError
 2016-03-03 13:59:17 -08:00
Nick Winter
bada484445 Fix fetchPatchesWithStatus for non-versioned models 2016-03-02 16:19:33 -08:00
Imperadeiro98
defade9824 Merge pull request #3435 from Zeldaretter/patch-1 
Update de-DEcoffee
 2016-03-01 21:26:21 +00:00
phoenixeliot
939265a119 Fix supermodel.trackModel 2016-03-01 10:33:45 -08:00
Matt Lott
9e8e865049 Remove old homepage 
Turning off homepage a/b testing for now, but leaving the plumbing in
because we’ll be iterating on that shortly.
 2016-03-01 09:48:53 -08:00
Yuki Ueda
bfe45cbb88 Update ja.coffee 2016-03-01 20:47:09 +09:00
Matt Lott
19b7fe7295 Remove iOS position from /about careers section 2016-02-29 15:16:09 -08:00
Matt Lott
2e2bf95ff7 Remove classroom MAUs from KPI graphs 
Covered by active classes, and doesn’t make sense to have separate MAU
scales between classroom and campaign.
 2016-02-29 13:58:00 -08:00
Zeldaretter
84f28b15c2 Update de-DEcoffee 
New lines and some typos fixed
 2016-02-29 19:49:05 +01:00
Mario Catuogno
b9379c9984 Update it.coffee 2016-02-29 13:56:37 +01:00
Imperadeiro98
4b20258cef Merge pull request #3432 from MarioCatuogno/patch-1 
Update it.coffee
 2016-02-29 12:44:53 +00:00
Imperadeiro98
5f74bef303 Merge pull request #3431 from mqrelly/master 
Update hu.coffee
 2016-02-29 12:39:11 +00:00
Mario Catuogno
bddf849f1e Update it.coffee 
Tried to translate some new lines to help.
 2016-02-29 02:18:10 +01:00
Matt Lott
e56efe5921 Fix analytics MAUs and campaign paid users 2016-02-28 15:24:35 -08:00
Szabadkia Márk
e81fc634b2 Update hu.coffee 2016-02-28 21:58:17 +01:00
Imperadeiro98
a8f1ca7c7e Fix build 2016-02-28 18:11:59 +00:00
Zeldaretter
1fabe3224e Update de-DEcoffee 
New strings translated into german. Please add this strings soon. Thanks a lot
 2016-02-28 18:41:52 +01:00
Nick Winter
859e127e14 Merge pull request #3422 from blorente/master 
Added some lines for #710
 2016-02-27 16:58:47 -08:00
Imperadeiro98
5c4f9b6947 Small fixes to new-home-view.jade 2016-02-27 08:25:57 +00:00
Imperadeiro98
02a91642fc Merge master 2016-02-27 08:07:59 +00:00
Maikel Langezaal
b2aef32699 Trailling spaces removed, typo fixed and added 1 tag 2016-02-26 23:28:39 +01:00
Nick Winter
a6333cf739 Propagate SpriteParser's auto-insignificant-tween skipping fix to SpriteBuilder too 2016-02-26 11:42:32 -08:00
Matt Lott
1f7489970e Remove auto-refresh from subs dashboard 2016-02-26 10:36:04 -08:00
Scott Erickson
b64a212a17 Merge branch 'master' of https://github.com/Imperadeiro98/codecombat into Imperadeiro98-master 2016-02-26 09:38:09 -08:00
Matt Lott
7bd0936c93 Import approved trial requests into Close.io 2016-02-26 06:21:31 -08:00
Maikel Langezaal
40ed5618b8 Added i18n tags for new HomePage Issue #3413 2016-02-26 11:43:38 +01:00
minwook shin
d816b4388f 2/26 ko update. 2016-02-26 11:59:44 +09:00
Scott Erickson
e7366040f3 Add full screen button to tutorial videos in Safari 2016-02-25 17:13:42 -08:00
Scott Erickson
2a69ca3774 Fix lesson time estimate dropdown in NewHomeView 2016-02-25 16:49:26 -08:00
Scott Erickson
3f8652d9a9 Add showNotyNetworkError to app/core/errors 2016-02-25 15:50:53 -08:00
Scott Erickson
bd20536046 Add validateEmail to forms 2016-02-25 15:28:04 -08:00
Scott Erickson
1c4a84dee6 Handle when a SomethingResource fails, show Unknown Error 2016-02-25 15:15:39 -08:00
Scott Erickson
43a659ea80 Add styling for modal-base-flat 2016-02-25 15:15:15 -08:00
Scott Erickson
946436083c Add updateSelects to forms 
So that in forms you don't have to find the equality for each option. Instead,
just set the select value and, afterRender, call updateSelects, the options that
matches the value will become selected.
 2016-02-25 15:14:48 -08:00
blorente
ef8ed4b6ed Added some lines for #710 2016-02-25 23:41:27 +01:00
phoenixeliot
10e03c87c1 Fix style-flat color, .text-h1/2/etc style 2016-02-25 13:22:41 -08:00
Scott Erickson
78d221fe4c Refactor AdministerUserModal to use new flat style instead of legacy plain style 2016-02-25 11:49:34 -08:00
Scott Erickson
8b22b78f74 Add style-flat base 
To create a modal with the flat style, just use modal-base-flat instead of modal-base
 2016-02-25 11:40:27 -08:00
Imperadeiro98
b5bbe85836 Revert jobs i18n 2016-02-25 18:28:45 +00:00
Matt Lott
6a48fbb3aa Add courses to progress-reset warning 2016-02-25 10:08:16 -08:00
Matt Lott
8d1c39e714 Merge pull request #3421 from codecombat/AboutPageFixes 
Improve responsiveness on fixed nav
 2016-02-25 09:36:03 -08:00
phoenixeliot
401c185108 Improve responsiveness on fixed nav 2016-02-25 09:25:13 -08:00
Nick Winter
e2f40994e4 Merge lt.coffee 2016-02-25 09:03:00 -08:00
Imperadeiro98
62c5b34a96 Update About page i18n 
Also fixed some images
 2016-02-25 15:48:29 +00:00
Scott Erickson
fc800935aa Fix screenshot carousel when focused on the carousel control and pressing arrow keys 2016-02-24 16:55:18 -08:00
phoenixeliot
f1b046b50e Refactor Request Quote page to flat-style 2016-02-24 16:23:21 -08:00
phoenixeliot
4b02f120e2 Add new About page and refactor out flat-style 2016-02-24 16:22:06 -08:00
Imperadeiro98
42f84de394 Merge master branch 2016-02-24 19:40:21 +00:00
Imperadeiro98
9c12f6c957 Revert changes to LevelLoader and SuperModel 2016-02-24 19:32:28 +00:00
Matt Lott
e74a77342c Update admin trial requests page 
Add role and phone number
Move notes to separate line
Display last 1000 reviewed instead of 100
 2016-02-24 10:22:55 -08:00
Nick Winter
9a344d1a61 Sort a few name categories; remove a log. 2016-02-24 08:49:39 -08:00
Nick Winter
cac20fd39c Merge pull request #3416 from delftswa2016/additional-thang-names 
Some additions to Ogre and Horse names
 2016-02-24 08:46:49 -08:00
Matt Lott
609884eb51 Update furthest course dashboard tables 
Adding a second table, setting range to be 60 and 365 days.
Updating teacher columns to prioritize student paid status over
furthest student course.
 2016-02-24 06:25:01 -08:00
Matt Lott
dd603a0436 Add school sales table to dashboard 2016-02-24 06:25:01 -08:00
Matt Lott
e471d652e5 Add more year long dashboard graphs 2016-02-24 06:25:01 -08:00
Maikel Langezaal
8882ff8d46 Some additions to Ogre and Horse names 2016-02-24 12:56:02 +01:00
Scott Erickson
e2feeb8330 Prevent didReappear from setting up shortcuts twice for RootViews 2016-02-23 12:00:07 -08:00
Scott Erickson
becad06750 Refactor ArticleEditView and PatchesView to use model endpoint functions 2016-02-22 16:03:21 -08:00
Robin Yang
1d57199707 Add new buttons for email templates 
Used in Request Quote Confirmation email.
 2016-02-22 14:29:05 -08:00
Nick Winter
f16dbcd63c Merge pull request #3379 from jamesvdh/patch-1 
Update nl-BE.coffee
 2016-02-22 13:22:51 -08:00
Nick Winter
99acf2d40e Properly skip tweens for shadows we removed during sprite parsing 2016-02-22 13:11:46 -08:00
Nick Winter
956f9dc43d Handle updated CreateJS exports in SpriteParser 2016-02-22 12:57:35 -08:00
Scott Erickson
3c3db79ac1 Fix #3388 
Overflow: hidden was cutting of info in the play view. Without it in the new home page, though,
infinite banners would expand the size of the page. Tried figuring out a way to not make the new
page require hiding overflow but found no obvious solution. Pages with infinite banners will
just need to be set to overflow: hidden individually.
 2016-02-22 11:12:19 -08:00
Matt Lott
cac9a7463f Dashboard monthly revenue counts, and tabs 2016-02-20 17:27:45 -08:00
Scott Erickson
16969e1d5a Fix Travis tests 2016-02-19 13:58:21 -08:00
Scott Erickson
3390663486 Fix GuideView to use session.codeLanguage by default 2016-02-19 10:55:42 -08:00
adeeb1
e71a4b71dc Fixed GitHub authentication - #1764 2016-02-19 10:07:05 -08:00
Matt Lott
19d0e67002 Dashboard classroom vs campaign year chart 2016-02-19 09:32:17 -08:00
Matt Lott
ce525e7d99 Add played definition to analytics dashboard 2016-02-18 09:14:36 -08:00
Imperadeiro98
92dc72cce1 Remove name from loadModel 2016-02-18 16:44:40 +00:00
Yuki Ueda
f942816188 Update ja.coffee 2016-02-18 21:57:01 +09:00
Matt Lott
1f01b3ffbd Update revenue analytics with payment.prepaidID 2016-02-17 13:01:09 -08:00
Scott Erickson
cf030146e8 Restrict request quote emails 
* If logged in => repopulate and lock email (and name if available)
* If logged out => disallow using an email for an existing account and display a validation message + login link
 2016-02-17 11:51:26 -08:00
Nick Winter
b5bb662ed2 Add picoCTF problem descriptions to levels; streamline picoCTF flows more 2016-02-17 11:33:56 -08:00
Scott Erickson
0905a378a0 Fix recent scrolling changes for Firefox 2016-02-17 11:21:43 -08:00
Scott Erickson
53eea0c236 Fix navigation from one page to the next 
* Reset flying focus so it doesn't lengthen the page
* Scroll to the top of the page when switching views
 2016-02-17 11:05:52 -08:00
Scott Erickson
c8551a6382 Make new home page responsive 2016-02-17 11:05:20 -08:00
Matt Lott
cb29d7068b Add prepaids to payments 
Closes #3402
 2016-02-17 10:08:44 -08:00
Nick Winter
37fbd8ca21 Start to play picoCTF levels as course levels without hero selection 2016-02-17 09:53:45 -08:00
Nick Winter
fe351be32e Start to rework CampaignView when we're in picoCTF mode 2016-02-16 20:39:59 -08:00
Scott Erickson
c2f02ebbfb Fix scrollToLink, including removing unneeded offset 2016-02-16 10:47:49 -08:00
Matt Lott
73657d5428 Update analytics dashboard 
Splitting out classroom and campaign active users
Adding more detailed active users graphs
Patching up missing analytics log events for 2/2/16-2/9/16
 2016-02-16 09:23:42 -08:00
Nick Winter
1f52329c7a Merge pull request #3391 from khoa102/master 
new update
 2016-02-14 12:03:47 -06:00
minwook shin
a682bfffa2 korean translate continue... 
parent = 부모
but korean manner is [Top people]+님(:nim)
so, 부모님=부모(parent)+님(:nim)xk
 2016-02-13 11:15:40 +09:00
Tran Anh Khoa
ea6d68ce5b Update vi.coffee 2016-02-12 14:32:02 -06:00
Ihsara
a008597e35 Update vi.coffee 
minor changes
 2016-02-12 22:24:45 +02:00