Commit graph

12406 commits

Author SHA1 Message Date
Matt Lott
7a49eb4c77 Update /about Nolan png 2016-04-22 09:23:30 -07:00
JurianLock
156f53b0a0 Update nl-NL.coffee 2016-04-22 15:58:03 +02:00
Ana
7fcc5c9ae7 Update sr.coffee
-Prevedene nove stvari, par grešaka u pisanju ispravljeno
-Sekcija o uplatama je pisana u 2. licu množine (formalno), mada mogu prepraviti na 2. lice jednine, kao i za ostale sekcije što je pisano ranije
2016-04-22 15:31:03 +02:00
KonstantinLA
eab0712b75 Update ru.coffee
Translate nav module
2016-04-22 16:10:18 +03:00
Imperadeiro98
37e4976a0f Merge pull request #3566 from qinwenshi/master
Add Chinese translation for teachers
2016-04-22 13:08:11 +01:00
Matt Lott
b5f6fef862 Update /about benefits copy 2016-04-21 20:55:20 -07:00
Matt Lott
4a7518ca6f Add new team members to /about 2016-04-21 20:45:13 -07:00
Wen
d8793a315c Add Chinese translation for teachers 2016-04-22 11:34:13 +08:00
Rob
9fec6f6613 Don't break jQuery-UI autocomplete with algolia's 2016-04-21 11:21:11 -07:00
Imperadeiro98
3edb4612b4 Merge pull request #3565 from Ikuyadeu/patch-1
Update ja.coffee
2016-04-21 15:04:30 +01:00
Yuki Ueda
5280470af6 Update ja.coffee 2016-04-21 16:06:30 +09:00
Scott Erickson
a452f1ce47 Update teacher trial request views, some related bug fixes
* Tweak wording, options
* Instead of storing changes in local storage, warn when users may lose changes by navigating away
* Fix CreateTeacherAccountView so that if you connect to an existing account, the redirect is triggered
* Fix users.coffee weird race condition
2016-04-20 16:30:11 -07:00
Rob
67686e8c71 Add district complete to teacher convert page. 2016-04-20 10:37:00 -07:00
Rob
f79a9b96bf Add district picker to teachers/signup 2016-04-20 10:29:59 -07:00
edtrist
fb15c0bf94 Pause help videos when guide modal is not visible 2016-04-20 00:38:44 +01:00
phoenixeliot
b4b435283b Don't clear me before tests (needs more thought) 2016-04-19 13:10:45 -07:00
phoenixeliot
79d4fc3126 Merge branch 'dashboard-bugfixes' 2016-04-19 12:36:36 -07:00
phoenixeliot
e2d08fa7cf Stuff
Partially fix ActivateLicensesModal.spec

[IN PROGRESS] Don't display deleted users

Move userID to classroom.deletedMembers on user delete (not retroactive)

Fix PDF links for course guides, remove old PDFs from repo

Remove deprecated SalesView

Remove underline for not-yet-linked student names

Only show class select when there's more than one

Ignore case when sorting student names

Use student.broadName instead of name for display and sorting

Fix initial load not showing progress after joining a course (hacky)

Fix text entry for enrollment number input

Fix enrollment statistics

Fix enrollment stats completely (and add back in per-class unenrolled count)

Add deletedMembers to classroom schema

More fixes to enrollment stats (don't count nonmember prepaids)

Don't use 0 as implicit false for openSpots

Update suggested number of credit to buy automatically

Fix classroom edit form ignoring cleared values

Add alert text when more users selected than enrollments available

Alert user when trying to assign course to unenrolled students

Alert user when assigning course to nobody

Add some tests for TeacherClassView bulk assign alerts

Fix TeacherClassView tests failing without demos

Use model/collection.fakeRequests :D

Remove unused comment

Fix handling of improperly sorted deleted users on clientside

Add test for moving deleted users to deletedMembers

Add script for moving all deleted classroom members to classroom.deletedMembers

Completely rewrite tallying up enrollment statistics

Fix some tests to not be dependent on logged-in user

Address PR comments

Fix default number of enrollments to buy

Fix i18n for not enough enrollments

Use custom error message for classroom name length
2016-04-19 12:32:20 -07:00
phoenixeliot
3ed835639e Compress jumbotron by 10% 2016-04-19 10:38:58 -07:00
Rob
988eeeeb07 Merge branch 'school-complete' 2016-04-18 23:35:50 -07:00
Rob
8d61c4387d Clear NCES data if complete data is manually edited. 2016-04-18 23:33:59 -07:00
Rob
e64d585841 Add extra information when a school is autocompleted. 2016-04-18 22:54:43 -07:00
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
Cat Sync
7bf7fdd0ce Merge remote-tracking branch 'codecombat/master' 2016-04-14 16:19:14 -04: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