Nick Winter
8203727d60
Fix #3457
2016-06-09 14:35:19 -07:00
Nick Winter
63c0c38c45
Merge branch 'javatlacati-patch-1'
2016-06-09 14:30:20 -07:00
Nick Winter
23090b4198
Merge es-419.coffee
2016-06-09 14:29:57 -07:00
Rob
aa7f2af700
No ads, act two.
2016-06-09 12:13:17 -07:00
Imperadeiro98
ad37fd3460
Fix fr.coffee
2016-06-09 20:10:14 +01:00
dacha76
d5cbe1e11a
translated "new_home" section to french. ( #3728 )
...
translated "new_home" section to french.
2016-06-09 20:07:13 +01:00
Matt Lott
c85a7230a6
Merge branch 'master' into production
2016-06-09 10:48:02 -07:00
Matt Lott
9dbcf27e11
Add classroom Mixpanel logging
...
Closes #3720
2016-06-09 10:46:26 -07:00
duybkict
0c0f075424
#3138 #3488 refactor MyMatchesTabView
2016-06-09 10:31:53 +07:00
duybkict
a4e8cafdb3
#3138 #3488 refactor SimulateTabView
2016-06-09 10:00:47 +07:00
Nick Winter
2c1ed6867d
Merge branch 'master' into production
2016-06-08 17:15:00 -07:00
Nick Winter
b0fcddac68
Add game-dev level type ( #3725 )
...
* Initial pass adding new game-dev level type.
* Fix a failing test with updated LevelSystem required properties
* Bring back normal Angel worker timeout times
* Fix another failing LevelSystem test since removing propertyDocumentation
2016-06-08 16:57:00 -07:00
Scott Erickson
0d5bf6b4de
Merge branch 'username-login'
2016-06-08 15:48:46 -07:00
Scott Erickson
c57fd6f460
Do not set campaignIndex for levels except for course campaigns
2016-06-08 15:48:26 -07:00
Matt Lott
546598396d
Add Lisa to /about page
2016-06-08 15:46:21 -07:00
Matt Lott
6019beac25
🐛 Fix license request email parsing
...
Caused by
https://github.com/codecombat/codecombat/commit/a6bb706cf295e2680fe77ff1
3e91d3da59487b53
2016-06-08 14:53:30 -07:00
phoenixeliot
938be287b3
Merge branch 'master' into production
2016-06-08 14:40:53 -07:00
phoenixeliot
8f20e9f7d1
Fix missing names for Ida/Nando
2016-06-08 14:40:37 -07:00
Scott Erickson
69f3ee3a5b
Allow username login, tear out a bunch of related stuff in change
...
* Switch from auth.loginUser to User.loginPasswordUser with Promise
* Remove a cascade of unused views that were using auth.loginUser: StudentLogInModal, StudentSignupModal, HourOfCodeView
* Also remove auth.createUser
2016-06-08 13:55:19 -07:00
Scott Erickson
fe8760b122
Add Travis-Slack integration
2016-06-08 13:54:43 -07:00
Scott Erickson
86699a8510
Merge pull request #3719 from duybkict/refactor-LadderTabView
...
#3138 #3488 refactor LadderTabView
2016-06-08 10:01:37 -07:00
Scott Erickson
2f9f062165
Merge pull request #3718 from duybkict/refactor-LadderPlayModal
...
#3138 #3488 refactor LadderPlayModal
2016-06-08 09:53:59 -07:00
Scott Erickson
6beae97911
Merge pull request #3717 from duybkict/refactor-ContributorClassView
...
#3138 refactor contributor views
2016-06-08 09:43:14 -07:00
Scott Erickson
9a36cf514e
Merge pull request #3716 from duybkict/fix-3678-rebase
...
Fix #3678 display error on loading resources failed - rebased
2016-06-08 09:35:31 -07:00
duybkict
23d45ab947
#3138 #3488 refactor LadderTabView
2016-06-08 16:36:01 +07:00
phoenixeliot
f728c1c8a7
Revert using Bluebird instead of Promise polyfill
2016-06-07 11:39:00 -07:00
phoenixeliot
aa443d372f
Revert using Bluebird instead of Promise polyfill
2016-06-07 11:38:00 -07:00
Matt Lott
c3f1e6e04c
Turn off homepage logged out a/b tests
2016-06-07 05:36:48 -07:00
duybkict
c1f1b4a048
#3138 #3488 refactor LadderPlayModal
2016-06-07 18:05:06 +07:00
duybkict
7e4573f37c
#3138 refactor contributor views
2016-06-07 17:09:00 +07:00
duybkict
f439ffddc7
fix issue #3678
2016-06-07 09:42:57 +07:00
phoenixeliot
44ef84adce
Revert SendWithUs changes
2016-06-06 16:54:54 -07:00
phoenixeliot
c191f63c15
Revert all of my sendwithus changes
...
Revert "Fix more sendwithus things"
This reverts commit 9d4215d99d08bc32e005fcb2ce850481d9e19221
2016-06-06 16:54:15 -07:00
phoenixeliot
9d4215d99d
Fix more sendwithus things
2016-06-06 16:48:21 -07:00
phoenixeliot
08bc32e005
Fix some missed sendwithus changes
2016-06-06 16:38:20 -07:00
phoenixeliot
16bfe09d08
Merge branch 'master' into production
2016-06-06 16:01:00 -07:00
phoenixeliot
fcb2ce8504
Fix email tests
2016-06-06 16:00:46 -07:00
phoenixeliot
70c139a600
Merge branch 'master' into production
2016-06-06 15:53:33 -07:00
phoenixeliot
81d9e19221
Use SendWithUs versioning
2016-06-06 15:53:11 -07:00
Scott Erickson
be78f4049c
Fix adding inventory items to hero in level editor
...
Was only happening when HeroPlaceholder had HasPet component.
Presumably because the collection was loaded by HasPet, but the thang node
for the inventory node needed to populate its autocomplete array.
2016-06-06 15:35:10 -07:00
Scott Erickson
53a7510c46
Remove logs
2016-06-06 14:30:58 -07:00
Scott Erickson
891d0fe12f
Fix TeacherClassView sometimes not loading
...
This was a race condition where the view would trigger a render
before courses loaded, and the template required them when it had
some of its other resources.
2016-06-06 13:55:37 -07:00
phoenixeliot
dd17c39708
Merge hotfix for sending course invite emails
2016-06-06 13:44:15 -07:00
Matt Lott
33b614911c
Support alternate NL spelling in lead import automation
2016-06-06 13:43:52 -07:00
phoenixeliot
d9959db856
Fix sending invitation emails
2016-06-06 13:43:41 -07:00
phoenixeliot
79de50126d
Merge hero selector and misc fixes
2016-06-06 11:47:53 -07:00
phoenixeliot
0d4a88a957
Strip spaces in classCode on fetch and join
2016-06-06 11:30:20 -07:00
Ana
5da85621c6
Update sr.coffee ( #3714 )
...
- translation of contact, acc settings, community and clans sections + some other stuff
2016-06-05 14:47:27 +01:00
JurianLock
189f9fa7af
Update nl-NL.coffee ( #3713 )
...
Some UX updates and some minor spelling checks.
2016-06-05 14:46:19 +01:00
Matt Lott
a6bb706cf2
Update licenses needed form email contacts to include NL
2016-06-03 20:20:19 -07:00
