Commit graph

11250 commits

Author SHA1 Message Date
Matt Lott
f261c1466a Update /teachers
Stop forwarding to HoC
Update copy with courses info.
2015-11-24 10:59:14 -08:00
Rob
4dde97153c Don't panic if we didn't load stripe. (Makes game run offline). 2015-11-24 13:42:00 -05:00
Matt Lott
d7a66722b9 Update teacher surveys
Removing trial subscriptions
Updating trial page copy
Adding special HoC trial
Introducing a new course prepaid property endDate, which won’t be
returned or redeemed after the date.
2015-11-24 10:32:19 -08:00
criptonauta
d44a8b469e Update pt-BR.coffee 2015-11-24 14:36:44 -03:00
Nick Winter
747856bd4c Merge branch 'master' into production 2015-11-24 08:56:36 -08:00
Nick Winter
ec7f17a149 Show level indexes in courses 2015-11-24 08:56:28 -08:00
Nick Winter
d675e14f59 Fix issue returning to ladder when playing course-ladder levels outside of a course arena 2015-11-24 08:36:57 -08:00
Nick Winter
65890130bb Change how goals are expanded/collapsed at beginnings of levels 2015-11-24 08:28:05 -08:00
Nick Winter
ebc081d105 Only fetch hero campaigns for overworld route 2015-11-23 12:38:51 -08:00
Imperadeiro98
0d35f1472e Fixes for last merge 2015-11-23 20:34:17 +00:00
Imperadeiro98
eb16d1a2b1 Merge pull request #3200 from laituan245/patch-1
Update vi.coffee
2015-11-23 20:30:23 +00:00
Scott Erickson
2adb3362ed Add ChangeCourseLanguageModal to CoursesView 2015-11-23 11:52:15 -06:00
Scott Erickson
03a38f6129 Remove some logs 2015-11-23 08:53:13 -08:00
Scott Erickson
ea4a98af86 Add rest of CoursesView, untested, unhooked to server
On a plane, so skipping my usual iterative testing.
Bugs are undoubtedly everywhere.
2015-11-23 08:46:08 -08:00
Tuan Manh Lai
a0d5d2ea66 Update vi.coffee 2015-11-23 20:37:15 +07:00
Tuan Manh Lai
c00cfddf3b Update vi.coffee 2015-11-23 20:32:52 +07:00
Imperadeiro98
4a99870772 Merge pull request #3199 from Ikuyadeu/patch-1
Update ja.coffee
2015-11-23 12:28:27 +00:00
Yuki Ueda
cfbd62a899 Update ja.coffee 2015-11-23 16:28:34 +09:00
Matt Lott
b457514406 Add course headcount to old trial requests script 2015-11-22 16:08:18 -08:00
Matt Lott
1f962e7667 Fix analytics /db GET URL 2015-11-22 09:26:35 -08:00
Nick Winter
3b1f21eff5 Merge branch 'master' into production 2015-11-22 08:02:51 -08:00
Nick Winter
21810be8eb End an A/B test 2015-11-22 07:53:49 -08:00
Nick Winter
e0011ee5d0 Classroom invite codes are now real words like BigFrogFarm 2015-11-22 07:47:28 -08:00
Nick Winter
83051ac1fe Updated latest AB test script to run (it lives on the analytics server though) 2015-11-22 07:46:52 -08:00
Imperadeiro98
6756e5ebe6 Merge pull request #3196 from thatguy7/master
fixed some errors and added a few new tranlations
2015-11-22 12:13:27 +00:00
Scott Erickson
a98d0b1b2a Partial work on /courses view when signed in 2015-11-22 00:08:46 -08:00
Nick Winter
e1983f7556 Merge pull request #3191 from viettruong2194/text-overlap-contribute-page
Change z-index of contribute tiles to prevent overlap between dropdowns for #3127
2015-11-21 16:29:37 -08:00
Nick Winter
295a0e06e9 Merge pull request #3188 from viettruong2194/text-overlap-wooden-frame
Fix top margin and height for game-menu for #2963
2015-11-21 16:20:12 -08:00
Nick Winter
2dfaa1b7f3 Fix #3193: show completed levels again in campaign selector 2015-11-21 15:12:12 -08:00
thatguy7
c4146d046a fixed some errors and added a few new tranlations
As I played through some of the levels to see if I would suggest this
game to my students, I encountered multiple translations that were
either phrased very weirdly, grammatically incorrect or completely
nonsensical.

I fixed those and also translated a few new lines along the way.

The german word for buy ("kaufen") is shorter than the word for unlock
("freschalten") and should fit in the button. I suggest changing that,
but it feels like avoiding the word buy was a design decision, so I left
it as it is.
2015-11-22 00:11:12 +01:00
Scott Erickson
5aff591a8b Set up courses view for anonymous users 2015-11-21 11:38:34 -08:00
Scott Erickson
f1d4a9d53b Remove vestigial code from hour of code view template 2015-11-21 11:33:32 -08:00
Scott Erickson
9292396dad Add logout link to HourOfCodeView when signed in 2015-11-20 18:22:52 -08:00
Scott Erickson
27b21d0c4e Add classroom code handling to StudentSignUpModal 2015-11-20 18:02:02 -08:00
Scott Erickson
aee1f6587a Add StudentSignUpModal to HourOfCodeView 2015-11-20 16:28:28 -08:00
Nick Winter
0044f488e6 Trying to add A/B test result script 2015-11-20 16:11:33 -08:00
Matt Lott
c8aab5470d Merge branch 'master' into production 2015-11-20 15:53:16 -08:00
Matt Lott
9d329d4a1d Migrate external trial requests to database
Added created field to ~2800 older trial.requests
Inserted ~700 external requests from Google forms
2015-11-20 15:53:00 -08:00
Scott Erickson
65dd571041 Fix StudentLoginModal when email or password is not included 2015-11-20 15:17:04 -08:00
Scott Erickson
f7f405b774 Remove colons from template, unused formValues from view 2015-11-20 14:52:13 -08:00
Scott Erickson
f8cf3212dc Remove unneeded .input-border wrapper 2015-11-20 14:47:35 -08:00
Scott Erickson
b88a817e25 Fix login button text 2015-11-20 14:44:17 -08:00
Matt Lott
84acec2880 Classroom counts script 2015-11-20 14:29:06 -08:00
Scott Erickson
f8a5baa4f6 Finish StudentLoginModal implementation 2015-11-20 13:59:43 -08:00
Scott Erickson
70a3a199a0 Remove login button when you are logged in, refactor HOC view to always use a well 2015-11-20 13:36:50 -08:00
Scott Erickson
7cd031064f Fix HourOfCodeView padding 2015-11-20 13:32:45 -08:00
Scott Erickson
9dbd4d296a Merge branch 'master' into courses-vhoc 2015-11-20 13:28:43 -08:00
Matt Lott
0140361555 Merge branch 'master' into production 2015-11-20 13:19:07 -08:00
Scott Erickson
66b1e1b61d Fix /db/prepaid/<id>/redeemers when the creator is one of the redeemed, and prepaid tests in general 2015-11-20 13:17:33 -08:00
Scott Erickson
bcb869594d Add start of StudentLoginModal 2015-11-20 07:52:35 -08:00