phoenixeliot
70762f15cc
Clear window.me before running tests
2016-04-18 14:32:33 -07:00
phoenixeliot
e5734cbdd3
Fix coursesHelper tests, improve fixture specificity
2016-04-18 13:29:55 -07:00
Imperadeiro98
d07a3394d1
Update pt-PT.coffee
2016-04-18 19:00:25 +01:00
Scott Erickson
592d41fccb
Merge pull request #3560 from edtrist/LoginCloseButton
...
Fix close button disappearing - fixes #3522
2016-04-18 09:40:37 -07:00
edtrist
b63bf06bed
Added server error subscription to AuthModal
2016-04-18 02:12:42 +01:00
Nick Winter
d739fbef9b
Fix #3519 ; restricting importScripts has always been buggy and we probably don't need it
2016-04-17 17:32:37 -07:00
levrawonline
899422ef7f
Update es-419.coffee
2016-04-17 16:17:03 -03:00
Nick Winter
15d762e93e
Propagate i18n; remove newlines in en.coffee so that other locale files' line numbers will match
2016-04-16 18:11:22 -07:00
Nick Winter
43771671f2
Merge branch 'KeldOelykke-master'
2016-04-16 18:07:48 -07:00
Nick Winter
43a1dcad2b
Merge da.coffee
2016-04-16 18:07:39 -07:00
Nick Winter
1161c0cf3b
Merge branch 'JurianLock-patch-8'
2016-04-16 18:06:58 -07:00
Nick Winter
1ceb7f2573
Merge nl-NL.coffee
2016-04-16 18:06:49 -07:00
Nick Winter
439e7bbcab
Remove Errorception
2016-04-16 17:34:55 -07:00
Catsync
b90f1fb18f
Hack to use hero instead of self/this in SpellPalette docs ( #3552 )
...
Hack to change SpellPalette docs to use hero instead of self/this
2016-04-16 14:59:18 -07:00
Nick Winter
e3e3807844
Use jQuery version of Algolia autocomplete
2016-04-15 17:48:31 -07:00
Scott Erickson
ecf6cd7054
Fix Travis tests
2016-04-15 15:36:35 -07:00
Rob
e7356411fb
Autocomplete names of schools on quote page.
2016-04-15 14:00:36 -07:00
phoenixeliot
4b6dde9809
Unbreak non-course campaign for teachers
2016-04-15 13:39:11 -07:00
phoenixeliot
c3da6a23c9
Change isTeacher checks to isSessionless for /play
2016-04-15 10:58:52 -07:00
Scott Erickson
d5662fa2c9
Add fakeRequests array to models and collections during client tests
...
So you don't have to find the request through jasmine-ajax's functions.
2016-04-14 15:26:29 -07:00
Imperadeiro98
12f58cda82
Merge pull request #3551 from cundamic/patch-23
...
Update sk.coffee
2016-04-14 18:51:52 +01:00
cundamic
6885de36fc
Update sk.coffee
...
subscription
2016-04-14 06:51:20 +02:00
Rob
ceb64ce9ca
Improve verifier.
2016-04-13 16:41:16 -07:00
phoenixeliot
0416528de0
Fix language-getting for next level URL on teacher courses play
2016-04-13 16:32:39 -07:00
Rob Blanckaert
d56be14dbb
Merge pull request #3550 from codecombat/region-refactor
...
Use host header to let any server serve any region
2016-04-13 15:17:47 -07:00
Rob
e635396b8a
Use host header to let any server serve any region
2016-04-13 15:12:11 -07:00
Catsync
7ff12f326f
Merge pull request #3548 from Catsync/autocomplete-hero
...
hero autocomplete hack
2016-04-13 14:59:21 -04:00
Scott Erickson
bd6a266f60
Refactor POST /db/classroom and PUT /db/campaign/:handle and their tests for #3469
2016-04-13 11:39:29 -07:00
Imperadeiro98
8a744db768
Merge pull request #3549 from cundamic/patch-22
...
Update sk.coffee
2016-04-13 18:18:56 +01:00
Scott Erickson
5a69936899
Update init-school-roles
2016-04-13 09:43:05 -07:00
cundamic
0dc913ba78
Update sk.coffee
...
translated 1-447
2016-04-13 17:59:24 +02:00
phoenixeliot
a524256b5b
Add sessionless play for Teachers
2016-04-12 19:34:05 -07:00
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
