Scott Erickson
a676f26303
Tweak created date on teacher classroom view
2016-04-28 14:20:33 -07:00
phoenixeliot
91fa467251
Fix teacher sessionless play; uses default campaign levels
...
Fix typo
Fix race condition with loading next level
Return an empty object for next level instead of an error;
Supermodel has a race condition when some of the models fail to load,
when we override an error response as "success".
Fix next level spec
Remove comment per Scott's request
2016-04-28 12:46:09 -07:00
Imperadeiro98
135f7f05ad
Update pt-PT.coffee
2016-04-28 20:30:19 +01:00
Scott Erickson
3fed1743fc
Flatten /courses
2016-04-28 12:08:31 -07:00
phoenixeliot
64061d60e1
Don't show first course in bulk-assign dropdown
2016-04-28 11:33:29 -07:00
Rob
31495208bf
Add border to birthday selector to match style.
2016-04-28 11:29:05 -07:00
Scott Erickson
82675bf05a
Add created date to teacher classroom view
2016-04-28 11:28:02 -07:00
Scott Erickson
f0c0b549e2
Show language dropdown when anonymous
2016-04-28 11:15:36 -07:00
phoenixeliot
08986ffd37
Reposition continue button to always be visible (ShareProgressModal)
2016-04-28 11:09:44 -07:00
Rob
f39cac3abf
Try to keep learn more above the fold.
2016-04-28 10:52:37 -07:00
Nick Winter
51003d21dd
Propagate i18n
2016-04-28 10:09:52 -07:00
Nick Winter
747c5f29f7
Finally figured out how to use i18next interpolation correctly; using it on level counts in SubscribeModal
2016-04-28 10:07:47 -07:00
Nick Winter
d666e4e39c
Don't translate 'RetroStyle Games' in most cases
2016-04-28 10:07:47 -07:00
Matt Lott
8deea61be8
Update account restricted copy
2016-04-28 09:42:17 -07:00
Scott Erickson
997fe1aafb
CoursesView uses regular login and create account modals
2016-04-27 16:26:05 -07:00
Matt Lott
7b88eb0250
Remove Clojure from /about and play modals
2016-04-27 16:15:27 -07:00
Scott Erickson
7788608d2d
Navbars collapse below large screen sizes
2016-04-27 16:07:55 -07:00
Matt Lott
cdddc24693
Add user.ageRange enum values update note
2016-04-27 15:23:03 -07:00
Nick Winter
89db933c90
Change wording on enrollment purchase page for larger purchases
2016-04-27 14:17:53 -07:00
phoenixeliot
84ec2d630f
Make some Course materials teacher-only on dashboard
2016-04-27 13:24:54 -07:00
phoenixeliot
1999b41ff3
Don't convert to teacher automatically in EnrollmentsView
2016-04-27 13:20:19 -07:00
Imperadeiro98
9433cefcdc
Merge pull request #3579 from i32ropie/master
...
Update es-ES.coffee
2016-04-27 18:21:04 +01:00
Imperadeiro98
404171fd23
Merge pull request #3582 from KonstantinLA/patch-3
...
Update ru.coffee
2016-04-27 18:07:32 +01:00
Imperadeiro98
de23d178c2
Merge pull request #3578 from ana-esova/patch-1
...
Update sr.coffee
2016-04-27 18:04:27 +01:00
Scott Erickson
675e3290ac
Lock course content to classrooms
2016-04-27 09:58:04 -07:00
KonstantinLA
17fa7226e5
Fix build error
2016-04-27 16:06:21 +03:00
KonstantinLA
6868f1f7e4
Fix placeholder for the subscribe module
2016-04-27 15:52:59 +03:00
KonstantinLA
8000cdc139
Update ru.coffee
...
Added russian translation.
Some fixes
2016-04-27 15:34:06 +03:00
phoenixeliot
c9ed76471a
Add bad translations to Portuguese for testing purposes
2016-04-26 16:37:47 -07:00
phoenixeliot
7c1059bffa
Fix code review feedback
...
Fix code review feedback (2)
Fix code review feedback (3)
2016-04-26 16:37:36 -07:00
phoenixeliot
66f99dd834
Add translation tooltips for code
...
Tweak tooltips, add some translation keys
Fixed not showing translations for English-speakers
Remove comment
2016-04-26 16:37:07 -07:00
phoenixeliot
aa93a3ec6c
Translate spell type (function/method/snippet/etc)
2016-04-26 16:37:06 -07:00
phoenixeliot
02d833639b
Make LevelComponent names translatable, show spell name translations in doc tooltips
2016-04-26 16:37:06 -07:00
Rob
70999fa150
Track when COPPA dialog is shown.
2016-04-26 16:31:51 -07:00
Rob
4e630362ce
- Switch to flat modal
...
- Diffuse test time bomb
2016-04-26 14:35:07 -07:00
Rob
5bd8f7a1cb
COPPA tests.
2016-04-26 14:01:03 -07:00
Rob
4183764b61
Add birthday field to user that rejects users under 13 on signup.
2016-04-26 14:00:49 -07:00
Matt Lott
283c874496
Update /privacy COPPA section
2016-04-26 11:20:47 -07:00
Josh Callebaut
c6cbcd4777
Merge pull request #3395 from Zerrien/spade
...
Implements Spade functionality, and adds the sublime project file.
2016-04-26 11:15:17 -07:00
Josh Callebaut
c4652d82e2
Implements the SPADE logger into the SpellView
...
* Updates spade.js vendor file, adds a sublime-project for developers to use
* Moves server logic away from handlers
* Moves session update logic to middleware, sets up server schema to autorender IDs as ObjectIDs
* Modernizes the supermodel loading scheme and switches from constructor to initalize
2016-04-26 09:56:30 -07:00
Scott Erickson
3c715ceba8
Merge pull request #3562 from edtrist/PauseModalVideo
...
Pause help videos when guide modal is not visible
2016-04-26 09:39:12 -07:00
Eduardo Roldan
0c49e9d175
Update es-ES.coffee
2016-04-26 14:37:46 +02:00
Nick Winter
e4392019a4
Fix console.warning -> console.warn typo
2016-04-25 17:25:30 -07:00
Nick Winter
e96f4651f2
Add basic listening for code problems to Verifier
2016-04-25 17:03:08 -07:00
edtrist
405fbeabf8
use view jquery
2016-04-25 22:19:28 +01:00
Scott Erickson
e8d0ec08cb
Merge pull request #3572 from UltCombo/i18n-subscription-modal
...
Update subscribe modal's style to support i18n, fixes #3526
2016-04-25 13:22:18 -07:00
Scott Erickson
92f58b29b0
Merge branch 'i18n-subscription-modal-interpolate' of https://github.com/UltCombo/codecombat into UltCombo-i18n-subscription-modal-interpolate
2016-04-25 12:28:46 -07:00
Ana
cd9c2dfccb
Update sr.coffee
2016-04-24 21:56:46 +02:00
Ana
51a3eee697
Update sr.coffee
...
Translated more sections and fixed some previous lines~
2016-04-24 21:45:09 +02:00
Imperadeiro98
814c78be8b
Uncomment headers from sr.coffee
2016-04-24 14:45:08 +01:00
Imperadeiro98
582abb0d87
Merge pull request #3568 from ana-esova/patch-1
...
Update sr.coffee
2016-04-24 14:42:42 +01:00
Imperadeiro98
4fe258fe7f
Merge pull request #3576 from KonstantinLA/patch-2
...
Update ru.coffee
2016-04-24 14:41:10 +01:00
Imperadeiro98
b17c0b9785
Merge pull request #3575 from UltCombo/i18n-pt-br-newhome
...
i18n pt-BR: add and improve some `new_home` translations
2016-04-24 14:40:24 +01:00
Imperadeiro98
53f1216878
Merge pull request #3573 from Ikuyadeu/patch-1
...
Update ja.coffee
2016-04-24 14:39:18 +01:00
Imperadeiro98
a5a56f5085
Merge pull request #3569 from JurianLock/patch-9
...
Update nl-NL.coffee
2016-04-24 14:38:25 +01:00
Imperadeiro98
31d42f3132
Merge pull request #3567 from KonstantinLA/patch-1
...
Update ru.coffee
2016-04-24 14:36:58 +01:00
KonstantinLA
a7cb7a6207
Update ru.coffee
...
Added russian translation
2016-04-24 14:13:53 +03:00
UltCombo
fdb8b4ffeb
i18n pt-BR: add and improve some new_home
translations
2016-04-24 02:41:31 -03:00
Yuki Ueda
25bd614f9d
Update ja.coffee
2016-04-24 11:38:23 +09:00
UltCombo
0ad2d086eb
subscribe modal: interpolate feature values for all languages
2016-04-23 22:57:10 -03:00
Matt Lott
93194d4f1e
Change top nav Courses link to Students
2016-04-23 16:54:24 -07:00
UltCombo
304cdc1113
Update subscribe modal's style to support i18n, fixes #3526
...
Subscribe modal: make the "parent" and "sale" buttons take only as much space as necessary and the "subscribe" button takes all the remaining space, this fixes #3526 .
Here's how the new style looks:
### Before
![](http://i.imgur.com/uwt9Jed.png )
![](http://i.imgur.com/1VKdJjZ.png )
### After
![](http://i.imgur.com/2ElCHMT.png )
![](http://i.imgur.com/G4EAi1P.png )
2016-04-23 19:11:54 -03:00
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
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
Imperadeiro98
d07a3394d1
Update pt-PT.coffee
2016-04-18 19:00:25 +01: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
43a1dcad2b
Merge da.coffee
2016-04-16 18:07:39 -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
cundamic
6885de36fc
Update sk.coffee
...
subscription
2016-04-14 06:51:20 +02:00