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
Scott Erickson
2a399e71fa
Add CocoView.scrollToTop
2016-03-18 11:03:55 -07:00
Scott Erickson
e6593dea8d
Refactor FacebookHandler and GPlusHandler
...
* Move api loading to FacebookHandler
* Use success callbacks
* Use same, properly named events
* Use same functions and property names
* Refactor related social button, out of use rendering system
* Remove the now unnecessary form split from CreateAccountModal
2016-03-18 11:03:55 -07:00
Scott Erickson
93c7072d8d
Refactor ConfirmModal for #3138 and #3488
2016-03-18 11:03:55 -07:00
Scott Erickson
1c629a3181
Fix options in forms.objectToForm
2016-03-18 11:03:55 -07:00
Scott Erickson
f21baa7af5
Migrate /db/trial.request for #3469
2016-03-18 11:03:55 -07:00
Scott Erickson
356523dd4b
Add .btn-burgandy
2016-03-18 11:03:54 -07:00
Scott Erickson
46afe40637
Fix forms.scrollToFirstError when there is no error to scroll to
2016-03-18 11:03:54 -07:00
Scott Erickson
2e96a387e9
Add User.logout to client
2016-03-18 11:03:54 -07:00
Matt Lott
255ebbc048
Ads for free campaign players
...
Display leaderboard ads on campaign and play views.
Do no show ads in classroom, picoCTF, or to teachers.
Add no ads blurb to subscription features matrix.
Scale game UI for ads on short screens.
Closes #3491
2016-03-18 10:29:31 -07:00
Matt Lott
f14575ece6
Update subscribe modal level counts
2016-03-17 17:29:47 -07:00
Maikel Langezaal
49d7028e2e
Cleanup
2016-03-17 11:30:19 +01:00
Imperadeiro98
9a36267ba7
Cleanup i18n in some files
2016-03-16 21:49:19 +00:00
Zeldaretter
d565d5bc0b
Update de-DE.coffee
...
i added and translated all lines that where missing from the original English en.coffee
I would like to Copy my changes to the Austrian German version, because it is nearly the same and if some Austrian Translator finds an error or a better word than he can edit it, but its like british and american English and both understand each others well and here I think its better to have German than English, what do you think?
2016-03-16 18:36:53 +01:00
Imperadeiro98
e6b0eb6401
Merge pull request #3492 from JurianLock/patch-7
...
Update nl-NL.coffee
2016-03-16 12:59:22 +00:00
Imperadeiro98
1b1ac3028f
Merge pull request #3490 from Zeldaretter/patch-1
...
Update de-DE.coffee
2016-03-16 12:58:26 +00:00
JurianLock
3a46ada802
Update nl-NL.coffee
...
Another set of updates.
2016-03-16 13:02:20 +01:00
Zeldaretter
10dc03bc7e
Update de-DE.coffee
...
Added some new strings from the English original
2016-03-16 10:12:35 +01:00
Zeldaretter
0ec23f025c
Update de-DE.coffee
...
new updated strings, I finished translating. Next I will check if all strings are correct by comparing with the English original because some strings were allready translated and may not fit with the new layout.
Greetings and Thank you for a great game
2016-03-16 09:09:21 +01:00
Nick Winter
42e1ab6c99
Fix wall collision coalescing code
2016-03-15 15:52:15 -07:00
Zeldaretter
07f21d44bd
Update de-DE.coffee
...
New strings translated. Nearly done, till Eastern I will finish this and start comparing with the english strings again.
2016-03-15 22:01:03 +01:00
Nick Winter
ab29f7e10e
Don't try to use Arvo for Cyrillic language headline fonts
2016-03-15 10:15:16 -07:00
Nick Winter
db813bd77e
Merge zh-HANS.coffee
2016-03-15 08:47:20 -07:00
Imperadeiro98
c07b100712
Merge pull request #3489 from JurianLock/patch-6
...
Update nl-NL.coffee
2016-03-15 15:32:55 +00:00
Imperadeiro98
e5348e665c
Merge pull request #3485 from MatiasOlivera/master
...
Update es-419.coffee
2016-03-15 15:26:45 +00:00
Imperadeiro98
719e45a084
Merge pull request #3481 from Zeldaretter/patch-1
...
Patch 1
2016-03-15 15:23:30 +00:00
Imperadeiro98
f659d22fa5
Merge pull request #3480 from delftswa2016/Chinese-translation
...
Chinese translation
2016-03-15 15:20:31 +00:00
Nick Winter
8a93374a87
Fix silly ancient math mistake
2016-03-15 08:05:00 -07:00
JurianLock
c1fb0c53a9
Update nl-NL.coffee
...
Another set of updates and tweaks.
2016-03-15 01:22:02 +01:00
Nick Winter
e5dda556c6
Add Mandate configuration for session save delays
2016-03-14 16:39:05 -07:00
Scott Erickson
07aad0ca18
Merge pull request #3463 from delftswa2016/maximize-button-fix
...
Fix the fullscreen-code button and beautiful-code button
2016-03-14 10:45:08 -07:00
Jacob Boon
ce8f7f2c14
include iDeal offer for Dutch (nl) users
2016-03-14 16:39:16 +01:00
Zeldaretter
d9e271da4a
Update de-DE.coffee
...
Just did the changes. I don't know if it is good to translate the job benefits, because some of them don't work in Germany and I think if someone wants to work for you they have to at least speak enough English to understand this benefits.
2016-03-14 07:05:01 +01:00
lazydogP
bdf59fe430
Update zh-HANS.coffee
2016-03-14 13:00:44 +08:00
Matías Olivera
d5b8f5c726
Update teachers_quote
2016-03-13 21:56:06 -03:00
Matías Olivera
147db289fb
Update about
2016-03-13 21:06:11 -03:00
Chengxin Ma
d2cefce7da
Update zh-HANS.coffee
2016-03-13 22:42:12 +01:00
Chengxin Ma
286b8161ca
Update zh-HANS.coffee
2016-03-13 22:37:26 +01:00
Yu Liang
3dfb0c04b8
add margin-left for id 'create-account-btn'
2016-03-13 16:36:36 +01:00
Jan van den Berg
e449571139
Update nl-NL.coffee
...
Minor language fixes
2016-03-13 12:11:18 +01:00
yuliang123
c875c8c5ec
fix misaligned login
2016-03-13 00:22:19 +01:00
Zeldaretter
37944f38d9
Update de-DE.coffee
...
typo
2016-03-12 22:18:31 +01:00
Zeldaretter
c968341cb4
Update de-DE.coffee
...
6hours of translating, only some Classroom stuff needs to be translated now.
2016-03-12 22:15:22 +01:00
yuliang123
1a11ade67b
Update zh-HANS.coffee
2016-03-12 21:51:20 +01:00
yuliang123
b48e8eeecf
Update zh-HANS.coffee
2016-03-12 21:39:26 +01:00
Nick Winter
96d0f4e7ee
Merge nl-NL.coffee
2016-03-12 08:48:51 -08:00
Nick Winter
4f9932cd2f
Merge pull request #3479 from delftswa2016/new-homepage-header-i18n
...
updated new homepage header (i18n)
2016-03-12 08:43:31 -08:00
Imperadeiro98
4b96cd272b
Merge pull request #3477 from delftswa2016/update-Chinese-translation
...
Update zh-HANS.coffee
2016-03-12 14:12:03 +00:00
Imperadeiro98
7bce51c06b
Small fixes to previous merge
2016-03-12 14:11:14 +00:00
Imperadeiro98
546ced6816
Merge pull request #3474 from mqrelly/master
...
Update hu.coffee: Translate new home page to Hungarian.
2016-03-12 14:09:33 +00:00
Imperadeiro98
820aeb0b04
Merge pull request #3467 from delftswa2016/NL-translation
...
NL translation
2016-03-12 14:07:56 +00:00
Imperadeiro98
e4ab59ef65
Added a diplomat
2016-03-12 14:03:59 +00:00
Imperadeiro98
551ec13743
Rearranged quotation marks in es-419.coffee
2016-03-12 14:02:45 +00:00
Imperadeiro98
d8ffcb355c
Merge pull request #3464 from MatiasOlivera/master
...
Update es-419.coffee
2016-03-12 13:59:47 +00:00
Imperadeiro98
200d91a8a6
Merge pull request #3461 from Zeldaretter/patch-1
...
Update de-DEcoffee
2016-03-12 13:58:55 +00:00
Chengxin Ma
6ff7c562a8
updated new homepage header (i18n)
2016-03-12 12:19:21 +01:00
Chengxin Ma
db52cd0c83
updated new_home in zh-HANS.coffee
2016-03-12 02:26:42 +01:00
Chengxin Ma
e02083214a
updated new_home in zh-HANS.coffee
2016-03-12 02:19:20 +01:00
Matt Lott
3a1627682d
Update homepage logged out copy
2016-03-11 15:44:37 -08:00
Szabadkia Márk
ba266eae5c
Update hu.coffee: Translate new home page to Hungarian.
...
Also fix minor spelling errors.
2016-03-12 00:14:51 +01:00
Scott Erickson
464430200c
Fix AccountSettingsView to only try to change permissions in development
2016-03-11 15:00:55 -08:00
JurianLock
1d7d9c76b6
Update nl-NL.coffee
...
Another set of updates and tweaks
2016-03-12 00:00:51 +01:00
Scott Erickson
9d315a4848
Fix "students enrolled" to "students assigned" in TeacherCoursesView
2016-03-11 14:13:44 -08:00
Maikel Langezaal
5aff988ec5
Cleaned up code
2016-03-11 21:08:13 +01:00
Maikel Langezaal
e07d2561bd
Made the treema visible to be build, but disabled and hidden the buttons
2016-03-11 21:01:06 +01:00
Maikel Langezaal
b4c8948f6e
small typo
2016-03-11 19:33:59 +01:00
Matías Olivera
e614e5a76c
Update play_level's tips
2016-03-11 14:05:23 -03:00
Martijn Cligge
550cec9cd1
NL. Coffee _ Added more translations
...
Added more translations and corrected old ones
2016-03-11 18:00:13 +01:00
Matías Olivera
d3323fc9c7
Update nav
2016-03-11 13:56:42 -03:00
Matías Olivera
cba4fbcad6
Update new home
2016-03-11 13:54:21 -03:00
yuliang123
457d6bbc6c
Fix the fullscreen-code button and beautiful-code button
2016-03-11 16:59:45 +01:00
Maikel Langezaal
bee812149b
Additions to dutch translation
2016-03-11 15:58:40 +01:00
Matt Lott
acba838db4
🐛 Request demo Ux bugs
...
Only ask about login if not logged in
Add missing set up a class i18n string
2016-03-10 14:40:16 -08:00
Scott Erickson
84cdf1e2ce
Add showRequiredError and showSignupRationale alerts and tests to CreateAccountModal
2016-03-10 11:37:31 -08:00
Scott Erickson
a59e96f277
Tweak invalid class code behavior, fix hide modal button test
2016-03-10 11:23:09 -08:00
Scott Erickson
ebc98f988f
Refactor CreateAccountModal out of AuthModal, add class code to signup
2016-03-10 10:52:11 -08:00
Zeldaretter
5006fa8df3
Update de-DEcoffee
...
new translations.
please add me to the diplomatpages if you like my work, that would be a great honour.
Thanks^^
2016-03-10 16:47:26 +01:00
Imperadeiro98
910953d383
Fix build (part 2)
2016-03-10 14:47:45 +00:00
Imperadeiro98
a0b52aca49
Fix build
2016-03-10 14:37:38 +00:00
Imperadeiro98
60f0522192
Uncomment header in nl-NL.coffee
2016-03-10 14:36:48 +00:00
Imperadeiro98
b9e7417b07
Merge pull request #3460 from JurianLock/patch-4
...
Update nl-NL.coffee
2016-03-10 14:35:45 +00:00
Imperadeiro98
ed926ff799
Merge pull request #3459 from Zeldaretter/patch-3
...
Update De-de-coffee
2016-03-10 14:34:15 +00:00
Imperadeiro98
d3d408c5c6
Merge pull request #3455 from Agalondia/patch-1
...
Update id.coffee
2016-03-10 14:32:37 +00:00
Galandre Athalon
cbf8ebd98c
Update id.coffee
...
There, i've got rid of the # in the translated bits, and change some things and translated a lot of others :D
2016-03-10 19:35:22 +08:00
JurianLock
aeec7a8e9c
Update nl-NL.coffee
...
Another set of tweaks and updates
2016-03-10 11:37:47 +01:00
Zeldaretter
4d72fbeb63
Update De-de-coffee
...
New translations
2016-03-10 11:33:48 +01:00
Imperadeiro98
84ffdc8df2
Merge pull request #3446 from vellrya/patch-1
...
Update ru.coffee
2016-03-09 20:23:58 +00:00
Agalondia
6fec94ffbd
Update id.coffee
...
Here's my translation for Indonesian, please consider it guys!
2016-03-09 22:17:29 +08:00
Chengxin Ma
a8e72aac70
fix Chinese grammar
2016-03-09 11:04:46 +01:00
Matt Lott
eb7bebe293
Add DAU 30-day avg and daily total to dashboard
2016-03-08 15:27:57 -08:00
JurianLock
25f598934d
Update nl-NL.coffee
...
Few tweaks and some general updates.
2016-03-08 23:44:08 +01:00
Matt Lott
bce9862be2
Update request demo Ux
...
Renaming request quote to request demo
Changing create class wording to set up class
Showing different UI if teacher or not
Adding gameplay screenshots to homepage
Update request demo email
Closes #3449
2016-03-08 09:30:50 -08:00
Robin Yang
ee331cc9c5
Change request quote headings H1/H2 to H3/H4
2016-03-07 13:56:34 -08:00
Imperadeiro98
86e10d0c34
Fix previous merge
2016-03-07 19:22:52 +00:00
Imperadeiro98
1577dc5708
Merge pull request #3444 from JurianLock/patch-2
...
Update nl-NL.coffee
2016-03-07 19:22:17 +00:00
Nick Winter
6a9a36b1eb
Don't show misc achievements in picoCTF mode
2016-03-07 09:54:29 -08:00
Nick Winter
78379f2e6a
Merge pull request #3440 from Imperadeiro98/master
...
Remove i18n from admin pages
2016-03-07 09:16:07 -08:00
Nick Winter
6d246129de
Make languages fall sideways if needed (ex: nl-BE using nl-NL instead of en)
2016-03-07 08:13:49 -08:00
Nick Winter
9dc6a04f5e
Fix #3447
2016-03-07 07:02:01 -08:00
vellrya
eb32320b6f
Update ru.coffee
2016-03-07 15:25:29 +03:00
JurianLock
b6f1a5046d
Update nl-NL.coffee
2016-03-06 23:16:14 +01:00
Imperadeiro98
ba12f0b7f4
Fix previous merge
2016-03-06 21:39:43 +00:00
JurianLock
01d250caf3
Update nl-NL.coffee
2016-03-06 22:30:09 +01:00
sake12
44cf0931c4
Update pl.coffee
2016-03-06 12:10:53 +01:00
Imperadeiro98
773c640ced
Fix build
2016-03-05 15:25:12 +00:00
Imperadeiro98
2442115892
Remove i18n from admin pages
2016-03-05 15:08:27 +00:00
Imperadeiro98
88091cf166
Update pt-PT.coffee
2016-03-05 14:15:52 +00:00
Nick Winter
fb9b169c62
Propagate a big i18n
2016-03-04 15:51:16 -08:00
Nick Winter
1ccad78782
Submit picoCTF solutions, show progress, disable sound
2016-03-04 11:44:43 -08:00
Scott Erickson
0b6390795a
Tweak text on admin page
2016-03-04 11:14:18 -08:00
Scott Erickson
a2249f8df1
Add return-to-admin (turn off espionage mode)
2016-03-04 10:43:17 -08:00
Nick Winter
59e8c42ddb
Client-side support for beating picoCTF levels
2016-03-03 17:18:24 -08:00
Scott Erickson
47f3223be1
Fix and improve new errors system
...
* Fix error property name -> errorName
* showNotyError can handle Backbone error callbacks where jqxhr is second param
* showNotyError correctly shows JSON error message or name
* Add timeout to showNotyError
2016-03-03 13:59:17 -08:00
Nick Winter
bada484445
Fix fetchPatchesWithStatus for non-versioned models
2016-03-02 16:19:33 -08:00
Imperadeiro98
defade9824
Merge pull request #3435 from Zeldaretter/patch-1
...
Update de-DEcoffee
2016-03-01 21:26:21 +00:00
phoenixeliot
939265a119
Fix supermodel.trackModel
2016-03-01 10:33:45 -08:00
Matt Lott
9e8e865049
Remove old homepage
...
Turning off homepage a/b testing for now, but leaving the plumbing in
because we’ll be iterating on that shortly.
2016-03-01 09:48:53 -08:00
Yuki Ueda
bfe45cbb88
Update ja.coffee
2016-03-01 20:47:09 +09:00
Matt Lott
19b7fe7295
Remove iOS position from /about careers section
2016-02-29 15:16:09 -08:00
Matt Lott
2e2bf95ff7
Remove classroom MAUs from KPI graphs
...
Covered by active classes, and doesn’t make sense to have separate MAU
scales between classroom and campaign.
2016-02-29 13:58:00 -08:00
Zeldaretter
84f28b15c2
Update de-DEcoffee
...
New lines and some typos fixed
2016-02-29 19:49:05 +01:00
Mario Catuogno
b9379c9984
Update it.coffee
2016-02-29 13:56:37 +01:00
Imperadeiro98
4b20258cef
Merge pull request #3432 from MarioCatuogno/patch-1
...
Update it.coffee
2016-02-29 12:44:53 +00:00
Imperadeiro98
5f74bef303
Merge pull request #3431 from mqrelly/master
...
Update hu.coffee
2016-02-29 12:39:11 +00:00
Mario Catuogno
bddf849f1e
Update it.coffee
...
Tried to translate some new lines to help.
2016-02-29 02:18:10 +01:00
Matt Lott
e56efe5921
Fix analytics MAUs and campaign paid users
2016-02-28 15:24:35 -08:00
Szabadkia Márk
e81fc634b2
Update hu.coffee
2016-02-28 21:58:17 +01:00
Imperadeiro98
a8f1ca7c7e
Fix build
2016-02-28 18:11:59 +00:00
Zeldaretter
1fabe3224e
Update de-DEcoffee
...
New strings translated into german. Please add this strings soon. Thanks a lot
2016-02-28 18:41:52 +01:00
Nick Winter
859e127e14
Merge pull request #3422 from blorente/master
...
Added some lines for #710
2016-02-27 16:58:47 -08:00
Imperadeiro98
5c4f9b6947
Small fixes to new-home-view.jade
2016-02-27 08:25:57 +00:00
Imperadeiro98
02a91642fc
Merge master
2016-02-27 08:07:59 +00:00
Maikel Langezaal
b2aef32699
Trailling spaces removed, typo fixed and added 1 tag
2016-02-26 23:28:39 +01:00
Nick Winter
a6333cf739
Propagate SpriteParser's auto-insignificant-tween skipping fix to SpriteBuilder too
2016-02-26 11:42:32 -08:00
Matt Lott
1f7489970e
Remove auto-refresh from subs dashboard
2016-02-26 10:36:04 -08:00
Scott Erickson
b64a212a17
Merge branch 'master' of https://github.com/Imperadeiro98/codecombat into Imperadeiro98-master
2016-02-26 09:38:09 -08:00
Matt Lott
7bd0936c93
Import approved trial requests into Close.io
2016-02-26 06:21:31 -08:00
Maikel Langezaal
40ed5618b8
Added i18n tags for new HomePage Issue #3413
2016-02-26 11:43:38 +01:00
minwook shin
d816b4388f
2/26 ko update.
2016-02-26 11:59:44 +09:00
Scott Erickson
e7366040f3
Add full screen button to tutorial videos in Safari
2016-02-25 17:13:42 -08:00
Scott Erickson
2a69ca3774
Fix lesson time estimate dropdown in NewHomeView
2016-02-25 16:49:26 -08:00
Scott Erickson
3f8652d9a9
Add showNotyNetworkError to app/core/errors
2016-02-25 15:50:53 -08:00
Scott Erickson
bd20536046
Add validateEmail to forms
2016-02-25 15:28:04 -08:00
Scott Erickson
1c4a84dee6
Handle when a SomethingResource fails, show Unknown Error
2016-02-25 15:15:39 -08:00
Scott Erickson
43a659ea80
Add styling for modal-base-flat
2016-02-25 15:15:15 -08:00
Scott Erickson
946436083c
Add updateSelects to forms
...
So that in forms you don't have to find the equality for each option. Instead,
just set the select value and, afterRender, call updateSelects, the options that
matches the value will become selected.
2016-02-25 15:14:48 -08:00
blorente
ef8ed4b6ed
Added some lines for #710
2016-02-25 23:41:27 +01:00
phoenixeliot
10e03c87c1
Fix style-flat color, .text-h1/2/etc style
2016-02-25 13:22:41 -08:00
Scott Erickson
78d221fe4c
Refactor AdministerUserModal to use new flat style instead of legacy plain style
2016-02-25 11:49:34 -08:00
Scott Erickson
8b22b78f74
Add style-flat base
...
To create a modal with the flat style, just use modal-base-flat instead of modal-base
2016-02-25 11:40:27 -08:00
Imperadeiro98
b5bbe85836
Revert jobs i18n
2016-02-25 18:28:45 +00:00
Matt Lott
6a48fbb3aa
Add courses to progress-reset warning
2016-02-25 10:08:16 -08:00
Matt Lott
8d1c39e714
Merge pull request #3421 from codecombat/AboutPageFixes
...
Improve responsiveness on fixed nav
2016-02-25 09:36:03 -08:00
phoenixeliot
401c185108
Improve responsiveness on fixed nav
2016-02-25 09:25:13 -08:00
Nick Winter
e2f40994e4
Merge lt.coffee
2016-02-25 09:03:00 -08:00
Imperadeiro98
62c5b34a96
Update About page i18n
...
Also fixed some images
2016-02-25 15:48:29 +00:00
Scott Erickson
fc800935aa
Fix screenshot carousel when focused on the carousel control and pressing arrow keys
2016-02-24 16:55:18 -08:00
phoenixeliot
f1b046b50e
Refactor Request Quote page to flat-style
2016-02-24 16:23:21 -08:00
phoenixeliot
4b02f120e2
Add new About page and refactor out flat-style
2016-02-24 16:22:06 -08:00
Imperadeiro98
42f84de394
Merge master branch
2016-02-24 19:40:21 +00:00
Imperadeiro98
9c12f6c957
Revert changes to LevelLoader and SuperModel
2016-02-24 19:32:28 +00:00
Matt Lott
e74a77342c
Update admin trial requests page
...
Add role and phone number
Move notes to separate line
Display last 1000 reviewed instead of 100
2016-02-24 10:22:55 -08:00
Nick Winter
9a344d1a61
Sort a few name categories; remove a log.
2016-02-24 08:49:39 -08:00
Nick Winter
cac20fd39c
Merge pull request #3416 from delftswa2016/additional-thang-names
...
Some additions to Ogre and Horse names
2016-02-24 08:46:49 -08:00
Matt Lott
609884eb51
Update furthest course dashboard tables
...
Adding a second table, setting range to be 60 and 365 days.
Updating teacher columns to prioritize student paid status over
furthest student course.
2016-02-24 06:25:01 -08:00
Matt Lott
dd603a0436
Add school sales table to dashboard
2016-02-24 06:25:01 -08:00
Matt Lott
e471d652e5
Add more year long dashboard graphs
2016-02-24 06:25:01 -08:00
Maikel Langezaal
8882ff8d46
Some additions to Ogre and Horse names
2016-02-24 12:56:02 +01:00
Scott Erickson
e2feeb8330
Prevent didReappear from setting up shortcuts twice for RootViews
2016-02-23 12:00:07 -08:00
Scott Erickson
becad06750
Refactor ArticleEditView and PatchesView to use model endpoint functions
2016-02-22 16:03:21 -08:00
Robin Yang
1d57199707
Add new buttons for email templates
...
Used in Request Quote Confirmation email.
2016-02-22 14:29:05 -08:00
Nick Winter
f16dbcd63c
Merge pull request #3379 from jamesvdh/patch-1
...
Update nl-BE.coffee
2016-02-22 13:22:51 -08:00
Nick Winter
99acf2d40e
Properly skip tweens for shadows we removed during sprite parsing
2016-02-22 13:11:46 -08:00
Nick Winter
956f9dc43d
Handle updated CreateJS exports in SpriteParser
2016-02-22 12:57:35 -08:00
Scott Erickson
3c3db79ac1
Fix #3388
...
Overflow: hidden was cutting of info in the play view. Without it in the new home page, though,
infinite banners would expand the size of the page. Tried figuring out a way to not make the new
page require hiding overflow but found no obvious solution. Pages with infinite banners will
just need to be set to overflow: hidden individually.
2016-02-22 11:12:19 -08:00
Matt Lott
cac9a7463f
Dashboard monthly revenue counts, and tabs
2016-02-20 17:27:45 -08:00
Scott Erickson
16969e1d5a
Fix Travis tests
2016-02-19 13:58:21 -08:00
Scott Erickson
3390663486
Fix GuideView to use session.codeLanguage by default
2016-02-19 10:55:42 -08:00
adeeb1
e71a4b71dc
Fixed GitHub authentication - #1764
2016-02-19 10:07:05 -08:00
Matt Lott
19d0e67002
Dashboard classroom vs campaign year chart
2016-02-19 09:32:17 -08:00
Matt Lott
ce525e7d99
Add played definition to analytics dashboard
2016-02-18 09:14:36 -08:00
Imperadeiro98
92dc72cce1
Remove name from loadModel
2016-02-18 16:44:40 +00:00
Yuki Ueda
f942816188
Update ja.coffee
2016-02-18 21:57:01 +09:00
Matt Lott
1f01b3ffbd
Update revenue analytics with payment.prepaidID
2016-02-17 13:01:09 -08:00
Scott Erickson
cf030146e8
Restrict request quote emails
...
* If logged in => repopulate and lock email (and name if available)
* If logged out => disallow using an email for an existing account and display a validation message + login link
2016-02-17 11:51:26 -08:00
Nick Winter
b5bb662ed2
Add picoCTF problem descriptions to levels; streamline picoCTF flows more
2016-02-17 11:33:56 -08:00
Scott Erickson
0905a378a0
Fix recent scrolling changes for Firefox
2016-02-17 11:21:43 -08:00
Scott Erickson
53eea0c236
Fix navigation from one page to the next
...
* Reset flying focus so it doesn't lengthen the page
* Scroll to the top of the page when switching views
2016-02-17 11:05:52 -08:00
Scott Erickson
c8551a6382
Make new home page responsive
2016-02-17 11:05:20 -08:00
Matt Lott
cb29d7068b
Add prepaids to payments
...
Closes #3402
2016-02-17 10:08:44 -08:00
Nick Winter
37fbd8ca21
Start to play picoCTF levels as course levels without hero selection
2016-02-17 09:53:45 -08:00
Nick Winter
fe351be32e
Start to rework CampaignView when we're in picoCTF mode
2016-02-16 20:39:59 -08:00
Scott Erickson
c2f02ebbfb
Fix scrollToLink, including removing unneeded offset
2016-02-16 10:47:49 -08:00
Matt Lott
73657d5428
Update analytics dashboard
...
Splitting out classroom and campaign active users
Adding more detailed active users graphs
Patching up missing analytics log events for 2/2/16-2/9/16
2016-02-16 09:23:42 -08:00
Nick Winter
1f52329c7a
Merge pull request #3391 from khoa102/master
...
new update
2016-02-14 12:03:47 -06:00
minwook shin
a682bfffa2
korean translate continue...
...
parent = 부모
but korean manner is [Top people]+님(:nim)
so, 부모님=부모(parent)+님(:nim)xk
2016-02-13 11:15:40 +09:00
Tran Anh Khoa
ea6d68ce5b
Update vi.coffee
2016-02-12 14:32:02 -06:00
Ihsara
a008597e35
Update vi.coffee
...
minor changes
2016-02-12 22:24:45 +02:00
Tran Anh Khoa
16a977103a
Update vi.coffee
2016-02-12 10:43:53 -06:00
Ihsara
6105ef7b16
Merge pull request #7 from khoa102/khoa102-patch-1
...
Update vi.coffee
2016-02-12 18:03:18 +02:00
Tran Anh Khoa
2fbbf33455
Merge pull request #8 from codecombat/master
...
Update from Original Fork
2016-02-12 09:30:41 -06:00
minwook shin
5b58e58b86
Always korean translate
...
313 : Are the words taken from the Wizard of Oz ? i dont know munckin. so, i translate munchkin -> 난쟁이(dwarf : short man)
317 : Padawan is (star wars)yoda's Padawan?? i translate padawan -> 파[pa]다[da]완[wan] (I wrote as sound .)
355 : car and carpet... korean naming, car = 차[:cha]. add (카)[car] (I wrote as sound .)
2016-02-12 21:55:32 +09:00
Tran Anh Khoa
e576202132
Update vi.coffee
2016-02-11 21:41:18 -06:00
Tran Anh Khoa
67abb47abe
Update vi.coffee
...
Fix bug on line 1150:
Line 1234: edit a few word
Line 665: thuê bao -> gói đăng ký
2016-02-11 09:08:24 -06:00
Imperadeiro98
6b7337ab3f
Merge pull request #3386 from sungame/patch-1
...
Update sv.coffee
2016-02-11 14:20:27 +00:00
Ihsara
99d7821f61
Update vi.coffee
...
contributors job description update
2016-02-11 15:18:46 +02:00
Ihsara
895d8f378d
Update vi.coffee
...
contributors update
2016-02-11 13:36:56 +02:00
Ihsara
489a3ccb64
Update vi.coffee
...
monor changes
2016-02-11 12:21:00 +02:00
Tran Anh Khoa
be7760c45e
Merge pull request #6 from codecombat/master
...
Update from Original
2016-02-10 19:57:41 -06:00
Tran Anh Khoa
27a48616f7
Update vi.coffee
2016-02-10 17:58:12 -06:00
Tran Anh Khoa
8c86e8be24
Merge pull request #5 from khoa102/Ihsara-patch-1.0viTrans
...
Update vi.coffee
2016-02-10 16:53:10 -06:00
Nick Winter
6800ea2ff7
Add picoCTFProblem field to levels
2016-02-10 14:16:54 -08:00
Ihsara
5079413059
Merge pull request #4 from khoa102/khoa102-patch-1-viTranslation
...
Update vi.coffee
2016-02-11 00:02:05 +02:00
Ihsara
506b6996c0
Update vi.coffee
...
minor
2016-02-10 23:58:38 +02:00
Tran Anh Khoa
f50371e14d
Update vi.coffee
...
Change a few tip into Vietnamese
2016-02-10 15:41:32 -06:00
Tran Anh Khoa
7ed371520f
Merge pull request #3 from khoa102/Ihsara-patch-1.0viTrans
...
Ihsara patch 1.0vi trans
2016-02-10 15:21:47 -06:00
Ihsara
35a9bb96a7
Update vi.coffee
2016-02-10 23:11:42 +02:00
Tran Anh Khoa
60796ca83f
Update vi.coffee
2016-02-10 13:30:27 -06:00
Ihsara
f54619607a
Update vi.coffee
2016-02-10 21:25:35 +02:00
Tran Anh Khoa
5d0235828b
Update vi.coffee
2016-02-10 11:04:05 -06:00
Tran Anh Khoa
e2abbc317a
Update vi.coffee
2016-02-10 10:53:44 -06:00
Matt Lott
06436a4bb7
Add levelID property to show subscription modal events
...
Allows us to consolidate analytics collection indexes and code someday.
2016-02-09 16:50:55 -08:00
Josh Callebaut
7db678e63f
Merge pull request #3380 from Zerrien/editorChanges
...
Style fixes and fixes level submission emails
2016-02-09 09:42:05 -08:00
Josh Callebaut
99955aa034
Corrects artisan guide modal subdomain
2016-02-09 09:37:09 -08:00
Nick Winter
0ef29ddb95
Restrict who counts as a teacher in analytics
2016-02-08 14:44:38 -08:00
Nick Winter
40d7c53cd0
Fix 435d5bb6
2016-02-08 14:34:29 -08:00
Nick Winter
435d5bb6d2
Improve getHomePageGroup and narrow to two variants
2016-02-08 14:20:30 -08:00
Scott Erickson
bb38c58903
Properly fix duplicate course instances
...
* Add script to merge existing course instances
* Have client only send one course instance creation
* Have server return existing course instance if one for the given classroom/course exists
* Remove bandaid code from ClassroomView
2016-02-08 12:48:29 -08:00
Robin Yang
3acb2a4c7a
Add View Classes link to Request Demo area
2016-02-08 10:30:59 -08:00
Matt Lott
bd9ca8ee5f
Add enrollments graph to analytics dashboard
2016-02-06 14:02:44 -08:00
sungame
9cbb5ad924
Update sv.coffee
...
Translated some english to swedish
2016-02-06 17:06:27 +01:00
Nick Winter
378ddccce7
Change loop concept to be specifically while loops
2016-02-05 18:11:27 -08:00
Scott Erickson
abb4e2fa47
Filter out duplicate course instances client-side
2016-02-05 14:03:43 -08:00
Scott Erickson
4034d21cd5
Have /schools and /teachers show new home page
2016-02-05 13:47:32 -08:00
Scott Erickson
902c39ffb1
Use default scrollbar for pages
2016-02-05 13:28:10 -08:00
Scott Erickson
944b6b743f
Add homepage unsupported browser messages to new home page
2016-02-05 11:39:06 -08:00
Matt Lott
b495c581a7
Enable analytics tracking on request quote view
2016-02-05 10:49:46 -08:00
Matt Lott
e75bca2b43
Add active class definitions to analytics dashboard
2016-02-05 09:40:08 -08:00
Imperadeiro98
bc8476bff7
Merge pull request #3384 from chinesedfan/trans_zhs
...
Update zh-HANS.coffee
2016-02-05 16:22:36 +00:00
chinesedfan
eff2f68f43
Update zh-HANS.coffee
2016-02-05 15:52:50 +08:00
Matt Lott
5d2ad62fb9
Add top school counts to analytics dashboard
2016-02-04 17:31:25 -08:00
Matt Lott
e8c22679d9
Add trials to active classes analytics dashboard
...
Only looking at active classrooms, split into paid, trial, and free.
Active class: 12+ students total, 6+ active in last 30 days.
2016-02-04 16:31:52 -08:00
Scott Erickson
95e627f346
Merge pull request #3374 from taptapdan/issue-3138-CastButtonView
...
Refactor CastButtonView to use view in template
2016-02-04 14:53:13 -08:00
Daniel Fiore
d0d19f94e9
Refactor ProblemAlertView to use view in template
2016-02-04 14:44:29 -08:00
Robin Yang
67244005b2
Update Course 1 Guide
...
Added inline solutions instead of screenshots.
2016-02-03 16:33:14 -08:00
Robin Yang
1daa2e1db0
Update Getting Started Pdf link on /schools
...
Previous link was pointing to Hour of Code version, still had
free/unlimited trial language.
2016-02-03 16:18:14 -08:00
Scott Erickson
b98da5a32f
Add login button and logout link to new home view in request demo area
2016-02-03 16:16:43 -08:00
Scott Erickson
89eb3d0dfb
Add /courses link to new home page navbar, tweak wording
2016-02-03 11:16:15 -08:00
Scott Erickson
b91299a59f
New home page tweaks
2016-02-03 10:59:54 -08:00
Josh Callebaut
0eb32aac24
Creates clickable links for default tasks
2016-02-03 10:26:36 -08:00
Scott Erickson
9e38587719
Do not hide teacher note for small screens, add close link
2016-02-03 10:10:43 -08:00
jamesvdh
3eca097675
Update nl-BE.coffee
...
Finished the translation. Some words or phrases might be slightly off due to the lack of context info. But in general it should be ok.
2016-02-03 17:53:40 +01:00
Yuki Ueda
2006feb9b3
Update ja.coffee
2016-02-03 17:12:41 +09:00
Nick Winter
c8601e81d6
Fix request-a-quote link in the footer
2016-02-02 17:14:26 -08:00
Nick Winter
14c734cfe8
Remove some logs to complete my testing
2016-02-02 16:56:08 -08:00
Daniel Fiore
6ad5d6bc73
Refactor CastButtonView to use view in template
2016-02-02 15:57:55 -08:00
Nick Winter
260fd21f4e
Add Segment for teachers, misc analytics cleanup tweaks
2016-02-02 15:13:55 -08:00
Nick Winter
24fc14260e
Add /privacy policy page
2016-02-02 15:13:54 -08:00
Scott Erickson
fa54b639c7
Hide modal wrapper when no modal
2016-02-02 15:13:54 -08:00
Scott Erickson
0e7e9aad39
Add new home page with test
2016-02-02 15:12:37 -08:00
Nick Winter
da04f9f8a6
Add VR wall to walls list
2016-02-02 08:16:23 -08:00
Scott Erickson
45fab8587a
Merge remote-tracking branch 'origin/master'
2016-02-01 15:51:40 -08:00
Scott Erickson
ab62982bac
Tweak RequestQuoteView form to better fit best practices
...
* Scroll to errors
* Set email input type to 'email'
2016-02-01 15:51:29 -08:00
Thijs de Haan
3a05c9ed6f
Update nl-NL.coffee
2016-02-01 22:07:48 +01:00
Scott Erickson
5fffb2eefb
Remove TeachersFreeTrialView
2016-02-01 10:40:22 -08:00
Cat Sync
ba63dcde2c
Rearrange level editor task order
2016-02-01 10:53:50 -05:00
Matt Lott
c03875763e
Add Get Started button
...
For teacher trial approved mail
2016-01-31 09:07:36 -08:00
Imperadeiro98
5a1d1e93dd
Fix build
2016-01-30 10:21:36 +00:00
Ivan
b441161edb
Update sr.coffee
...
Little more translation for today.
Best regards
2016-01-29 21:29:13 +01:00
Josh Callebaut
14ef28b658
Merge pull request #3369 from Zerrien/master
...
Editor Changes (Task tab, pre-initialize tasks, Artisan nurturing, level submission)
2016-01-29 09:42:04 -08:00
Imperadeiro98
546fdfa2b6
Fix build
2016-01-29 14:58:08 +00:00
Imperadeiro98
734797cc17
Merge pull request #3368 from Ivanmateja/patch-2
...
Update sr.coffee
2016-01-29 14:51:37 +00:00
Ivanmateja
4962c17107
Update sr.coffee
...
I have removed hashtags and signed CLA. Hope that everything will work fine now. Sory for mistakes this Github is a little confusing at beginning.
Greetings
2016-01-29 15:21:22 +01:00
Imperadeiro98
6923491e45
Merge pull request #3367 from a1ip/patch-4
...
Update ru.coffee
2016-01-29 12:23:29 +00:00
Ivanmateja
ab681252e4
Update sr.coffee
2016-01-29 12:46:19 +01:00
Scott Erickson
e62e497543
Replace TeachersFreeTrialView with RequestQuoteView
2016-01-28 17:21:36 -08:00
Scott Erickson
f657669dbc
Extend forms
...
* formToObject handles checkboxes and radio buttons
* applyErrorsToForms handles required fields
* setErrorToField sets helpblock according to new forms best practices: before input and any help blocks
2016-01-28 17:18:24 -08:00
Philippe Rigovanov
ce05659ab5
Update ru.coffee
2016-01-29 01:26:24 +03:00
Josh Callebaut
7b5b4ca898
Uses @$ instead of @.find, method to convert dom into jQuery objects, and superior CoCoModel's getOwner() instead of trawling through the permissions list
2016-01-28 14:05:04 -08:00
Josh Callebaut
4a2d5c2e59
Fixes level ownership check
2016-01-28 14:05:04 -08:00
Josh Callebaut
bd825d3108
Includes the level name in the email and makes it clickable
2016-01-28 14:05:04 -08:00
Josh Callebaut
42efe6264b
Sticks the level submission data into the contact form's message attribute
2016-01-28 14:05:04 -08:00
Josh Callebaut
8347c8247f
Merge branch 'master' of https://github.com/codecombat/codecombat
2016-01-28 13:57:56 -08:00
Philippe Rigovanov
94c0c27a03
Update ru.coffee
2016-01-29 00:45:16 +03:00
Matt Lott
0d9b7a634b
Add homepage to Mixpanel page view tracking
2016-01-28 09:25:30 -08:00
Philippe Rigovanov
dd6f9711a4
Update ru.coffee
2016-01-27 23:15:52 +03:00
Scott Erickson
4ef5f40fa1
Network error handling fixes
...
* Make work there are multiple network requests and only one fails
* Test for i18n attributes instead of English translations so Travis works
* Various PR changes
2016-01-27 10:42:12 -08:00
Scott Erickson
3dda5710de
Move demo border to TestView to be used generally
2016-01-27 10:42:02 -08:00
Scott Erickson
d00f8344be
Add demo controls to TestView
2016-01-27 10:42:02 -08:00
Scott Erickson
29350bf1de
Make network error handling more generic
2016-01-27 10:41:56 -08:00
Imperadeiro98
cef0ed0185
Fix build
2016-01-27 18:12:34 +00:00
Imperadeiro98
0ad18fae88
Merge pull request #3361 from MatiasOlivera/master
...
Update es-419.coffee
2016-01-27 18:11:45 +00:00
Matías Olivera
a009b4aae6
Fix strings with the 'change' label
2016-01-27 13:34:50 -03:00
Nick Winter
3a5573cfe0
Merge pull request #3359 from binary-idiot/master
...
Add names for #53
2016-01-26 17:14:50 -08:00
Binary-idiot
0ab7f48611
Add names for #53
2016-01-26 19:46:04 -05:00
Nick Winter
03143d47cc
Ask for email scope in Facebook login for #3310
2016-01-26 15:05:27 -08:00
Matt Lott
78c86eb979
Add furthest course table to analytics page
2016-01-26 14:37:25 -08:00
Nick Winter
4ae8eacd90
Treat Elemental Wars like Ace of Coders for mirror match and hero equipment
2016-01-26 13:20:23 -08:00
Nick Winter
aa18e71388
Remove a log
2016-01-26 13:20:04 -08:00
Matías Olivera
6e7b34c4fd
Translate new strings
2016-01-26 18:14:24 -03:00
Matt Lott
b3e5d8f650
Add explicit track event for viewing teacher trial
...
We want to explicitly track views before submit.
2016-01-26 10:32:39 -08:00
Nick Winter
80466f5e9d
Ran ImageOptim to losslessly compress our images by 28.7% overall
2016-01-26 07:48:51 -08:00
Scott Erickson
277c526dc3
Add CourseVictoryModal
2016-01-25 13:03:29 -08:00
Scott Erickson
57cf264880
Add img-prize, label-banner and well-parchment to design elements
2016-01-25 13:03:29 -08:00
Nick Winter
a7e6c14688
Also recognize classroom and VR floors
2016-01-25 12:35:45 -08:00
Nick Winter
87ceb36a6f
Recognize classroom walls as wall obstacles visually
2016-01-25 12:29:22 -08:00
Matt Lott
8b4e59da5c
Update analytics traits
...
Adding school name and course prepaid info.
2016-01-22 14:55:18 -08:00
Robin Yang
28f378f92f
Update Course 2 Guide to Correct Shield Rush
...
Javascript solution was missing a parenthesis.
2016-01-22 14:18:41 -08:00
Josh Callebaut
6dfc02980a
Fixes non-existant task array, bad focus, adds a button to add default tasks.
2016-01-22 13:54:20 -08:00
Rob Blanckaert
28d085f6d3
Merge pull request #3349 from ryang217/master
...
Add additional formatting tags to Tome popup
2016-01-22 13:22:56 -08:00
Robin Yang
dc248f8d29
Add additional formatting tags to Tome popup
...
Helps fix this #2945
2016-01-22 13:21:17 -08:00
Cat Sync
96003dd240
filter deleted users out of ClassroomView
2016-01-22 14:32:39 -05:00
Josh Callebaut
aea23072e3
Fix #3348 - don't display score button for levels without a score type
2016-01-22 11:27:38 -08:00
Cat Sync
feb4c16b85
broadName should insert a space when using firstName lastName, and return Anoner if nothing else is available
2016-01-22 13:58:02 -05:00
Cat Sync
e4296eaf97
filter out empty solutions when clicking Fill Defaults
2016-01-22 13:41:12 -05:00
Matt Lott
1825d0e2dd
Enable Mixpanel
...
Closes #3347
2016-01-21 16:19:06 -08:00
Josh Callebaut
ab93dc8564
Bug fixes and style fixes.
2016-01-21 12:14:37 -08:00
Imperadeiro98
668c6e79c4
Merge pull request #3346 from darulis1/patch-1
...
Update lt.coffee
2016-01-21 15:04:58 +00:00
darulis1
5b48e1a379
Update lt.coffee
...
Added and fixed more translations
2016-01-21 15:58:15 +02:00
ignaloidas
a26b7abff9
A litle bit more of translation
2016-01-21 13:57:34 +02:00
Elian Kamal
45070c80ae
Update he.coffee
...
Update he.coffee
2016-01-21 13:21:03 +02:00
Josh Callebaut
c28720c640
Implements fixes based on code review.
2016-01-20 15:32:21 -08:00
Josh Callebaut
80c2a9e539
New models with default tasks are preintialized with these tasks.
2016-01-20 10:48:53 -08:00
Philippe Rigovanov
abab78d816
Update ru.coffee
2016-01-20 20:47:15 +03:00
Cat Sync
319a0ef381
Merge branch 'master' of https://github.com/codecombat/codecombat
2016-01-20 11:48:25 -05:00
Cat Sync
efbd66a9b1
use thang.labelStyle to configure Labels
...
This allows level creators to configure the type of dialogue box used
when a thang says a message.
2016-01-20 11:48:09 -05:00
Nick Winter
af77dc39b8
Logging Facebook auth response for #3110
2016-01-20 08:10:01 -08:00
minwook shin
3d85c01c59
My second ko translation.
...
This has translated this means.
265 : Holy smokes -> Surprise [놀라다]
2016-01-19 19:02:58 +09:00
Scott Erickson
491a679abb
Merge pull request #3327 from Imperadeiro98/master
...
Cleaned couple files
2016-01-18 15:35:59 -08:00
Scott Erickson
c23fb50fa7
Merge pull request #3330 from differentmatt/teacher-news
...
Add approved teacher trials to CodoCombat list Teachers group
2016-01-18 15:18:55 -08:00
Scott Erickson
a28b53eb5c
Merge pull request #3321 from taptapdan/fix-issue-2732
...
Looks good. Thanks!
2016-01-18 15:08:52 -08:00
Kuma
5a6d074aeb
Update ja.coffee
...
Deleted # from the lines I translated.
2016-01-18 12:19:18 -06:00
Kuma
539f0ae936
Update ja.coffee
...
I added translations under teachers_survey:, versions:, and account_settings:.
Thanks,
2016-01-17 20:56:34 -06:00
Matt Lott
d2921f66cb
Add approved teacher trials to mail news group
2016-01-17 07:39:30 -08:00
Imperadeiro98
1359dcc5c6
Fixes to previous merge
2016-01-17 09:57:02 +00:00
Imperadeiro98
3e3f083f99
Merge pull request #3329 from FedericoTomas/patch-11
...
Update es-419.coffee
2016-01-17 09:55:01 +00:00
Imperadeiro98
40f67c0d6f
Uncommented some headers
2016-01-17 09:53:52 +00:00
Imperadeiro98
8a93026b5f
Merge pull request #3318 from minwook-shin/patch-1
...
my first ko translation
2016-01-17 09:53:02 +00:00
Federico Tomas
44e82881c5
Update es-419.coffee
...
I'm back guys, trying to help you a little more.
Bye!, happy new year to everyone.
2016-01-17 03:04:15 -03:00
Daniel Fiore
39b42fe363
Fix level list highlighted levels
...
The Level Editor level list now highlights the row in which you are the
person who last saved the level. The level list now also displays
glyphicons to indicate watched/unwatched levels.
2016-01-16 15:05:54 -08:00
Imperadeiro98
f47640e59a
Cleaned couple files
...
Removed some unused styles, a template, a view and changed the class
name of some views
2016-01-16 12:07:15 +00:00
Imperadeiro98
b4b444023e
Add sounds to SubscribeModal
2016-01-16 11:38:31 +00:00
Josh Callebaut
ad28be1c64
Adds casing check for unloaded/non-tasked levels.
2016-01-15 13:54:08 -08:00
Robin Yang
af65b85217
Update Getting Started Area
...
- Upload new Course 2 guide Pdf
- Update Getting Started Pdf
- Add links to Course 2 and Educator Wiki
2016-01-15 13:15:08 -08:00
Scott Erickson
a8f4f9d2ec
Update updateCourses script and add course 5 to it with new screenshot
2016-01-15 09:46:24 -08:00
Nick Winter
5ae6875260
Adjust Facebook login according to #3310
2016-01-14 10:23:16 -08:00
minwook shin
4c7567926a
my first ko translation
...
I'll translate other things .
2016-01-14 11:09:43 +09:00
Josh Callebaut
89fc6cc078
Removes stay logging, implements functionality improvements for artisan modals.
2016-01-13 17:45:27 -08:00
Josh Callebaut
14c2942134
Moves Tasks to their own tab and adds a guide-book icon next to the save icon which displays help and doubles as a level review submission modal.
2016-01-13 15:54:57 -08:00
Nick Winter
be1091caf8
Merge pull request #3315 from ryang217/master
...
Cleaned up teacher testimonial area
2016-01-12 13:13:52 -08:00
Nick Winter
7aff24b3a6
Cleaned up a couple SubscribeModal things
2016-01-12 12:34:10 -08:00
Nick Winter
63d643ac13
Merge branch 'brazil_coupon'
2016-01-12 12:26:36 -08:00
Robin Yang
95a996af07
Cleaned up teacher testimonial area
...
Fixed quote per teacher (Tim M.)’s request, added Twitter link
Adjusted font sizing and positioning on quotes.
Added smart (curly) quotes instead of straight quotes.
2016-01-12 12:19:48 -08:00
Nick Winter
59c6d15248
Fix serialization of levels in level editor
2016-01-12 09:42:41 -08:00
Nick Winter
01a3ae6020
Make sure #3303 works for multiplayer and future 'course' level hero selection
2016-01-12 08:41:18 -08:00
Nick Winter
345036f68f
Merge pull request #3303 from taptapdan/fix-issue-3299
...
Fix thangTypes filtering in serialize
2016-01-12 08:39:58 -08:00
Imperadeiro98
49c57bbf6b
Update pt-PT.coffee
2016-01-11 21:17:53 +00:00
Nick Winter
a91f33df4b
Propagate i18n
2016-01-11 12:59:28 -08:00
Imperadeiro98
cfa4617e16
Add indicator to changed string
2016-01-11 20:57:42 +00:00
Imperadeiro98
f60f17ce47
Merge pull request #3313 from durianboy/patch-3
...
Patch 3
2016-01-11 20:27:07 +00:00
Maka
e786073f5b
Updated teacher page to remove 'unlimited enrollment' reference.
2016-01-11 12:59:49 -05:00
Nick Winter
e872ead632
Implement Brazil coupon
2016-01-11 09:52:46 -08:00
durianboy
ae368894e1
Update zh-HANT.coffee
2016-01-11 17:45:41 +08:00
durianboy
62e1a0b876
Update zh-HANT.coffee
2016-01-11 17:24:39 +08:00
Imperadeiro98
150e517c73
Merge pull request #3309 from xavismeh/master
...
Enhanced french translation
2016-01-10 19:43:56 +00:00
Imperadeiro98
5d439834ba
Merge pull request #3305 from darulis1/patch-1
...
Update lt.coffee
2016-01-10 19:36:19 +00:00
Xavier Coureau
3f9a0c2973
Enhanced french translation
...
Typo
Typo
2016-01-09 23:45:49 +01:00
Matt Lott
213f3edd0d
Update /about team section
2016-01-08 10:25:21 -08:00
darulis1
838c0f20cb
Update lt.coffee
2016-01-08 16:59:58 +02:00
Imperadeiro98
39697ebc86
Merge pull request #3304 from durianboy/patch-2
...
Update zh-HANT.coffee
2016-01-08 12:56:05 +00:00
Matt Lott
017dea696f
Remove HoC extra 2 months trial enrollments
2016-01-07 15:45:46 -08:00
durianboy
2f4079084b
Update zh-HANT.coffee
...
我需要有人告訴我我這樣算是上傳pull請求嗎?
I need someone to tell me have I PULL by propose file change?
2016-01-08 05:04:30 +08:00
Daniel Fiore
ed17d967d2
Fix thangTypes filtering in serialize
2016-01-07 12:26:40 -08:00
Scott Erickson
a10aec256f
Set upper limit to max seats you can purchase at once
2016-01-07 09:54:02 -08:00
Scott Erickson
13b9d81e4c
Fix some demo views
2016-01-07 09:40:35 -08:00
Scott Erickson
5941c4b27f
Add autocomplete and slider to design elements view, limit showing javascript widgets automagically
2016-01-06 16:33:50 -08:00
Scott Erickson
93b9aa3c2c
Add DesignElementsView (mostly complete)
2016-01-06 16:11:28 -08:00
Scott Erickson
fde11d8f0d
Add fill defaults button to solutions treema node in level editor
2016-01-06 13:50:06 -08:00
Rob
86d9b081c1
Merge branch 'cashew'
2016-01-06 12:03:49 -08:00
Scott Erickson
d1e7055b1a
Add code highlighting to solution treema nodes in level editor
2016-01-06 09:58:04 -08:00
Xavier Coureau
f309f5dad3
Merge remote-tracking branch 'upstream/master'
2016-01-06 00:45:44 +01:00
Nick Winter
7864d3708b
Change traditional Chinese label to be in traditional Chinese
2016-01-05 15:20:22 -08:00
Nick Winter
568f04ac39
Merge pull request #3296 from taptapdan/fix-issue-3264
...
Fix isSilhouettedItem
2016-01-05 14:20:23 -08:00
Nick Winter
c15b67f654
Merge pull request #3297 from taptapdan/fix-issue-3294
...
Fix Earned Achievements Check
2016-01-05 14:16:42 -08:00
ryang217
c29db142a1
Add locale keys for Robin About Page entry
...
Adding onto 57ed2fa
.
2016-01-05 14:02:08 -08:00
ryang217
57ed2fae67
Added Robin to About page
2016-01-05 13:04:02 -08:00
Imperadeiro98
34cc8c07dd
Merge pull request #3298 from Goby-Wan/master
...
Updates FR locale file
2016-01-05 17:06:39 +00:00
GOBY Alexandre
061509dfb3
Update fr.coffee
2016-01-05 17:35:57 +01:00
Xavier Coureau
87741c6e93
Enhanced french translation
2016-01-05 16:19:54 +01:00
Daniel Fiore
a215c2e01c
Fix Earned Achievements Check
2016-01-04 19:23:14 -08:00
Rob
3b4433e312
Use hero instead of this. Also use published aether package.
2016-01-04 17:23:58 -08:00
Rob
3baea9683c
Additional java support.
2016-01-04 16:41:24 -08:00
Scott Erickson
220c124780
Remove enum from user gender string
...
Fixes a bug where when logging in with G+ with profile gender 'other', login doesn't fail silently.
2016-01-04 16:34:50 -08:00
CodeCombat
41a532cb50
WIP - cashew integration
2016-01-04 16:27:27 -08:00
Daniel Fiore
9ccb0dd3cb
Fix isSilhouettedItem
...
This fixes #3264 . Checks were failing in cases where no gold amount was
set and tier was 0. Checks are now using existential operator to ensure
null/undefined.
2016-01-02 16:10:03 -08:00
Yuki Ueda
9159ee3490
Update ja.coffee
2016-01-01 19:05:03 +09:00
Imperadeiro98
e19e997126
Merge pull request #3287 from JurianLock/patch-2
...
Update nl-NL.coffee
2015-12-29 15:03:54 +00:00
JurianLock
2ab3033e21
Update nl-NL.coffee
2015-12-29 02:34:39 +01:00
JurianLock
b9239503f9
Update nl-NL.coffee
2015-12-29 00:33:05 +01:00
Nick Winter
187a6f87a9
Include course info in contact message session links
2015-12-28 08:15:48 -08:00
Imperadeiro98
f369c73b2a
Remove unnecessary sound
2015-12-28 16:11:09 +00:00
Imperadeiro98
bf6601c3cc
Fix for GenerateTerrainModal
2015-12-26 21:56:05 +00:00
Imperadeiro98
b7ba677b00
Use view in template
2015-12-26 14:21:06 +00:00
Nainufar
718d546354
Update ca.coffee
...
more translations :)
2015-12-26 12:37:24 +01:00
Nick Winter
208073ffdb
Fix saving levels from #3276 refactoring
2015-12-24 11:21:12 -08:00
Nick Winter
35a18eadb4
Merge zh-HAN*.coffee
2015-12-24 06:37:40 -08:00
Nick Winter
c0d58c3786
Tweak style and add i18n for #3280
2015-12-24 06:34:54 -08:00
Pulkit Agarwal
357e8c0bcd
Add level to user profile page
2015-12-24 15:52:30 +05:30
Imperadeiro98
325c774b90
Update pt-PT.coffee
2015-12-23 23:22:54 +00:00
Nick Winter
71fc8d5230
Don't risk destruction of level unlock links
2015-12-23 12:08:09 -08:00
Nick Winter
55f7b4a115
Fix config refactoring
2015-12-23 12:08:07 -08:00
Nick Winter
40da26f99c
Remove misc typo. Fix NewModelModal name field focus while at it.
2015-12-23 10:33:55 -08:00
Nick Winter
08f983db59
Propagate i18n
2015-12-23 10:07:32 -08:00
Nick Winter
8fb358425d
Merge pull request #3270 from sasha-bichkov/master
...
Refactor Level.coffee
2015-12-23 08:56:00 -08:00
Nick Winter
130b67d6ce
Merge pull request #3273 from codecombat/clean-i18n
...
Remove unused i18n strings
2015-12-23 08:52:47 -08:00
Nick Winter
b42ed395c0
Small fix for #3276 NewLevelComponentModal
2015-12-23 08:41:00 -08:00
Nick Winter
6b02a7a31f
Merge pull request #3276 from Imperadeiro98/master
...
Use view in template
2015-12-23 08:29:54 -08:00
Nick Winter
3be6abf2e1
Merge Router.coffee
2015-12-23 08:23:23 -08:00
Nick Winter
08d0440c71
Link to language-specific forum categories when available
2015-12-23 08:22:19 -08:00
Nick Winter
dfc1ef2e89
Add i18n tags for new legal page stuff
2015-12-23 08:21:49 -08:00
Nick Winter
21ae7d47be
Don't load extra level completion images unless it's that level
2015-12-23 08:21:11 -08:00
zxcpoiu
d54c2a786c
app/locale: translation for ZH_HANT and ZH_HANS
2015-12-23 15:15:11 +08:00
Imperadeiro98
d321bb7a95
Removed spr from spell_list_entry_thangs.jade
2015-12-22 21:41:20 +00:00
Nick Winter
a92ed8fbbe
Fix /courses/teachers link to /schools
2015-12-22 06:43:19 -08:00
Imperadeiro98
14fcc1f2ac
Merge pull request #3278 from Nainufar/patch-5
...
Update ca.coffee
2015-12-22 13:04:10 +00:00
Matt Lott
68aae0d4e0
Update /courses/teachers active courses styling
2015-12-21 16:18:01 -08:00
Nainufar
59862f666d
Update ca.coffee
...
some translations more
2015-12-22 01:12:45 +01:00
Nick Winter
8683a2f27a
Merge pull request #3251 from themaka/browserstack-quid-pro-quo
...
Adding Browserstack to our web page as we promised
2015-12-21 15:55:29 -08:00
Nick Winter
0d958cef06
No longer under high load
2015-12-21 15:54:00 -08:00
Matt Lott
b971ce3492
Enroll single student without modal in classroom view
2015-12-21 15:45:14 -08:00
Josh Callebaut
314f8256ee
Improves style further.
2015-12-21 15:42:46 -08:00
Matt Lott
bde8e6721c
Add enroll students button to /courses/teachers
2015-12-21 15:04:21 -08:00
Nick Winter
e070c70b9d
Put /schools into the main flow in place of anonymous /teachers for now
2015-12-21 15:02:11 -08:00
Matt Lott
b5e7a9694e
Remove /courses/teachers concepts
...
Also moving enrolled counts around a bit and adding a class count
sentence.
2015-12-21 14:19:35 -08:00
Matt Lott
d782eb174e
Fix /schools big quote location
2015-12-21 14:09:57 -08:00
Nick Winter
2adb255a48
Merge pull request #3275 from taptapdan/fix-issue-3243
...
Fix achievements notifications animation
2015-12-21 13:32:44 -08:00
Matt Lott
11d24e939b
Add smooth down arrow navigation to /schools
2015-12-21 13:00:39 -08:00
Josh Callebaut
9ba9d8ab4d
Style guide fixes.
2015-12-21 12:51:29 -08:00
Josh Callebaut
79ff058117
Adds the Thang Task View.
2015-12-21 12:44:22 -08:00
Matt Lott
348e0407bc
Update /schools copy and fonts
2015-12-21 12:39:59 -08:00
Imperadeiro98
025d2bea2f
Couple fixes
2015-12-21 16:03:28 +00:00
Imperadeiro98
e70cbed4e4
Use view in template
2015-12-21 15:51:46 +00:00
Daniel Fiore
25531477c5
Fix achievements notifications animation
...
This fixes #3243 . Achievement notification animation now slides in from
off-screen left and then hides back to off-screen left.
2015-12-20 22:28:09 -08:00
Nick Winter
105c2c9497
Get prerenderedSpriteSheetData in level editor
2015-12-20 07:02:15 -08:00
Imperadeiro98
7af7553bff
Remove unused i18n strings
2015-12-20 15:00:58 +00:00
sasha_bichkov
c9b6832dae
refactor
2015-12-19 15:04:42 +03:00
Nick Winter
9ffd0498f2
Merge branch 'production'
2015-12-18 13:32:20 -08:00
Nick Winter
f8091443e9
Lower the number of rerenderings needed when spritesheets get full. Add a jitSpritesheets query variable option for comparing performance of prerendered spritesheets.
2015-12-18 13:26:47 -08:00
Scott Erickson
079109145f
Cull recruiting views and translations
2015-12-18 10:34:21 -08:00
Scott Erickson
53f8bca26b
Add logoutRedirectURL property to RootView, default to /, add exceptions
2015-12-18 10:02:03 -08:00
Matt Lott
94cf5654ff
Update /teachers with post-HoC copy
2015-12-18 05:39:25 -08:00
Matt Lott
43ca30b413
Update /courses/teachers getting started pdf
2015-12-18 05:21:06 -08:00
Matt Lott
28c554295c
Remove homepage HoC section
2015-12-18 05:15:04 -08:00
Imperadeiro98
e5e9f3e01d
Merge pull request #3272 from VeggieRock/patch-1
...
Update es-419.coffee
2015-12-18 11:35:46 +00:00
VeggieRock
dac2f5917d
Update es-419.coffee
...
Cambios menores en las paginas de cursos y registro, así como algunas correcciones sustituyendo la palabra "escaleras" por clasificación. ejemplo:
Partidas de "escaleras" fue cambiado a partidas de "clasificación".
Espero y sean aceptadas pronto. Saludos!
2015-12-17 23:42:05 -06:00
Lucas P
5f143a276e
Update Pt-Br -Transation
...
Some translation and fixes .
2015-12-17 23:38:40 -02:00
Balrogin
d8f49c1b82
Atualização Tela inicial- Front page update
...
Traduzi a parte do "Hour of Code" que ainda estava em inglês.
E algumas outras coisinhas.
2015-12-17 09:14:20 -02:00
Scott Erickson
e1130ff1e8
Clean up legal string interpolation
2015-12-16 16:39:46 -08:00
Scott Erickson
e9b59d62d6
Remove replaced string
2015-12-16 16:39:46 -08:00
Nainufar
5c4e415ead
Update ca.coffee
...
more translations
2015-12-16 16:39:46 -08:00
Nick Winter
129d3b793d
Add Mandate for modifying simulation throughput on the fly, other things later
2015-12-16 16:39:45 -08:00
Nick Winter
31eb6e6045
Fix #3017
2015-12-16 16:39:45 -08:00
Aleksey Klimenko
895e9194e4
Translate some lines.
2015-12-16 16:39:45 -08:00
RUSLAN LÓPEZ CARRO
938744a580
Update es-419.coffee
2015-12-16 16:39:45 -08:00
Scott Erickson
3f6afa6580
Interpolate discount in year sub description
2015-12-16 16:39:45 -08:00
Scott Erickson
96e6920722
Update some copy to use db products
2015-12-16 16:39:44 -08:00
Scott Erickson
ef3f847932
Remove SubscriptionSaleView
2015-12-16 16:39:44 -08:00
Scott Erickson
a28e7bde2c
Update tests for db products, some cleanup
2015-12-16 16:39:44 -08:00
Nick Winter
0eecda7b40
Fix logged-in /schools call to action
2015-12-16 16:39:44 -08:00
Nainufar
b9304f2350
Update ca.coffee
...
Some translations more.
2015-12-16 16:39:44 -08:00
Nick Winter
9821195ec9
Turn off HoC homepage play redirect
2015-12-16 16:39:44 -08:00
RUSLAN LÓPEZ CARRO
a91dc6d812
Update es-419.coffee
2015-12-16 16:39:43 -08:00
Matt Lott
d369c0b47c
Update /schools contact us button styling
2015-12-16 16:39:43 -08:00
Matt Lott
8837d042ab
Update /schools fonts
2015-12-16 16:39:43 -08:00
Matt Lott
646aa56716
/schools page
2015-12-16 16:39:43 -08:00
Nick Winter
5cbb61c261
Change /about address to our office
2015-12-16 16:39:43 -08:00
Scott Erickson
59fcb22d01
Deprecate managed subscriptions, disallowing new ones
2015-12-16 16:39:43 -08:00
Scott Erickson
7c516c4d9f
Move product information to the db
2015-12-14 11:10:50 -08:00
Nainufar
16033f2a5e
Update DiplomatView.coffee
2015-12-13 22:28:48 +01:00
Imperadeiro98
64fbb373bd
Merge pull request #3259 from Nainufar/patch-1
...
Update ca.coffee
2015-12-13 21:01:26 +00:00
micman73
f793e58a71
Update el.coffee
...
Additions to cover hour of code section
2015-12-13 19:40:37 +02:00
Nainufar
a3a65e090e
Update ca.coffee
...
some more translations and some corrections
2015-12-13 18:04:23 +01:00
Matt Lott
939fd6865b
Update /courses default code language shown
2015-12-11 16:00:36 -08:00
Scott Erickson
d081f7553d
Fix FacebookHandler and its test
2015-12-11 15:39:07 -08:00
Scott Erickson
703671940f
Make Facebook login only happen when user explicitly clicks to do so
2015-12-11 14:47:42 -08:00
Scott Erickson
71bca28148
Have level list in CourseDetailsView include play buttons up through the last level completed and any levels started
2015-12-11 12:59:53 -08:00
Nick Winter
6d5d3d1091
Merge pull request #3258 from MonkStrom/master
...
[Issue #2426 ]New account page layout
2015-12-11 10:14:21 -08:00
Imperadeiro98
70ed07e558
Update pt-PT.coffee
2015-12-11 12:59:39 +00:00
Barry
3db216a341
Fetched from master repo
2015-12-10 19:25:42 -05:00
Nick Winter
4458a57771
Save our MongoDB oplog
2015-12-10 14:51:34 -08:00
Imperadeiro98
c71975fd40
Merge pull request #3256 from javatlacati/patch-1
...
Update es-419.coffee
2015-12-10 21:25:33 +00:00
Scott Erickson
7e24cda7f8
Redirect logouts to /hoc always for now
...
Generic solution to replace commit 77a8347
.
Will have all redirects go to / once HoC is over.
2015-12-10 12:26:03 -08:00
Matt Lott
0c34d06e70
🐛 Remove join class refresh
2015-12-10 12:22:48 -08:00
Nick Winter
4a04a48f42
Got rid of testing ending line for indent visualizer
2015-12-10 11:11:12 -08:00
Nick Winter
67ac55de7f
Implement #3255 in the i18n tags instead
2015-12-10 10:57:24 -08:00
RUSLAN LÓPEZ CARRO
9ffd79f31d
Update es-419.coffee
2015-12-10 11:53:34 -06:00
Nick Winter
608d45ba70
Don't do undefined slug collection scans
2015-12-10 09:05:34 -08:00
Scott Erickson
96c5a1a69a
Fix brunch build
2015-12-09 12:26:53 -08:00
Nick Winter
7076a23fe2
Merge pull request #3252 from themaka/staff-update
...
Updating About page to include me
2015-12-09 08:45:21 -08:00
Maka
a11a7c38d4
Added maka_blurb + maka_title to en.coffee
2015-12-09 08:13:03 -08:00
Nick Winter
70c90d9bb5
Propagate i18n
2015-12-09 06:58:33 -08:00
Nick Winter
591749de15
Fix some button child click and duplicate tag issues with e284ec79
2015-12-09 06:57:33 -08:00
Nick Winter
0945e3ee90
Merge pull request #3250 from Imperadeiro98/master
...
Courses i18n
2015-12-09 06:34:13 -08:00
micman73
df8658ced5
Update el.coffee
2015-12-09 15:39:32 +02:00
Maka
31a508842e
Updating About page to include me
2015-12-08 23:56:57 -08:00
Maka
6bc8fe08b2
Adding Browserstack to our web page as we promised
2015-12-08 21:38:28 -08:00
Matt Lott
041ca8ec3e
Update teacher guide course 1 pdf
2015-12-08 16:37:24 -08:00
Matt Lott
0254ca6bb7
Update course thumbnails
2015-12-08 16:23:40 -08:00
Matt Lott
5ea9b6e8af
Update trial requests to be type course
2015-12-08 16:16:02 -08:00
Matt Lott
cf1637ba01
Add reference poster pdf
2015-12-08 14:24:39 -08:00
Rob
24a43f2be8
Don't show visual indent for comment ace things are blocks.
2015-12-08 14:20:23 -08:00
Imperadeiro98
95efdcac1c
Added a line I removed
2015-12-08 20:58:53 +00:00
Imperadeiro98
e284ec7959
Courses i18n
...
Also, removed duplicated 'Continue' string
2015-12-08 20:05:08 +00:00
Matt Lott
78548b550f
Disable class language change after members > 0
2015-12-07 14:36:59 -08:00
Imperadeiro98
27cad5dce0
Added a resource string and fixed other
2015-12-07 22:34:35 +00:00
Matt Lott
d6694adb57
🐛 Fix disappearing classroom student progress
...
JIT course instances were not getting the sessionsByUser mapping in
some cases.
2015-12-07 14:15:56 -08:00
Imperadeiro98
b0a1334eec
Removed play-level-modal
...
I think it is no longer used
2015-12-07 21:36:50 +00:00
Matt Lott
4ffe9a5035
Update /courses fwd/back links to be more consistent
...
Teachers, click here! is bit bigger.
2015-12-07 11:11:11 -08:00
Imperadeiro98
458a287abd
Some fixes to last merge
2015-12-07 17:52:45 +00:00
Imperadeiro98
4f3dd1b6c7
Merge pull request #3244 from periloso/patch-1
...
Translated everything. Cool! xD
2015-12-07 17:42:12 +00:00
Nick Winter
e375b8cdc8
Merge pull request #3185 from Imperadeiro98/the-branch
...
Refactor to use view in template
2015-12-07 09:28:26 -08:00
Nick Winter
6a82def75a
Fix bug with slow-loading sessions never opening play button
2015-12-07 04:39:33 -08:00
Matt Lott
13c75b3f1f
Condense class student progress list
2015-12-06 20:35:54 -08:00
Matt Lott
2761491517
Update HoC teacher's guide pdf
2015-12-06 20:22:53 -08:00
Matt Lott
0d752d8242
🐛 Fix class student remove
2015-12-06 20:01:52 -08:00
Alessio
cebe9c7b7d
Translated everything. Cool! xD
2015-12-07 04:51:41 +01:00
Matt Lott
01f6e098a1
🐛 Fix /courses/purchase purchase amount
2015-12-06 16:21:08 -08:00
Barry
3ef2be1a42
0px bottom margin on panel
2015-12-06 18:36:54 -05:00
Barry
74f692072e
Started repositioning buttons.Can't remove box-shadow from panel
2015-12-06 18:07:41 -05:00
Matt Lott
66f434adba
Update class progress colors
2015-12-06 15:00:00 -08:00
Matt Lott
cb4d8fee8c
Update /courses/purchase visuals
2015-12-06 14:26:35 -08:00
Nick Winter
0a1be8e80e
Don't load ambient sound in CampaignView if muted
2015-12-06 12:33:28 -08:00
Nick Winter
1187390fd0
Improve simulation game logic, and re-enable automatic simulations under certain conditions, better targeted toward the matches the player cares about
2015-12-06 09:20:37 -08:00
Matt Lott
45418dbfe3
Update /courses/purchase copy
2015-12-06 07:28:16 -08:00
Matt Lott
c4c4f42e74
Update class enroll modal visuals
2015-12-06 06:27:56 -08:00
Nick Winter
f38eea3590
Merged. Turn off chained rankings for now since they are slow and don't work anyway
2015-12-06 04:36:41 -08:00
Matt Lott
e5af4d857d
Update class management enroll and assign button copy
2015-12-05 19:10:46 -08:00
Imperadeiro98
43d8a8071c
Merge pull request #3238 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-12-05 20:06:07 +00:00
Imperadeiro98
551dd5d98f
Merge pull request #3237 from micman73/patch-5
...
Update DiplomatView.coffee
2015-12-05 20:01:12 +00:00
Imperadeiro98
409955cc19
Merge pull request #3236 from micman73/patch-3
...
Update el.coffee
2015-12-05 20:01:02 +00:00
Nick Winter
77731dad84
Improve server caching and ladder view refresh performance
2015-12-05 08:18:36 -08:00
Yuki Ueda
72e9838ac9
Update ja.coffee
2015-12-05 14:17:12 +09:00
Matt Lott
77a8347b5e
Prevent double _cc classroom join
2015-12-04 16:47:52 -08:00
Matt Lott
b9af07c785
Classroom view logged out Ux
2015-12-04 16:37:13 -08:00
micman73
955adc9a83
Update DiplomatView.coffee
...
two more diplomats in greek translation
2015-12-05 02:10:18 +02:00
Matt Lott
f3279863d4
Track pageviews analytics internally
2015-12-04 16:07:58 -08:00
micman73
4401af01c9
Update el.coffee
...
few additions and small correction in leaderboard section for better displaying
2015-12-05 02:04:58 +02:00
Scott Erickson
31b65ef247
IE9 hacks
...
* GET params in a url sent through router.navigate are lost on IE9, use document.location.href = url instead
* Temporarily put raster images in the DOM to give them dimensions so they are rendered in the spritesheet correctly
* Add {cache: false} to fetches for /hoc course instances and sessions
2015-12-04 15:50:07 -08:00
Scott Erickson
a573f49c98
Make unused enrollments section hidden for anonymous users in TeacherCoursesView
2015-12-04 15:02:58 -08:00
Scott Erickson
ed478e7c5e
Update enrollment terminology in ActivateLicensesModal, change enroll button color on disabled
2015-12-04 14:53:43 -08:00
Scott Erickson
9edd28b67a
Update more terminology in classroom view
2015-12-04 14:53:43 -08:00
Scott Erickson
dabf317688
Update enrollment terminology in PurchaseCoursesView
2015-12-04 14:53:43 -08:00
Scott Erickson
afb26d535b
Update ClassroomView with new enrollment terminology
2015-12-04 14:53:43 -08:00
Matt Lott
70b1a05435
Display course name in class details view
...
Instead of campaign name
2015-12-04 14:32:22 -08:00
Matt Lott
eed5ee552c
🐛 Fix course details arena button jquery
...
Clicking on text within button was a problem.
2015-12-04 14:28:05 -08:00
Matt Lott
ee9e16a484
/courses/teachers analytics
2015-12-04 14:19:59 -08:00
Scott Erickson
6ac659b571
Add explanatory copy to TeacherCoursesView
2015-12-04 14:17:24 -08:00
Matt Lott
3fb85463fa
Classroom details analytics
2015-12-04 14:11:47 -08:00
Nick Winter
b21c20c08d
Update free-trial-approved copy to not reference the confirmation email
2015-12-04 14:03:30 -08:00
Matt Lott
44cd64e00e
/courses analytics
2015-12-04 12:08:14 -08:00
Nick Winter
6d6f6138b1
Allow up to 63-character-long TLDs in email addresses
2015-12-04 12:06:42 -08:00
Nick Winter
c36bed8103
Fix classroom handling of sessions with no state yet
2015-12-04 11:59:51 -08:00
Matt Lott
4778cf5535
/hoc analytics
2015-12-04 11:31:49 -08:00
Nick Winter
16b1928fdb
Default Play to /hoc route during Hour of Code week
2015-12-04 11:04:45 -08:00
Nick Winter
417d4802ee
Don't show teacher name for single-player course
2015-12-04 11:04:18 -08:00
Scott Erickson
97c28e1c8a
Improve slow level loading on CampaignView
...
* Fix LevelSetupManager to call onLevelSync asynchronously if level is not loaded on init
* Show a progress bar in level-info-container while level is loading asynchronously
2015-12-04 10:26:09 -08:00
Scott Erickson
6a48f3697a
Add link to student and teacher course pages on course details page
2015-12-04 09:40:25 -08:00
Scott Erickson
8d70b5d53f
Remove course mocks
2015-12-04 09:29:14 -08:00
Matt Lott
6baaffd0f4
Update teacher resources pdfs
2015-12-04 09:27:06 -08:00
Scott Erickson
f72070d36b
Remove #levels from link to course details view from student courses view
2015-12-04 09:26:49 -08:00
Imperadeiro98
ac10cc3fb2
Merge pull request #3233 from micman73/patch-3
...
Update el.coffee
2015-12-04 13:21:31 +00:00
Scott Erickson
3f31c9b4dd
When adding and removing oneself from course instances, client locally updates me.courseInstances
2015-12-03 16:32:44 -08:00
Matt Lott
89aeac9424
Rename courses teacher resource pdfs
2015-12-03 16:30:50 -08:00
Matt Lott
924bef3baa
Remove autoplay from course details view
2015-12-03 16:25:33 -08:00
Matt Lott
c610ce6ffd
Remove progress tab from course details view
2015-12-03 16:25:33 -08:00
Scott Erickson
52cb638a6c
Have Student login/signup modals automatically focus first inputs
2015-12-03 16:16:28 -08:00
Scott Erickson
d874569b27
Add stats to ClassroomView
2015-12-03 14:51:38 -08:00
Scott Erickson
b2ed489197
Make sure LadderView displays a valid link back to levels for course arenas
2015-12-03 13:46:50 -08:00
Scott Erickson
3ac8f16d28
Fix ClassroomView sparse progress handling
2015-12-03 13:32:22 -08:00
Scott Erickson
afbfc69fd5
Hide teacher controls in ClassroomView when a student is viewing
2015-12-03 13:16:57 -08:00
Scott Erickson
fac71e64c9
Add created function to CocoModel
2015-12-03 12:56:22 -08:00
Scott Erickson
f8616f7c3d
Add back statsForSessions to Campaign model
2015-12-03 12:47:28 -08:00
Scott Erickson
1b30b0e72a
Project sessions loaded in ClassroomView
2015-12-03 12:36:37 -08:00
Scott Erickson
3fefdfa0a7
Add student total playtime to ClassroomView
2015-12-03 12:29:30 -08:00
Nick Winter
7cbe679f6b
Remove red color for now for indentation visualizer ( #3232 )
2015-12-03 12:14:42 -08:00
Scott Erickson
1bdefb3927
Fix links bleeding into course names in ClassroomView
2015-12-03 12:10:08 -08:00
Scott Erickson
1df87fa685
Add detailed progress and links to ClassroomView
2015-12-03 12:10:08 -08:00
Nick Winter
b0e9670453
Fixed course indexing for first levels in courses
2015-12-03 12:04:49 -08:00
Matt Lott
05497f023f
Add /Courses to router
2015-12-03 11:39:13 -08:00
petteri
abcea26dd7
Update fi.coffee
...
Added more translations
2015-12-03 10:35:34 +02:00
Matt Lott
25213c5342
Add teachers guide to /courses/teachers
2015-12-02 17:28:25 -08:00
Matt Lott
fab5388a42
🐛 Fix teachers getting started guide link
2015-12-02 17:22:28 -08:00
Matt Lott
3b21567fac
Add analytics to /teachers
2015-12-02 17:10:19 -08:00
Scott Erickson
3057df0230
Have clicking the link in InviteToClassroomModal copy it
2015-12-02 16:33:24 -08:00
Matt Lott
f3be69799c
Don't link to user profiles from course details
2015-12-02 16:22:10 -08:00
Scott Erickson
629aff2807
Ignore negative numbers in purchase courses view
2015-12-02 16:10:57 -08:00
Scott Erickson
90ac6baa67
Fix course instance generation for classrooms
2015-12-02 16:07:54 -08:00
Matt Lott
d51f42b2ec
Update /courses/teachers with getting started pdf
2015-12-02 15:19:52 -08:00
Matt Lott
e2b2a6d396
Update /teachers
2015-12-02 15:19:52 -08:00
Scott Erickson
a201200636
Tweak /courses/teachers image styling
2015-12-02 15:08:58 -08:00
Nick Winter
80253305fb
Add ?simulate=true option for testing background simulations
2015-12-02 14:57:06 -08:00
Scott Erickson
f43c3b0160
Add language icons to choose language modal
2015-12-02 14:37:09 -08:00
Scott Erickson
750086cac8
Tweak logout link copy
2015-12-02 14:30:28 -08:00
Scott Erickson
f88f4ee9ff
Tweak buttons on /hoc
2015-12-02 14:28:40 -08:00
Scott Erickson
8cc37ed034
Add recovery link to StudentLogInModal
2015-12-02 14:25:08 -08:00
Scott Erickson
ac36c0146f
Quick fix for StudentLoginModal error when username or password is not included
2015-12-02 14:19:46 -08:00
Scott Erickson
3c1a55fc2f
Merge branch 'courses-vhoc'
2015-12-02 13:16:24 -08:00
micman73
1c31e3993d
Update el.coffee
...
small corrections on lines 265,266,274 for better display.
2015-12-02 22:56:37 +02:00
Nick Winter
e5a68f1ae9
Disable background simulations while playing levels for now
2015-12-02 12:07:43 -08:00
Scott Erickson
c0b979a572
Migrate join classroom url to /courses from /courses/students
2015-12-02 12:05:54 -08:00
Rob
6d4c17f724
Merge branch 'master' into courses-vhoc
2015-12-02 12:03:55 -08:00
Rob
2ecf6dfec6
Log when we prevent keystrokes so that we can solve a crazy bug.
2015-12-02 12:03:27 -08:00
Scott Erickson
7f2ddba089
Add remove student modal to ClassroomView
2015-12-02 11:56:38 -08:00
Nick Winter
a0e5126ab7
Prompt for school name on course completion
2015-12-02 10:59:55 -08:00
Nick Winter
0d65d73024
Finish merging master into courses-vhoc
2015-12-02 10:10:50 -08:00
Nick Winter
c77e1c0fa2
Add course complete visual state for student CourseDetailsView
...
Also including a few misc tweaks to CourseDetailsView and the end-of-course HeroVictoryModal state.
2015-12-02 09:52:52 -08:00
Imperadeiro98
0a1e20f971
Uncommented an header from cs.coffee
2015-12-02 17:48:20 +00:00
Miroslav Suchý
b268006559
More Czech translations
2015-12-02 17:41:09 +01:00
Nick Winter
83f41e7808
Add buildable ogre types to DuelStatsView army power table
2015-12-02 06:46:39 -08:00
Nick Winter
3433760cfe
Only show hero campaign progress in ClanDetailsView
2015-12-02 06:46:19 -08:00
Nick Winter
0f8a5673da
Don't save empty strings for schoolName
2015-12-01 18:04:14 -08:00
Nick Winter
88ee363576
Add schoolName field to AuthModal
2015-12-01 17:44:03 -08:00
Nick Winter
cccf61e2e8
Remove a log
2015-12-01 17:38:52 -08:00
Nick Winter
3728b2dc4e
Added completion notice to course details
2015-12-01 17:32:32 -08:00
Matt Lott
93010f771a
Update available courses screenshots
2015-12-01 17:32:32 -08:00
Matt Lott
e290bf56bd
🐛 Fix /courses view class link
2015-12-01 17:32:32 -08:00
Matt Lott
b3fb8e98c2
No start new game for logged in /hoc
2015-12-01 17:32:32 -08:00
Matt Lott
56dadbf35a
Hide course details progress from anonymous
2015-12-01 17:32:32 -08:00
Nick Winter
26e321d9e7
Add schoolName field to StudentSignupModal
2015-12-01 17:32:24 -08:00
Nick Winter
8e1143b519
Add schoolName field to AuthModal
2015-12-01 17:32:02 -08:00
Rob
38a4ca4ec0
Load fonts locally when in development.
2015-12-01 16:47:11 -08:00
Imperadeiro98
509dd5a8f3
Update pt-PT.coffee
2015-12-01 22:28:15 +00:00
Matt Lott
dcf1961b9d
Widen invite classroom modal for URL
2015-12-01 13:41:45 -08:00
Matt Lott
ea1996809c
/courses/teachers add students modal
2015-12-01 13:41:45 -08:00
Scott Erickson
af136764de
Add enabling users to ClassroomView
2015-12-01 15:27:12 -06:00
Scott Erickson
cbdef392c5
Add invite modal to ClassroomView
2015-12-01 15:17:21 -06:00
Matt Lott
0b59d73650
Update classroom settings Learn Python copy
2015-12-01 12:43:40 -08:00
Matt Lott
d1a2b0944f
Add teachers link to /hoc
2015-12-01 12:38:54 -08:00
Matt Lott
8f7146449b
Update /courses teacher link based on logged in state
...
Go to /teachers if logged out
Go to /courses/teachers if logged in
2015-12-01 12:36:39 -08:00
Nick Winter
55529cc2bb
Don't show higher AI difficulty achievements in victory modal
2015-12-01 12:32:51 -08:00
Nick Winter
6b1c859e91
Preserve SuperModel when navigating between course levels
2015-12-01 12:23:01 -08:00
Nick Winter
e7809c6622
Saven even more slowly for anonymous players during high load
2015-12-01 11:51:55 -08:00
Nick Winter
ae6eca583a
Present 'Play Classroom Version' before playing a campaign level when appropriate
2015-12-01 11:24:16 -08:00
Matt Lott
68e2b5bf8f
🐛 Fix /courses classroom aceConfig reference
2015-12-01 10:34:28 -08:00
Rob
d0f3aeec91
Draw visual indent marker by hand so it's more stylish.
2015-12-01 12:22:48 -05:00
Rob
db060e9816
Fix visual indents when document row doesn't match screen row.
2015-12-01 12:02:56 -05:00
Imperadeiro98
ce92f11b27
Small fixes for last merge
2015-12-01 15:57:39 +00:00
tinavincent
6863a3b303
Översatt en massa
...
Första gången jag testar. Hoppas att jag gjort rätt.
2015-12-01 16:40:58 +01:00
Matt Lott
6418562ba2
/courses/teachers screenshot duration stars
2015-12-01 07:01:17 -08:00
Imperadeiro98
4050e0b498
Revert commit 480a310
2015-12-01 14:52:17 +00:00
Matt Lott
7efb3518a6
/courses/teachers free ribbon
2015-12-01 06:13:52 -08:00
Matt Lott
29fcbd86c4
Update /courses/teachers concept style
2015-11-30 16:53:11 -08:00
Nick Winter
851e3a092e
Play button goes to /courses if that's all the player has played
2015-11-30 16:43:33 -08:00
Matt Lott
97114e6fe3
Update /courses teacher link
...
Go to /courses/teachers instead of /teachers
2015-11-30 16:43:24 -08:00
Matt Lott
6de5a6b773
Update /courses/teachers
...
Rearrange available courses section to be closer to latest visual
design.
2015-11-30 16:40:14 -08:00
Matt Lott
171e4f888e
Update /courses/teachers
...
Adding edit class settings modal
Adding create new class modal
Repurposing ClassroomSettingsModal for create new class too.
2015-11-30 16:20:24 -08:00
Nick Winter
a8eaa79db3
Always shows level intro doc scrollbars
2015-11-30 15:33:50 -08:00
Nick Winter
457b9d0dbf
Simple AI -> Simple CPU, since players read it as 'AL' (who is SIMPLE AL?)
2015-11-30 15:27:52 -08:00
Nick Winter
3a4c8d40f6
Made LadderPlayModal buttons look more like buttons with a tasteful giant animated box-shadow
2015-11-30 15:07:01 -08:00
Nick Winter
22af180a86
Move gold display to DuelStatsView for Wakka Maul and remove army power display for non-army ladders
2015-11-30 14:58:36 -08:00
Matt Lott
e8fc90de23
Update /courses/teachers
...
Still incomplete: edit class modal, create new class modal, updated
available courses list UI
2015-11-30 14:39:46 -08:00
Rob
fa21f9ef68
Add an extra indent line if the line following a range is only whitespace.
2015-11-30 17:23:29 -05:00
Nick Winter
cc3a62febd
Fix loss of editor focus when clicking error messages and property docs popovers
2015-11-30 14:18:42 -08:00
Nick Winter
252b9a66e9
Don't encourage skip (esc) when in full-screen mode where esc exits full-screen mode
2015-11-30 14:10:34 -08:00
Nick Winter
97043c4a25
Autoplay when observing others' replays
2015-11-30 14:01:39 -08:00
Scott Erickson
5e733d1517
Add ActivateLicensesModal to ClassroomView
2015-11-30 16:59:22 -05:00
Nick Winter
8fd47535d1
Put video into its own guide tab, fix intro tabs
2015-11-30 13:54:13 -08:00
Nick Winter
69379fb54f
Show floating hero player names in course-ladder levels
2015-11-30 13:05:34 -08:00
Nick Winter
2588bfb08b
Reduce some writes during HoC to help scaling
2015-11-30 13:05:34 -08:00
Imperadeiro98
60f40bb859
Add closing sound to InventoryModal
2015-11-30 20:53:52 +00:00
Nick Winter
26be2842ed
Don't highlight Done button as much until winning replay has finished
2015-11-30 11:34:47 -08:00