Commit graph

12451 commits

Author SHA1 Message Date
Nick Winter
a7114a2719 Implement headless verifier; fix headless client 2016-04-12 19:34:05 -07:00
Nick Winter
5949cf51f0 Merge pull request #3513 from UltCombo/beautifier-loop
JS beautifier: fix loop construct, fixes #3510
2016-04-12 17:13:12 -07:00
phoenixeliot
61dd93917c Improve password reset email, make a sendwithus template for it 2016-04-12 13:28:38 -07:00
Scott Erickson
f1f1c23fd4 Refactor /auth endpoints for #3469
* Take `/server/routes/auth` and move most of the logic to `/server/middleware/auth`, refactoring to use generators.
* List all `/auth/*` endpoints in `/server/routes/index.coffee`.
* Fill in testing gaps for `/auth/unsubscribe`.
* Add debug log when `sendwithus` is not operational, so it 'works' in development and testing.
* Use passport properly!
* Track Facebook and G+ logins in user activity as well as passport logins.
2016-04-12 12:07:11 -07:00
Cat Sync
fddba4e0ce Hacks autocomplete to use hero instead of self/this
Uses hero instead of self/this if “hero” is already in the code, in
javascript, python, and lua.
2016-04-12 14:31:50 -04:00
Cat Sync
0c0049227a Merge remote-tracking branch 'codecombat/master' 2016-04-12 14:17:51 -04:00
Scott Erickson
92fecd8d5c Move some user tests from functional to unit 2016-04-11 14:04:24 -07:00
Scott Erickson
b33620779d Refactor achievement handler for #3469 2016-04-11 12:00:22 -07:00
Imperadeiro98
7d653bf567 Merge pull request #3532 from Minhir/patch-1
Update English to Russian translation.
2016-04-11 18:43:45 +01:00
Imperadeiro98
f3bbafda91 Small fixes to pt-BR.coffee 2016-04-11 18:43:15 +01:00
Imperadeiro98
3859c40f66 Merge pull request #3530 from jozadaquebatista/master
Update pt-BR.coffee
2016-04-11 18:39:07 +01:00
Scott Erickson
442c33bfe1 Refactor auth specs for #3469 2016-04-11 10:35:46 -07:00
Imperadeiro98
1bb9678c05 Merge pull request #3543 from murat-yuksel/patch-1
Added some TR translations
2016-04-10 16:16:52 +01:00
Imperadeiro98
c056d97594 Small fixes to sk.coffee 2016-04-10 15:42:45 +01:00
Imperadeiro98
aa46de2b26 Merge pull request #3544 from cundamic/patch-21
Update sk.coffee
2016-04-10 15:39:20 +01:00
Imperadeiro98
0af4907f71 Merge pull request #3535 from levlas/patch-1
Suggestions till line 55
2016-04-10 15:36:16 +01:00
Imperadeiro98
14a6679ed9 Merge pull request #3531 from informaticienzero/master
Update fr.coffee
2016-04-10 15:35:13 +01:00
Imperadeiro98
312cc3ca1c Merge pull request #3527 from rafaelkan/patch-3
Update es-ES.coffee
2016-04-10 15:33:19 +01:00
Imperadeiro98
4f1e186cc2 Merge pull request #3525 from LawrenceFebs/patch-1
Update it.coffee
2016-04-10 15:32:36 +01:00
cundamic
fe8f081cc4 Update sk.coffee 2016-04-10 12:14:43 +02:00
cundamic
f2440bdbc9 Update sk.coffee
translated 1-318
2016-04-10 12:10:57 +02:00
Murat Yüksel
bd4811d7fd Added some TR translations 2016-04-09 17:48:11 +03:00
Scott Erickson
54034b805f Refactor admin specs for #3469 2016-04-08 15:31:57 -07:00
Scott Erickson
823dbd620b Refactor achievement specs for #3469 2016-04-08 15:06:05 -07:00
Scott Erickson
514248b39f Refactor course instance server tests to use generators 2016-04-08 10:46:39 -07:00
Scott Erickson
cabca6366f Show guides when users are a teacher OR own a classroom 2016-04-08 10:14:47 -07:00
Scott Erickson
c20ed58f9f Have dev proxy return 502 when proxy fails, rather than calling next 2016-04-08 10:14:47 -07:00
Matt Lott
ece3c6f19d Clean up server Slack messages 2016-04-08 09:24:38 -07:00
Matt Lott
cd7ec7f8dd Send email when adding contacts to Close.io leads 2016-04-07 21:23:42 -07:00
Josh Callebaut
6c0823486f Merge pull request #3539 from Zerrien/solutionSchema
Changes terminology to match schema
2016-04-07 15:30:13 -07:00
Josh Callebaut
4275d41324 Changes terminology to match schema 2016-04-07 14:49:55 -07:00
Scott Erickson
5aeb559ad1 Fix ConvertToTeacherAccountView to save the email field 2016-04-07 14:40:21 -07:00
Scott Erickson
8ff80fc92d Add npm 'proxy' script for developing client on prod server 2016-04-07 13:59:38 -07:00
Matt Lott
9865e6da22 Turn off demo request 2 enrollments and approved mails 2016-04-07 12:52:11 -07:00
Matt Lott
5661a1fd8c Add site origin data to course trial requests 2016-04-07 12:13:48 -07:00
Scott Erickson
29cd880480 Refactor handlers to /server/handlers 2016-04-07 09:40:53 -07:00
Scott Erickson
c3e5416166 Refactor server models into /server/models, remove request and mongoose from test globals 2016-04-06 16:06:52 -07:00
Cat Sync
debc337dd5 Add mongo script for finding which level(s) unlock a given level 2016-04-06 14:12:19 -04:00
Levente Laszlo
cf4bdba31d Suggestions till line 55 2016-04-06 11:23:50 +02:00
Matt Lott
265f4a8c37 Update enrollments purchase blurb 2016-04-05 11:55:14 -07:00
Matt Lott
be254cf10e Route homepage students to /courses instead of /play 2016-04-05 10:43:06 -07:00
Matt Lott
49e7506c62 Add parental leave benefits to /about page 2016-04-05 10:14:54 -07:00
Vladimir Ivakin
6ef5e6742c Update ru translation 2016-04-05 23:05:11 +06:00
Scott Erickson
ebab07d736 Fix /teachers/demo to work when not logged in 2016-04-05 10:01:51 -07:00
Scott Erickson
eba4afec17 Merge remote-tracking branch 'origin/master' 2016-04-05 09:43:46 -07:00
Scott Erickson
932238bb82 Fix /teachers redirect 2016-04-05 09:34:45 -07:00
Matt Lott
4b1486159c Change teacher account convert terminology to update 2016-04-05 09:16:22 -07:00
Matt Lott
133574356a Update /about page
Removing sales positions, adding marketing position
Updating benefits list
2016-04-05 06:29:03 -07:00
informaticienzero
622ff4cea1 Update fr.coffee
Corrections and typo changes to match French rules.
2016-04-05 12:13:00 +02:00
Matt Lott
69b999866e 🐛Ignore parse error in updateCloseIoLeads.js 2016-04-04 18:37:04 -07:00