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
