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
### After
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
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
Catsync
7ff12f326f
Merge pull request #3548 from Catsync/autocomplete-hero
...
hero autocomplete hack
2016-04-13 14:59:21 -04: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
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
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
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
Imperadeiro98
4f1e186cc2
Merge pull request #3525 from LawrenceFebs/patch-1
...
Update it.coffee
2016-04-10 15:32:36 +01:00
cundamic
fe8f081cc4
Update sk.coffee
2016-04-10 12:14:43 +02:00
cundamic
f2440bdbc9
Update sk.coffee
...
translated 1-318
2016-04-10 12:10:57 +02:00
Murat Yüksel
bd4811d7fd
Added some TR translations
2016-04-09 17:48:11 +03:00
Scott Erickson
cabca6366f
Show guides when users are a teacher OR own a classroom
2016-04-08 10:14:47 -07:00
Josh Callebaut
6c0823486f
Merge pull request #3539 from Zerrien/solutionSchema
...
Changes terminology to match schema
2016-04-07 15:30:13 -07:00
Josh Callebaut
4275d41324
Changes terminology to match schema
2016-04-07 14:49:55 -07:00
Scott Erickson
5aeb559ad1
Fix ConvertToTeacherAccountView to save the email field
2016-04-07 14:40:21 -07:00
Matt Lott
5661a1fd8c
Add site origin data to course trial requests
2016-04-07 12:13:48 -07:00
Levente Laszlo
cf4bdba31d
Suggestions till line 55
2016-04-06 11:23:50 +02:00
Matt Lott
265f4a8c37
Update enrollments purchase blurb
2016-04-05 11:55:14 -07:00
Matt Lott
be254cf10e
Route homepage students to /courses instead of /play
2016-04-05 10:43:06 -07:00
Matt Lott
49e7506c62
Add parental leave benefits to /about page
2016-04-05 10:14:54 -07:00
Vladimir Ivakin
6ef5e6742c
Update ru translation
2016-04-05 23:05:11 +06:00
Scott Erickson
eba4afec17
Merge remote-tracking branch 'origin/master'
2016-04-05 09:43:46 -07:00
Scott Erickson
932238bb82
Fix /teachers redirect
2016-04-05 09:34:45 -07:00
Matt Lott
4b1486159c
Change teacher account convert terminology to update
2016-04-05 09:16:22 -07:00
Matt Lott
133574356a
Update /about page
...
Removing sales positions, adding marketing position
Updating benefits list
2016-04-05 06:29:03 -07:00
informaticienzero
622ff4cea1
Update fr.coffee
...
Corrections and typo changes to match French rules.
2016-04-05 12:13:00 +02:00
Matt Lott
a686021a8a
Update courses getting started guide
2016-04-04 16:11:27 -07:00
phoenixeliot
c826543b40
Remove kinda broken enrollment stats (temporary)
2016-04-04 16:09:58 -07:00
phoenixeliot
beb53d9f2f
Various fixes and changes to teacher-accounts and teacher-dashboard
2016-04-04 15:42:29 -07:00
Scott Erickson
58a5df7a4f
Restrict teacher and student accounts to their respective areas and actions
2016-04-04 15:20:34 -07:00
phoenixeliot
4a72ffc185
Implement all of teacher-dashboard
2016-04-04 15:19:27 -07:00
Scott Erickson
bd3a77da9f
Implement teacher accounts
2016-04-04 15:18:06 -07:00
Jozadaque Batista
a202681096
Update pt-BR.coffee
2016-04-04 16:34:02 -03:00
Jozadaque Batista
cfae28fc86
Update pt-BR.coffee
2016-04-04 15:08:00 -03:00
rafaelkan
6834a9069f
Update es-ES.coffee
...
Traslate: loading_error, concepts and legal
2016-04-04 16:05:17 +02:00
Imperadeiro98
5e2c726a2b
Merge pull request #3506 from rafaelkan/patch-2
...
Update es-ES.coffee
2016-04-03 18:12:56 +01:00
LawrenceFebs
d83395c4d8
Update it.coffee
2016-04-03 11:40:58 +02:00
Yuki Ueda
476b26fca2
Update ja.coffee
2016-04-02 18:14:30 +09:00
Scott Erickson
b01ab2eab1
Merge pull request #3521 from Kinzeng/master
...
Thang names
2016-04-01 09:29:26 -07:00
Kevin Zhang
8455bb2270
added Thang names
2016-04-01 01:07:39 -04:00
Yuki Ueda
08fb5baf17
Update ja.coffee
2016-03-31 18:47:41 +09:00
Scott Erickson
43389ac9b6
Merge pull request #3471 from delftswa2016/loggedIn-achievement-error
...
Error when accessing achievement without being logged in
2016-03-30 09:41:01 -07:00
Rob
f10bcd632c
Add esper support
2016-03-29 23:27:27 -07:00
Rob
e40b952ef2
Do something slightly better for loged in students.
2016-03-29 21:44:59 -07:00
Imperadeiro98
dfdfbf620c
Uncomment an header from sk.coffee
2016-03-29 20:24:55 +01:00
Imperadeiro98
322037f47d
Merge pull request #3512 from cundamic/patch-20
...
Update sk.coffee
2016-03-29 20:24:12 +01:00
Imperadeiro98
b65e0d5031
Merge pull request #3511 from cundamic/patch-19
...
Update sk.coffee
2016-03-29 20:23:20 +01:00
Keld Ølykke
87b66747e8
Update da.coffee
...
Added some glue words to make concatenated sentences flow.
2016-03-29 01:31:12 +02:00
Keld Ølykke
2163dfa115
Update da.coffee
...
Fixed wrong indentation of courses.length.
2016-03-29 00:56:19 +02:00
Keld Ølykke
fbe1a817a9
Update da.coffee
2016-03-29 00:40:19 +02:00
Scott Erickson
996200220f
Merge pull request #3508 from codecombat/fix-teacher-quote-scroll
...
Fix teacher quote page having lots of blank space at the bottom (after submitting the form)
2016-03-28 11:59:56 -07:00
Scott Erickson
6e16248cd8
Merge pull request #3509 from codecombat/header-avatar
...
Add small avatar to header
2016-03-28 11:17:58 -07:00
cundamic
0b22b6aa93
Update sk.coffee
...
Translation new_home finished.
2016-03-28 19:04:32 +02:00
cundamic
45b9395c3d
Update sk.coffee
...
Translation new_home II
2016-03-28 11:39:54 +02:00
UltCombo
8326b5e182
JS beautifier: fix loop construct, fixes #3510
...
As JavaScript is the only language supported by the beautifier, and [CodeCombat is in the process of converting things to while (true)](https://github.com/codecombat/codecombat/issues/3510#issuecomment-201965310 ), I guess adding this quick hack to the view's code should suffice for now. Hopefully, the non-standard `loop` construct will be removed from other languages before they receive beautifier support.
If this doesn't seem good, I can move this hack to `aether.beautify`, where it is possible to perform this substitution in a language-aware way (i.e. inside Aether's JavaScript implementation's [`beautify` method](418ccf2414/src/languages/javascript.coffee (L137)
2016-03-28 00:00:40 -03:00
Imperadeiro98
539d0b01cc
Update pt-PT.coffee
2016-03-26 21:38:59 +00:00
cundamic
ba2e92043a
Update sk.coffee
...
translated new _home 1
2016-03-26 17:48:44 +01:00
cundamic
85b2d42cc6
Update sk.coffee
...
tips translations
2016-03-26 15:49:04 +01:00
Rob Blanckaert
9da65cdcff
New homepage variations.
2016-03-25 17:09:58 -07:00
phoenixeliot
0355ea3e1a
Add small avatar to header
2016-03-25 16:25:51 -07:00
phoenixeliot
8d254c700a
Fix teacher quote page having lots of blank space at the bottom.
...
This is due to "flying-focus" taking up space at the bottom of the page. This solution is a bandaid. Ideally we have view-swapping logic that contains this type of thing and we just swap out views using one function.
2016-03-25 13:57:26 -07:00
Nick Winter
914e7eb487
Propagate i18n
2016-03-25 10:54:28 -07:00
rafaelkan
da01d7fdba
Update es-ES.coffee
...
Traslate
2016-03-25 01:25:09 +01:00
JurianLock
7b05223037
Update nl-NL.coffee
...
Reduced some translations so they fit better in the menu.
2016-03-24 15:34:15 +01:00
Maikel Langezaal
3be8220e0a
read only message
2016-03-24 14:10:09 +01:00
Imperadeiro98
87a30b74af
Merge pull request #3500 from Ikuyadeu/patch-1
...
Update ja.coffee
2016-03-24 11:21:23 +00:00
Imperadeiro98
5c8d6cc876
Merge pull request #3498 from sake12/master
...
update pl.coffee
2016-03-24 11:19:15 +00:00
Nick Winter
b208fddabb
Fix #3484
2016-03-23 15:56:45 -07:00
Nick Winter
00bd983590
Fix #3387
2016-03-23 15:24:38 -07:00
Rob
455dd813b1
Add image refrenced by OpenGraph.
2016-03-22 12:47:13 -07:00
Imperadeiro98
5676c6b2e4
Add i18n to new level loading strings
2016-03-22 12:02:36 +00:00
Matt Lott
50171a5b02
🐛 Fix admin trial requests page
...
Server refactoring exposed incorrect server parameters.
2016-03-21 11:39:15 -07:00
Nick Winter
eec50c8e44
Only collapse collision shapes for walls
2016-03-21 10:57:38 -07:00
Matt Lott
6a4132e057
Update campaign ads test groups
2016-03-21 08:07:22 -07:00
Yuki Ueda
27f5cb5e45
Update ja.coffee
2016-03-21 20:06:09 +09:00
Matt Lott
d1ae4adfbb
Merge pull request #3499 from IC-Induja/master
...
Added 9 new loading screen comments
2016-03-20 05:40:17 -07:00
Matt Lott
2bf028cc4a
Update /about page team section
2016-03-20 05:30:52 -07:00
IC-Induja
57bd7ab5f8
Update level_loading.jade
2016-03-20 01:20:42 -04:00
sake12
9a52185e77
Update pl.coffee
2016-03-19 20:13:30 +01:00
Krzysztof Pomarański
1e9f950717
update pl.coffee
2016-03-19 12:25:56 +01:00
Matt Lott
5d71acba05
Replace HipChat with Slack
2016-03-18 17:05:21 -07:00
Nick Winter
905c9cdb93
Use victory text and next level data on level completion. Update picoCTF logo.
2016-03-18 14:18:41 -07:00
Nick Winter
dc3ba40a45
One more change from #3483
2016-03-18 11:35:56 -07:00
Nick Winter
c42f2512e9
Merge nl-NL.coffee
2016-03-18 11:35:04 -07:00
Nick Winter
13928884b0
Merge iDEAL link for nl on home
2016-03-18 11:16:28 -07:00
Nick Winter
4a737d3045
Merge iDEAL link for nl on home
2016-03-18 11:14:10 -07:00
Scott Erickson
d6a46826e6
Add top margin to base-flat footer
2016-03-18 11:03:55 -07:00
Scott Erickson
461fb14f37
TestView styling and responsive tweaks
2016-03-18 11:03:55 -07:00
Scott Erickson
ecfb148b3c
Add spacing classes to style-flat
2016-03-18 11:03:55 -07:00
