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
Scott Erickson
0c45e3f96c
Add ClassroomView, incomplete
2015-11-30 14:14:27 -05:00
Rob
716f759e11
Be more helpful when opening a new indent.
2015-11-30 14:13:07 -05:00
Nick Winter
bf4593f5d4
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-11-30 11:00:17 -08:00
Nick Winter
4dde508570
Merge pull request #3190 from Imperadeiro98/fix-2916
...
Fix #2916
2015-11-30 10:59:22 -08:00
Nick Winter
fcd970dbe2
Propagate i18n
2015-11-30 10:57:45 -08:00
Rob
79fe249291
Merge branch 'visual-indent'
2015-11-30 13:55:25 -05:00
Rob
1b43c3e54f
Clean up visual idents, limit to players under level 20 or with indentGuides turned on.
2015-11-30 13:54:50 -05:00
Nick Winter
ecfd982847
Note PayPal payment method. End limited-time year sale.
2015-11-30 10:50:34 -08:00
Matt Lott
a851b7129a
🐛 Fix teacher course management null check
2015-11-30 10:41:57 -08:00
Nick Winter
31e7b36310
Add link to /acccount/subscription from /account/settings
2015-11-30 09:19:53 -08:00
Nick Winter
542cd98329
Fix #3221
2015-11-30 07:23:33 -08:00
Scott Erickson
d255802e38
Set up /courses for individuals without any course instances
2015-11-29 18:41:57 -05:00
Scott Erickson
b734beb852
Revert test changes
2015-11-29 18:26:42 -05:00
Scott Erickson
11e9a40645
Finish hooking up ChangeCourseLanguageModal into /courses
2015-11-29 18:25:57 -05:00
Scott Erickson
8662fb057f
Fix /courses when not joining
2015-11-29 18:20:38 -05:00
Scott Erickson
87c7bafd57
Add join-class functionality to /courses
2015-11-29 18:13:31 -05:00
Matt Lott
edc05facfe
Update /courses/purchase
...
Updating to latest UI designs.
2015-11-29 14:45:36 -08:00
Scott Erickson
5a72d32f60
Fix HOC complete text in /courses
2015-11-29 17:23:55 -05:00
Scott Erickson
405785bafe
Add completion stats to /courses
2015-11-29 17:18:24 -05:00
Scott Erickson
07ad8382cc
Project sessions loaded in /courses
2015-11-29 16:17:55 -05:00
Nick Winter
ee6be55a9d
Don't load sounds from level while muted
2015-11-29 12:32:04 -08:00
Nick Winter
95c703a7df
Simulate games in background while playing levels if we think there's extra compute power
2015-11-29 12:30:19 -08:00
Scott Erickson
47acfc93d0
Fix course buttons and level links in /courses
2015-11-29 15:26:17 -05:00
Scott Erickson
ea0c274a3c
Fix /courses initial implementation
2015-11-29 15:26:17 -05:00
Matt Lott
33599c8632
Update /teachers based on latest visual design
2015-11-29 07:02:45 -08:00
Nick Winter
46e738a737
Collapse sets of achievements in achievements list
2015-11-28 08:39:05 -08:00
Rob
e6afb51085
First pass at showing indention guides.
2015-11-27 20:46:55 -05:00
Nick Winter
a6f980dab1
Support for pre-configuring hero on Assembly Speed
2015-11-27 12:12:58 -08:00
Nick Winter
9dccf73af0
'Click to view attempt' for incomplete student solutions
2015-11-27 12:12:32 -08:00
Scott Erickson
2bbabd4917
Switch CourseInstance firstLevelURL to return dungeons-of-kithgard
...
Since we switched from using forked levels
2015-11-27 11:30:25 -05:00
Scott Erickson
d4540af780
Merge branch 'master' into courses-vhoc
2015-11-27 10:43:15 -05:00
Imperadeiro98
f240e5341f
Update pt-PT.coffee
2015-11-26 16:27:48 +00:00
Imperadeiro98
620448d705
Merge pull request #3209 from criptonauta/patch-3
...
Update pt-BR.coffee
2015-11-26 15:05:42 +00:00
Nick Winter
ac0e21aa39
Propagate i18n
2015-11-25 16:52:10 -08:00
Nick Winter
d465a3080d
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-11-25 16:51:27 -08:00
Nick Winter
88cca795c6
Don't try to autorank anonymous users playing autoranked ladder levels
2015-11-25 16:51:12 -08:00
Nick Winter
8d444e7ce8
Fix returning to course-ladder in HeroVictoryModal when arrived at via next-level button
2015-11-25 16:50:42 -08:00
Matt Lott
e7acf9c798
🐛 Fix local env analytics log event URL
...
Found another one @basicer
2015-11-25 16:33:27 -08:00
Matt Lott
c385aaa414
Merge branch 'master' into courses-vhoc
2015-11-25 16:11:36 -08:00
Matt Lott
4ba3c47367
🐛 Fix courses view jade typo
2015-11-25 15:13:43 -08:00
Matt Lott
7b01fd7b65
Add course name to victory modal
2015-11-25 14:23:35 -08:00
criptonauta
c87abeebff
Update pt-BR.coffee
...
Some more changes in courses
2015-11-25 19:02:06 -03:00
Matt Lott
022cdf6d6e
🐛 Fix homepage CSS on Windows
2015-11-25 12:27:42 -08:00
Imperadeiro98
de23e03418
Uncommented an header
2015-11-25 18:19:49 +00:00
Imperadeiro98
1df39a61cc
Merge pull request #3207 from criptonauta/patch-4
...
Update pt-BR.coffee
2015-11-25 18:19:06 +00:00
Matt Lott
e716952f5f
Add HoC trial special to /teachers
2015-11-25 08:39:56 -08:00
criptonauta
5bc44e1043
Update pt-BR.coffee
...
Some translations for 'courses' section
2015-11-25 12:16:29 -03:00
Imperadeiro98
d7619adde6
Merge pull request #3206 from Saibamen/patch-1
...
Update pl.coffee
2015-11-25 13:59:32 +00:00
Matt Lott
24345cf296
Course victory modal current and next level names
2015-11-24 16:46:27 -08:00
Saibamen
9750aa09a6
Update pl.coffee
2015-11-25 01:30:03 +01:00
Matt Lott
4cc71bd0e6
Add HoC links to homepage
2015-11-24 15:28:37 -08:00
Nick Winter
7cba3f3725
Don't show code language selector for course ladders
2015-11-24 13:52:37 -08:00
Nick Winter
b44714a60b
Fix achievement loads never happening if you didn't earn any of them
2015-11-24 13:49:38 -08:00
Nick Winter
9f0a843593
Enable auto-submission to ladder for Wakka Maul
2015-11-24 13:35:15 -08:00
Imperadeiro98
01c7efb78a
Merge pull request #3205 from criptonauta/patch-3
...
Update DiplomatView.coffee
2015-11-24 21:20:06 +00:00
Nick Winter
67f14c7928
Try putting AI players in league ladders
2015-11-24 13:18:38 -08:00
criptonauta
fddd11f9b4
Update DiplomatView.coffee
2015-11-24 18:16:10 -03:00
Imperadeiro98
2a1b464d5a
Fix for last merge
2015-11-24 21:01:57 +00:00
Imperadeiro98
12c228c14d
Merge pull request #3203 from criptonauta/patch-1
...
Update pt-BR.coffee
2015-11-24 21:01:14 +00:00
Matt Lott
f261c1466a
Update /teachers
...
Stop forwarding to HoC
Update copy with courses info.
2015-11-24 10:59:14 -08:00
Rob
4dde97153c
Don't panic if we didn't load stripe. (Makes game run offline).
2015-11-24 13:42:00 -05:00
Matt Lott
d7a66722b9
Update teacher surveys
...
Removing trial subscriptions
Updating trial page copy
Adding special HoC trial
Introducing a new course prepaid property endDate, which won’t be
returned or redeemed after the date.
2015-11-24 10:32:19 -08:00
criptonauta
d44a8b469e
Update pt-BR.coffee
2015-11-24 14:36:44 -03:00
Nick Winter
ec7f17a149
Show level indexes in courses
2015-11-24 08:56:28 -08:00
Nick Winter
d675e14f59
Fix issue returning to ladder when playing course-ladder levels outside of a course arena
2015-11-24 08:36:57 -08:00
Nick Winter
65890130bb
Change how goals are expanded/collapsed at beginnings of levels
2015-11-24 08:28:05 -08:00
Imperadeiro98
0d35f1472e
Fixes for last merge
2015-11-23 20:34:17 +00:00
Scott Erickson
2adb3362ed
Add ChangeCourseLanguageModal to CoursesView
2015-11-23 11:52:15 -06:00
Scott Erickson
03a38f6129
Remove some logs
2015-11-23 08:53:13 -08:00
Scott Erickson
ea4a98af86
Add rest of CoursesView, untested, unhooked to server
...
On a plane, so skipping my usual iterative testing.
Bugs are undoubtedly everywhere.
2015-11-23 08:46:08 -08:00
Tuan Manh Lai
a0d5d2ea66
Update vi.coffee
2015-11-23 20:37:15 +07:00
Tuan Manh Lai
c00cfddf3b
Update vi.coffee
2015-11-23 20:32:52 +07:00
Yuki Ueda
cfbd62a899
Update ja.coffee
2015-11-23 16:28:34 +09:00
Matt Lott
1f962e7667
Fix analytics /db GET URL
2015-11-22 09:26:35 -08:00
Nick Winter
21810be8eb
End an A/B test
2015-11-22 07:53:49 -08:00
Nick Winter
e0011ee5d0
Classroom invite codes are now real words like BigFrogFarm
2015-11-22 07:47:28 -08:00
Imperadeiro98
6756e5ebe6
Merge pull request #3196 from thatguy7/master
...
fixed some errors and added a few new tranlations
2015-11-22 12:13:27 +00:00
Scott Erickson
a98d0b1b2a
Partial work on /courses view when signed in
2015-11-22 00:08:46 -08:00
Nick Winter
e1983f7556
Merge pull request #3191 from viettruong2194/text-overlap-contribute-page
...
Change z-index of contribute tiles to prevent overlap between dropdowns for #3127
2015-11-21 16:29:37 -08:00
Nick Winter
295a0e06e9
Merge pull request #3188 from viettruong2194/text-overlap-wooden-frame
...
Fix top margin and height for game-menu for #2963
2015-11-21 16:20:12 -08:00
thatguy7
c4146d046a
fixed some errors and added a few new tranlations
...
As I played through some of the levels to see if I would suggest this
game to my students, I encountered multiple translations that were
either phrased very weirdly, grammatically incorrect or completely
nonsensical.
I fixed those and also translated a few new lines along the way.
The german word for buy ("kaufen") is shorter than the word for unlock
("freschalten") and should fit in the button. I suggest changing that,
but it feels like avoiding the word buy was a design decision, so I left
it as it is.
2015-11-22 00:11:12 +01:00
Scott Erickson
5aff591a8b
Set up courses view for anonymous users
2015-11-21 11:38:34 -08:00
Scott Erickson
f1d4a9d53b
Remove vestigial code from hour of code view template
2015-11-21 11:33:32 -08:00
Scott Erickson
9292396dad
Add logout link to HourOfCodeView when signed in
2015-11-20 18:22:52 -08:00
Scott Erickson
27b21d0c4e
Add classroom code handling to StudentSignUpModal
2015-11-20 18:02:02 -08:00
Scott Erickson
aee1f6587a
Add StudentSignUpModal to HourOfCodeView
2015-11-20 16:28:28 -08:00
Matt Lott
9d329d4a1d
Migrate external trial requests to database
...
Added created field to ~2800 older trial.requests
Inserted ~700 external requests from Google forms
2015-11-20 15:53:00 -08:00
Scott Erickson
65dd571041
Fix StudentLoginModal when email or password is not included
2015-11-20 15:17:04 -08:00
Scott Erickson
f7f405b774
Remove colons from template, unused formValues from view
2015-11-20 14:52:13 -08:00
Scott Erickson
f8cf3212dc
Remove unneeded .input-border wrapper
2015-11-20 14:47:35 -08:00
Scott Erickson
b88a817e25
Fix login button text
2015-11-20 14:44:17 -08:00
Scott Erickson
f8a5baa4f6
Finish StudentLoginModal implementation
2015-11-20 13:59:43 -08:00
Scott Erickson
70a3a199a0
Remove login button when you are logged in, refactor HOC view to always use a well
2015-11-20 13:36:50 -08:00
Scott Erickson
7cd031064f
Fix HourOfCodeView padding
2015-11-20 13:32:45 -08:00
Scott Erickson
9dbd4d296a
Merge branch 'master' into courses-vhoc
2015-11-20 13:28:43 -08:00
Scott Erickson
bcb869594d
Add start of StudentLoginModal
2015-11-20 07:52:35 -08:00
Nick Winter
7ede7928ca
Fix typo in course ladder links
2015-11-20 07:17:16 -08:00
Imperadeiro98
f3eae6e171
Merge pull request #3186 from mancusoa74/patch-1
...
Update it.coffee
2015-11-20 12:34:54 +00:00
Viet Truong
019995751f
Change z-index of contribute tiles to prevent overlap between dropdowns for #3127
2015-11-19 23:59:43 -08:00
Nick Winter
be00cae1df
Fix returning to course ladder from arena modals
2015-11-19 16:36:29 -08:00
Matt Lott
db5f0171c7
Make trial request created property editable
2015-11-19 16:07:02 -08:00
Nick Winter
9049d2498e
Fix #3179 : pending patches collections using _ instead of .
2015-11-19 15:41:20 -08:00
Nick Winter
7fdd6d5180
Fix #3174 : save button triggering on delete/reset account form fields
2015-11-19 15:37:37 -08:00
Nick Winter
9ccd03f8d6
Make /teachers -> /courses/teachers?hoc=true more reliable
2015-11-19 15:32:52 -08:00
Scott Erickson
1a4a143340
Initial build of /hoc, no login/create account modals yet
2015-11-19 15:26:45 -08:00
Matt Lott
804c62e13b
Add created field to trial requests
...
Necessary for importing external trial requests.
2015-11-19 15:20:42 -08:00
Nick Winter
2fecaf9618
Show AI flare in ladders. Show more players for league ladders.
2015-11-19 15:18:53 -08:00
Nick Winter
df8b52db27
Add ?codeLanguage= parameter for loading levels in different languages
2015-11-19 14:49:47 -08:00
Nick Winter
d673dd9973
Ask, 'How fun was this level?' on course victory
2015-11-19 14:49:29 -08:00
Nick Winter
e80544e215
Don't show Capture Their Flag clan ladder yet
2015-11-19 14:47:41 -08:00
Nick Winter
93fccaa23f
Show humans vs. ogres for Wakka Maul ladder
2015-11-19 14:47:25 -08:00
Imperadeiro98
480a310313
Add sound to Facebook login
2015-11-19 21:36:57 +00:00
Nick Winter
ef7618497f
Fix #3184 : get more of our campaign overworld properties we need
2015-11-19 13:20:42 -08:00
Nick Winter
3926204f47
Don't do course arena league for solo course ladders
2015-11-19 13:20:21 -08:00
Nick Winter
c8ceca4d3d
Add user.courseInstances, use it for course ladders
2015-11-19 10:41:31 -08:00
Imperadeiro98
094743c4f5
Fix #2916
2015-11-19 17:05:00 +00:00
Nick Winter
bc1b11df94
Merge pull request #3189 from Imperadeiro98/fix-2966
...
Fix #2966
2015-11-19 08:35:49 -08:00
Imperadeiro98
2d584c527d
Fix #2966
2015-11-19 16:33:54 +00:00
Viet Truong
62345aeb1d
Fix top padding and margin for game-menu for #2963
2015-11-18 15:49:35 -08:00
Scott Erickson
ee1e484dda
Have play buttons show 'Compete!' for arena levels on CourseDetails levels list
2015-11-18 14:08:25 -08:00
Scott Erickson
7a6c42b89f
Set up course-ladder level handling
...
* LadderView displays course info, different style for course-ladder levels
* LadderView hides simulate tab for course-ladder levels
* HeroVictoryModal links to LadderView for course-ladder levels
* CourseDetails page links to LadderView for course-ladder levels
* Enable course instances for league simulation
2015-11-18 14:02:45 -08:00
Antonio Mancuso
fe7eb89a03
Update it.coffee
...
I would like contributing to this great game.
I woul dlike to help completing the Italian translation asap to enable Italian kids to play and learn with CodeCombat
thnx
Antonio
2015-11-18 22:37:40 +01:00
Imperadeiro98
c4f0f07994
Fix
2015-11-18 19:36:30 +00:00
Imperadeiro98
db6166d22c
Some changes
2015-11-18 19:33:26 +00:00
Imperadeiro98
a19225013b
Refactor to use view in template
2015-11-18 19:16:44 +00:00
Scott Erickson
890d528d80
Fix level session stats in CourseDetailsView
2015-11-17 16:54:04 -08:00
Matt Lott
bc454191ec
Update accounts prepaid list
...
Needed clearer total and remaining columns.
2015-11-17 16:21:08 -08:00
Scott Erickson
6a54c7cf54
Add classroom name, description, and language editing, and classroom language infrastructure
2015-11-17 16:10:23 -08:00
Nick Winter
a0038602a1
Fix some course level submit button behavior, also help mirror session scoring
2015-11-17 15:26:10 -08:00
Nick Winter
040f7c94ab
Track ladderAchievementDifficulty in multiplayer human level sessions
2015-11-17 15:25:22 -08:00
Nick Winter
f1b0b4f9c5
Allow achievement query editing in achievement editor
2015-11-17 15:24:33 -08:00
Nick Winter
a5fc31dbb3
Allow multiplayer levels to earn achievements
2015-11-17 15:23:35 -08:00
Nick Winter
a725cd70d8
Update comment color to Robin's favorite blue
2015-11-17 15:23:35 -08:00
Nick Winter
9b990ba452
Mark mirror match multiplayer levels complete on success
2015-11-17 15:23:34 -08:00
Nick Winter
01c9948b5b
Favor complete over incomplete sessions in CampaignView flag status
2015-11-17 15:23:34 -08:00
Rob
7a86f754df
Add flavor to overworld.
2015-11-17 11:27:08 -08:00
Rob
991fead0f6
Create specific campaign view for campaign selection screen.
2015-11-17 11:15:56 -08:00
Jhoon Saravia
b375e10c68
Finish translation of new strings
2015-11-16 21:44:28 -05:00
Jhoon Saravia
4c25062d78
Make uniform translation of the word subscription
2015-11-16 20:52:31 -05:00
Jhoon Saravia
9d6de4c0ba
Translate half of new strings
2015-11-15 20:47:05 -05:00
Imperadeiro98
6f81a72adf
Merge pull request #3176 from Raphaelwuhao/patch-1
...
Update zh-HANS.coffee
2015-11-16 12:56:11 +00:00
Imperadeiro98
e268e20390
Fixed last merge
2015-11-15 18:13:47 +00:00
Imperadeiro98
8bba79eecf
Merge pull request #3178 from dolasilla/master
...
Italian translations added or fixed
2015-11-15 18:12:50 +00:00
SILVIA BINDELLI
bdf2df12be
Italian translations added or fixed
2015-11-15 17:57:37 +01:00
Nick Winter
0abb9a38ad
Use nanoscroller to allow intro doc scrolling
2015-11-15 08:23:12 -08:00
Nick Winter
31a13d69b3
Add playback: playing: false default to scripts, with default editor task to adjust it
2015-11-15 08:03:14 -08:00
Nick Winter
ef72286864
Don't autoplay hero or course levels by default. Fix Course: Known Enemy autocomplete string format.
2015-11-15 07:59:20 -08:00
Nick Winter
1603c72469
Move achievement popup to lower left to avoid covering up Continue button on small screens
2015-11-15 07:08:02 -08:00
Raphaelwuhao
6d989a523a
Update zh-HANS.coffee
2015-11-14 22:20:58 -08:00
Raphaelwuhao
104ca4f2cd
Update zh-HANS.coffee
2015-11-14 20:57:30 -08:00
Nick Winter
5d9d5c0ae6
Remove ProblemAlertView help button
2015-11-14 17:33:05 -08:00
Nick Winter
aee2f7c219
Add loading indicators, hide UI pre-load for /play
2015-11-14 17:30:37 -08:00
Nick Winter
b31e5fc93a
Fix user.code.problem routes to use . instead of _
2015-11-14 16:32:21 -08:00
Nick Winter
401d383ff4
Change gutter X to exclamation mark
2015-11-14 16:31:05 -08:00
Rob
c0d9c231bc
Normalize some URLs that used both .s and _s to use only .s
2015-11-13 15:16:03 -05:00
Matt Lott
b3362c8d0d
Add courses to top menu
...
Bumping about to bottom menu, removing clans.
2015-11-13 11:33:03 -08:00
Matt Lott
c7a7a9d3ac
Redirect /teachers to /courses/teachers?hoc=true
...
Will update /teachers soon with relevant information, but at the moment
it is too outdated.
2015-11-13 10:30:37 -08:00
Matt Lott
c7118d69e5
Redirect 2014 HoC link to 2015 HoC link
...
https://app.asana.com/0/54276215890539/65805646890763
2015-11-13 10:17:05 -08:00
Imperadeiro98
12523dd247
Update pt-PT.coffee
2015-11-13 13:21:08 +00:00
Imperadeiro98
d555b04ca4
Merge pull request #3173 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-11-13 13:00:36 +00:00
Imperadeiro98
fc4008567c
Fix build
2015-11-13 12:59:34 +00:00
Yuki Ueda
e6d769bab0
Update ja.coffee
2015-11-13 15:59:19 +09:00
Nick Winter
d744d2db2b
Propagate i18n
2015-11-12 16:42:37 -08:00
Matt Lott
840970c267
🐛 Fix greek translation file indentation
2015-11-12 16:39:44 -08:00
Nick Winter
3c62b5b39e
Merge pull request #3172 from zsdregas/master
...
Greek Translation
2015-11-12 16:36:15 -08:00
Nick Winter
356f65561c
Add ladder banner images to ladder home
2015-11-12 16:30:56 -08:00
Nick Winter
9e61928080
Add reset progress feature in account settings
2015-11-12 15:27:28 -08:00
Zacharias Sdregas
fdeb86e353
Greek Translation 121115
2015-11-12 23:09:22 +02:00
Zacharias Sdregas
b9d2b7b07b
Almost Done
2015-11-12 23:07:38 +02:00
Matt Lott
e6e0617945
Tracking property for admin added course headcount
2015-11-12 12:16:40 -08:00
Nick Winter
910dd8e6b6
Use course access control for shared course hero levels
2015-11-12 11:00:54 -08:00
Nick Winter
cb101c7905
Replace simple loops while while True in course level sample code
2015-11-12 11:00:51 -08:00
Nick Winter
fe05e66458
Give Campaigns types so that course campaigns can share hero levels
2015-11-12 10:25:25 -08:00
Nick Winter
f7f7cd683e
Allow using hero levels as course levels. Refactor current course tracking to use GET parameters.
2015-11-12 10:25:25 -08:00
Scott Erickson
8b00c38350
Merge pull request #3168 from Imperadeiro98/use-view
...
Refactor to use view in template for issue #3138
2015-11-12 09:58:49 -08:00
Matt Lott
df57e99957
Don't block videos in guide for course levels
...
https://app.asana.com/0/54269205393657/61779149610165
2015-11-12 06:05:21 -08:00
Zacharias Sdregas
ca0e5af481
Some more translated
2015-11-12 15:03:07 +02:00
Matt Lott
5ca68ff682
🐛 Fix analytics dashboard date oboe
2015-11-11 20:21:35 -08:00
Nick Winter
29892a9619
Add user country to contact messages
...
https://app.asana.com/0/54275583589675/64698696631078/f
2015-11-11 15:43:25 -08:00
Nick Winter
b9deb363d2
Add Brazil office address
2015-11-11 10:33:21 -08:00
Nick Winter
fae1411e3a
Fix hourOfCode initialization for unregistered players with inconsistent system time or coming to /hoc after 5 minutes
2015-11-11 09:07:16 -08:00
Zacharias Sdregas
88eeb2b3b7
some 250 more strings translated
2015-11-11 18:16:41 +02:00
Nick Winter
f6307ac04e
Made while True snippets work in course levels
2015-11-11 07:41:52 -08:00
Nick Winter
42b53dff20
Fix camera and spectate bugs with new loading intro behavior
2015-11-11 06:42:12 -08:00
Imperadeiro98
18eef3b0ec
Merge pull request #3171 from probil/patch-4
...
Update ukrainian l18n
2015-11-11 14:25:34 +00:00
Imperadeiro98
a36220694a
Indentation fix
2015-11-11 14:25:17 +00:00
Imperadeiro98
871738ecdb
Merge pull request #3134 from janjoos/patch-2
...
Smart update
2015-11-11 14:24:41 +00:00
Nick Winter
0dc0b51556
Hid loading intro scroll for now, bad scroll bars.
2015-11-11 05:53:01 -08:00
Matt Lott
1c0550ff9f
🐛 Fix admin analytics date bugs
2015-11-10 17:26:15 -08:00
Scott Erickson
d9d5dce2e0
Merge branch 'master' into course-correction
2015-11-10 16:34:33 -08:00
Nick Winter
7e433b9e12
Use ?intro=true to show intro screen even after level completion
2015-11-10 16:09:21 -08:00
Nick Winter
2259076800
LoadingScreen -> level intro behavior
2015-11-10 15:22:09 -08:00
Nick Winter
4497334e6d
Update a couple team avatar and descriptions
2015-11-10 15:21:34 -08:00
Matt Lott
e33323e7eb
Add line charts to admin analytics dashboard
...
https://app.asana.com/0/54276215890539/64369256136957
2015-11-10 14:55:48 -08:00
Max Lyashuk
f69d28b8cb
Update ukrainian l18n
...
Translated more lines, fix wrong translations, fix language specific things
2015-11-11 00:41:07 +02:00
Scott Erickson
cddf000276
Add way for admins to grant users course prepaids
2015-11-10 14:33:27 -08:00
Josh Callebaut
c4779468bd
Adds Josh C's image and updates the about page.
2015-11-10 13:46:48 -08:00
Scott Erickson
a0212da789
Improve StudentCoursesView
...
* Add alert explaining when a user joins a course, and links directly to the course
* Add header to My Courses list
* Have My Courses list sorted by classroom creation then course creation
2015-11-10 12:08:44 -08:00
Zacharias Sdregas
5491bf4860
318 more strings translated
2015-11-10 17:42:55 +02:00
Zacharias Sdregas
0c8f8e3d78
Greek Translation - A few more string translated
2015-11-10 07:23:04 +02:00
Scott Erickson
0c5b39e029
Merge branch 'master' into course-correction
...
Some package scripts got in the way of each other
2015-11-09 18:18:02 -08:00
Scott Erickson
12b3947448
Tweak wording on TeacherCoursesView
2015-11-09 18:14:42 -08:00
Scott Erickson
c8fc893ef1
Adjust CourseDetailsView for classrooms
...
* Disable settings modal
* Show classroom name instead of course instance name if available
2015-11-09 18:08:39 -08:00
Scott Erickson
628ed9a990
Remove add students tab from CourseDetailsView
2015-11-09 18:00:55 -08:00
Scott Erickson
97cb5275c3
Fixes for courses, hoc
...
* Handling prepaids with strings for maxRedeemers
* Add link to TeacherCoursesView from HourOfCodeView
* Show only course instances with classrooms attached in TeacherCoursesView and StudentCoursesView
* Add event tracking to HourOfCodeView
* Add not-logged-in handling to TeacherCoursesView
* Fixed a GET prepaids bug
* Have course instances created for hour of code have hourOfCode property set to true.
2015-11-09 17:58:40 -08:00
Scott Erickson
c8a47818c2
Initial setup of the hoc page
2015-11-09 16:45:12 -08:00
Scott Erickson
39a60f1cb7
Disabling required fields to make it easier to migrate
2015-11-09 16:07:27 -08:00
Imperadeiro98
28363f780a
Small tweaks
2015-11-09 21:35:33 +00:00
Scott Erickson
f7a41dc91a
When a student joins a classroom, they also join all course instances for that classroom which are free to join
2015-11-09 13:29:49 -08:00
Imperadeiro98
8e8a3103d5
Refactor to use view in template for issue #3138
...
This removes getRenderData from: CareersView, SaveCampaignModal,
InfiniteLoopModal, SpellListEntryThangsView, SaveLoadView,
PlaySettingsModal and JobProfileCodeModal.
2015-11-09 21:29:27 +00:00
Scott Erickson
91b8f9bb40
Switch back active tab, was switched for testing
2015-11-09 12:41:55 -08:00
Scott Erickson
1f37f12cc5
Fix auto course-instance creation
...
The interface now shows a progress bar while course instances are created for a class.
It also creates the course instances as soon as the classroom is created.
2015-11-09 12:12:10 -08:00
Scott Erickson
b0a0530d3c
Add courses tab to teacher courses page
2015-11-09 11:48:40 -08:00
Max Lyashuk
596bae17d6
Update ukrainian l18n, fix bugs
2015-11-09 21:16:01 +02:00
Zacharias Sdregas
9aa66db52d
More strings translated
2015-11-09 16:03:51 +02:00
Matt Lott
95b61c2f83
Add recurring revenue to admin analytics page
...
https://app.asana.com/0/54276215890539/59638739614287
2015-11-08 17:00:24 -08:00
Matt Lott
7861faaf93
Add active classes to admin analytics page
...
https://app.asana.com/0/54276215890539/59638739614287
2015-11-06 14:11:39 -08:00
Nick Winter
ad240152c6
Fix #3159
2015-11-06 13:00:23 -08:00
zacharias
6fc2e339de
more strings translated
2015-11-06 13:37:39 +02:00
Scott Erickson
7daff0861f
Add functionality to StudentCoursesView
2015-11-05 17:31:11 -08:00
Scott Erickson
4c4b301925
Add functionality to TeacherCoursesView
2015-11-05 17:26:31 -08:00
Scott Erickson
7d686c5194
Add Backbone events to stripe handler
2015-11-05 15:31:25 -08:00
Scott Erickson
b36bf7b171
Add PurchaseCoursesView
2015-11-05 15:30:57 -08:00
Scott Erickson
4b71447877
Have POST /db/prepaid/:id/redeemers set user.coursePrepaidID property
2015-11-05 12:53:25 -08:00
Rob
39a97135de
Explicitly check for selection when overriding return.
2015-11-05 10:14:53 -08:00
RUSLAN LÓPEZ CARRO
2de074821c
Update es-419.coffee
2015-11-05 11:24:13 -06:00
Nick Winter
995459e1d5
Merge pull request #3156 from Imperadeiro98/some-updates
...
Remove a lot of unused strings
2015-11-05 08:25:32 -08:00
Rob
cde3b252da
Don't load user sessions on non premium dashboards.
2015-11-04 16:57:48 -08:00
Scott Erickson
00ce821939
Add InviteToClassroomModal, begin join class in StudentCoursesView
2015-11-04 16:54:13 -08:00
Rob
75532e3a79
Use generated member count instead of pulling a list of all members from mongo when we get the public clans list.
2015-11-04 16:00:54 -08:00
Imperadeiro98
424bea90b6
Reverted resources strings removal
2015-11-04 22:44:46 +00:00
Imperadeiro98
89521e2dbe
Remove a lot of unused strings
2015-11-04 21:45:15 +00:00
Nick Winter
34715befcc
Increment user's concept stats on level completion
2015-11-04 13:42:09 -08:00
Matt Lott
722540f3be
Remove old user analytics page
2015-11-04 10:59:10 -08:00
Matt Lott
d445024cb6
Add admin analytics page with MAUs
...
Includes updating analytics insert script used to inject aggregated
data into production database.
2015-11-04 10:59:10 -08:00
Scott Erickson
d987b644a9
Merge remote-tracking branch 'origin/master'
2015-11-04 10:54:59 -08:00
Scott Erickson
669ab416e5
Fix SubscriptionView to keep emails when emails are erroneous
2015-11-04 10:52:47 -08:00
Scott Erickson
05bd12e8cc
Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation
...
# Conflicts:
# app/views/account/SubscriptionView.coffee
2015-11-04 10:47:39 -08:00
Nick Winter
1b4f6262cb
Exclude non-selected code language documentation blocks from level guides
2015-11-04 10:46:16 -08:00
Nick Winter
0caf9c3547
Fix avatars not showing up in HUD.
...
Asana 54271591170319
2015-11-04 10:26:54 -08:00
Imperadeiro98
dbd9e325d4
Merge pull request #3155 from mads232/patch-2
...
Update da.coffee
2015-11-04 18:04:24 +00:00
Imperadeiro98
b0908524c4
Merge pull request #3153 from snarkota/patch-4
...
Update lt.coffee
2015-11-04 17:52:58 +00:00
Imperadeiro98
81e68ca795
Merge pull request #3152 from abdalim/msmy-home
...
Add Bahasa Melayu translations for Home
2015-11-04 17:50:45 +00:00
Imperadeiro98
7dacacf232
Merge pull request #3151 from poshus1984/patch-1
...
Update lt.coffee
2015-11-04 17:50:11 +00:00
Rob
361b5229e6
Use an newer, official build of ace instead of just copying the files into our source tree.
2015-11-03 17:33:35 -08:00
Scott Erickson
66432990f4
Add framework for new courses pages
2015-11-03 16:41:06 -08:00
Nick Winter
964b3f534c
Remove Bloc offer
2015-11-03 15:45:05 -08:00
Scott Erickson
0e2305bc3d
Add POST /db/course_instance/:id/members
2015-11-03 14:00:51 -08:00
Scott Erickson
429f50e1c6
Untie CourseInstance creation from prepaids, tie them to classrooms instead
2015-11-03 11:18:44 -08:00
mads232
841412a87d
Update da.coffee
2015-11-03 18:43:55 +01:00
Scott Erickson
27d423a410
Add Classroom server model and endpoints
2015-11-02 17:07:23 -08:00
Nick Winter
05e95923c2
Add Carlos to /about
2015-11-02 16:15:43 -08:00
Josh Callebaut
f885a0e45d
This updates the en.coffee file to account for josh_c's blurb and title.
2015-11-02 16:08:03 -08:00
Josh Callebaut
8b26c8a8b5
Merge remote-tracking branch 'upstream/master'
2015-11-02 16:03:32 -08:00
Josh Callebaut
c0ddbd2df1
Uniquifies the i18n tag for Josh C
2015-11-02 15:26:03 -08:00
Josh Callebaut
05f74a2fcd
Adds Josh Callebaut to the about.jade file.
2015-11-02 15:21:05 -08:00
Nick Winter
b1ae9075ff
Updated README to include a few new avatars.
2015-11-02 15:19:54 -08:00
Scott Erickson
c3735ba0eb
Add exhausted property to prepaid model
...
It is true when redeemers.length >= maxRedeemers
2015-11-02 13:06:58 -08:00
Nick Winter
5106bd5390
Fix sortThangComponents corner case in course levels with Plans attaching twice
...
Fixes https://app.asana.com/0/54276215890539/62515742172177/f
2015-11-02 12:35:28 -08:00
Nick Winter
caab006c5e
Merge pull request #3149 from dillonforrest/master
...
Change visible references of 'HipChat' to 'Slack'.
2015-11-02 10:32:48 -08:00
snarkota
ce376564a9
Update lt.coffee
2015-11-02 16:55:14 +02:00
Alim
0b156242d9
Add Bahasa Melayu translations for Home
2015-11-01 13:57:19 +08:00
Sigitas Mockus
20017691d3
Update lt.coffee
2015-10-31 19:10:43 +02:00
Imperadeiro98
1cdb598350
Fixes to last merge
2015-10-31 14:06:13 +00:00
albenarammou
94cb1075e8
Update bg.coffee
2015-10-31 09:24:05 +02:00
Scott Erickson
fa4355f946
Add programming language to options in course instances
2015-10-30 15:56:43 -07:00
Scott Erickson
0da66bd468
Refactor CourseEnrollView to use view in template
2015-10-30 11:40:34 -07:00
Scott Erickson
11d3bfc9c4
Make redeem coupon network errors on /courses happen within modal
2015-10-30 11:05:24 -07:00
Scott Erickson
429f2c2839
Fix renderSelectors to handle selectors with multiple targets
2015-10-30 11:05:24 -07:00
Nick Winter
504e65ec27
Commit client-side code for acdfe7c
2015-10-30 09:43:05 -07:00
Rob
cea412c0a9
Fix indentation.
2015-10-30 11:16:48 -04:00
Imperadeiro98
6e01f367d9
Fixes to last merge
2015-10-30 14:37:05 +00:00
Imperadeiro98
08e9d682d0
Merge pull request #3143 from RobertLukowski/patch-3
...
Update de-DE.coffee
2015-10-30 14:35:05 +00:00
dillon
493d302a0d
Change visible references of 'HipChat' to 'Slack'.
2015-10-30 00:07:58 -07:00
Nick Winter
f100d6dba6
Merge pull request #3118 from codecombat/soffes/ipad
...
[WIP] Changes for iPad app
2015-10-29 16:24:39 -07:00
Rob
e048848d6b
Add 50% more room for fingers in the autocomplete box.
2015-10-29 18:16:58 -04:00
Rob
75c63a0ace
When pressing enter with an active selection, just make a new line under it.
2015-10-29 18:16:23 -04:00
Imperadeiro98
bf1ef72a15
Merge pull request #3148 from javatlacati/patch-1
...
Update es-419.coffee
2015-10-29 21:42:05 +00:00
Matt Lott
8b254164c9
Free course enrollment for admins
2015-10-29 14:09:19 -07:00
RUSLAN LÓPEZ CARRO
9283492cb8
Update es-419.coffee
...
Some already translated strings appear as untranslated :S
2015-10-29 14:32:15 -06:00
Rob
f0e1fc1f77
Let API properties declare their return values should be captured.
...
Auto complete will know when to add a variable asingment.
2015-10-29 15:07:19 -04:00
Imperadeiro98
f2ca1dbd63
Updates to i18n
2015-10-29 15:57:22 +00:00
Nick Winter
3352042af5
Uncomment nl-BE section header
2015-10-29 07:40:30 -07:00
Nick Winter
46c8b4f81d
Merge nl-BE.coffee
2015-10-29 07:37:06 -07:00
RobertLukowski
0d2f747a6e
Update de-DE.coffee
...
I hope the de-Translation is better
2015-10-29 15:19:40 +01:00
WardLanssens
8acaa80397
Update nl-BE.coffee
2015-10-29 15:18:50 +01:00
Scott Erickson
7b54a04d33
Fix reload code button in play view on IE9
2015-10-28 15:45:34 -07:00
Scott Erickson
f95426dbd9
Fix done button in LevelPlayView in IE9
...
It had no background.
2015-10-28 15:24:08 -07:00
Scott Erickson
a21d85c4ed
Remove some vestigial commented out styling for AuthModal buttons
2015-10-28 14:40:07 -07:00
Scott Erickson
fb51d40cb4
Switch AuthModal buttons to use btn-illustrated classes, for browser compatibility
...
They were white boxes in IE9 with their custom setup.
2015-10-28 14:37:59 -07:00
Scott Erickson
48c10d214d
Make highlight pointer disappear immediately and move off screen when hidden
...
It causes problems in IE10 and lower, because the css property pointer-events
does not work in those browsers. So fixed that by moving the arrow out of the way.
2015-10-28 14:01:37 -07:00
Scott Erickson
52395661f7
Fix SubscribeModal buttons on IE10
2015-10-28 11:48:15 -07:00
Scott Erickson
0228614ef6
Fix login icon placement on IE10
2015-10-28 11:34:00 -07:00
Scott Erickson
31367f39c1
Add class "ie10" to body when using IE10
2015-10-28 11:33:36 -07:00
Imperadeiro98
16e30f5b9a
Update pt-PT.coffee
2015-10-28 17:37:59 +00:00
Nick Winter
448e1c3d9f
Propagated i18n
2015-10-28 09:08:05 -07:00
Imperadeiro98
d2c6540c2d
Merge pull request #3137 from evvanderplas/patch-1
...
Update nl-NL.coffee: typos, grammar
2015-10-28 14:33:09 +00:00
Nick Winter
a970f322f9
Merge pull request #3132 from Imperadeiro98/i18n-updates
...
Updated i18n across some files
2015-10-28 06:41:35 -07:00
Nick Winter
cfd6862222
Merge pull request #3129 from Driphter/master
...
Added non-mutating methods for Vectors in player code
2015-10-28 06:38:07 -07:00
Nick Winter
20f2abfb37
Propagate i18n
2015-10-28 06:26:01 -07:00
Nick Winter
ead9cf11df
Add Estonian locale stub
2015-10-28 06:25:42 -07:00
Rob
da92e15bfb
Give some API properties priority in autocomplete.
2015-10-27 23:23:43 -04:00
Scott Erickson
6e1cb8a1d1
Add owner name to course details page
2015-10-27 17:47:48 -07:00
Scott Erickson
9e04d425cc
Levels link in ControlBarView goes to last visited course instance page for course levels
2015-10-27 17:04:07 -07:00
Imperadeiro98
e1b10183eb
Some cleanups to subscription-view.jade
2015-10-27 21:57:49 +00:00
Scott Erickson
af7bb08dc3
List courses you are in at the top of /courses
2015-10-27 13:58:45 -07:00
Scott Erickson
a5793630c2
Stop showing ChooseHero tab in GameMenu for course and course-ladder levels
2015-10-27 13:21:39 -07:00
Scott Erickson
7641216fd0
Make not supported mobile message on /courses landing page
2015-10-27 12:43:54 -07:00
Scott Erickson
66afb10f91
Fix a useful trailing whitespace that was removed
...
My work machine editor's settings were changed, but not my home editor.
Both have now been fixed. I reviewed the template and this was the only significant
whitespace that was removed, I believe.
2015-10-27 12:29:32 -07:00
Scott Erickson
b736feb017
Refactor ArticleEditView to use view in template
2015-10-27 12:09:36 -07:00
Scott Erickson
2e666073f1
Refactor SubscriptionView to use view in template
2015-10-27 12:07:16 -07:00
evvanderplas
2af15f7667
Update nl-NL.coffee: typos, grammar
...
First obvious typos fixed
2015-10-27 19:12:46 +01:00
Imperadeiro98
a7b35305de
Fixed .spr in cla.jade
2015-10-27 15:07:39 +00:00
Matt Lott
38242eb55e
Add /Careers routing entry
2015-10-26 20:39:40 -07:00
Scott Erickson
0869b11f53
Refactor DeltaView to use view in template
2015-10-26 17:00:52 -07:00
Scott Erickson
c10d11f61b
Refactor DiplomatView to use view in template
2015-10-26 14:46:35 -07:00
Scott Erickson
45044d06a4
Refactor CLAsView to use view in template
2015-10-26 14:35:42 -07:00
Scott Erickson
58eaec8e6b
Refactor MainLadderView to use view in template
2015-10-26 14:23:06 -07:00
Matt Lott
48786372d8
🐛 Prevent parallel managed sub unsubscribes
...
Our unsubscribe API does not support this. Removing option from
subscription UI.
Fixes #2976
2015-10-26 13:45:38 -07:00
Nick Winter
afa410a370
Added Ace of Coders tournament rankings.
2015-10-26 13:30:49 -07:00
Rob Blanckaert
d26daf1dc0
Only show "press enter" for the selected line in autocomplete.
2015-10-26 15:39:22 -04:00
Imperadeiro98
6ee44bd6cc
Fixed i18n in infinite_loop.jade
2015-10-26 12:46:06 +00:00
janjoos
db7add6bc5
Smart update
...
2 codes
2015-10-26 11:54:40 +01:00
Imperadeiro98
169627af82
Added a missing spr in CLA.jade
2015-10-23 20:49:15 +01:00
Scott Erickson
3df4f26293
Remove a test wrench thrown into CommunityView
2015-10-23 10:50:21 -07:00
Scott Erickson
fad9d0a757
Remove auto-reload delay, see if we can do without it now
...
According to a comment now deleted, we had auto reload delay 300ms for race
conditions, mainly onCompile tweaking source map file sourceMappingURL values.
That only happens in production now, though, so let's try removing it for development.
Original comment added: 5104f0a1e7
Michael deleted it :( 6d7864c415
2015-10-23 10:47:01 -07:00
Scott Erickson
921054d53f
Improve brunch re-compile speed by updating bunch libraries
...
Also fixed a couple templates newer brunch complained about.
2015-10-23 10:09:34 -07:00
Imperadeiro98
8a8d8c9d23
Fixed use of i18n in popover
2015-10-23 16:54:42 +01:00
Imperadeiro98
09422910f7
Updated i18n
2015-10-23 16:49:05 +01:00
Scott Erickson
b475815e41
Refactor InvoicesView to use view in template
2015-10-22 15:26:52 -07:00
Scott Erickson
cd065f3ba6
Refactor TeachersFreeTrialView to use view in template
2015-10-22 15:23:04 -07:00
Scott Erickson
9de50ac181
Refactor CLAView to use view in template
2015-10-22 15:16:32 -07:00
Nick Winter
4af6162c5c
Replace simple loop docs with while-true docs in course levels
2015-10-22 10:29:10 -07:00
Scott Erickson
ddf351aac7
Refactor PaymentsView to use view in template
2015-10-21 17:18:38 -07:00
Scott Erickson
680eb04285
Refactor AccountSettingsView to use view in template
2015-10-21 17:18:38 -07:00
Scott Erickson
9a29c26cc8
Refactor HomeView to use view in template
2015-10-21 17:18:38 -07:00
Scott Erickson
94d29d2e8a
Move trailing slash removal to client Router, make client route "/play/" work for facebook
2015-10-21 16:55:48 -07:00
Scott Erickson
57c5384ec1
Refactor editor:save-new-version from a mediator event to a normal Backbone event
...
Part of a push to move away from global subscriptions when 'local' ones will do.
2015-10-21 15:34:07 -07:00
Driphter
73e3afa5f8
Added non-mutating methods for player code
2015-10-21 18:30:10 -04:00
Scott Erickson
6636051765
Refactor HomeView to use new event callback naming guideline
...
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:18:13 -07:00
Scott Erickson
452e6467b4
Refactor PrepaidView to use new event callback naming guideline
...
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:16:44 -07:00
Scott Erickson
cef4fc0794
Refactor AccountSettingsView to use new event callback naming guideline
...
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:02:04 -07:00
Rob
1ff97243ad
Hello, yes this is Rob.
2015-10-21 08:46:12 -07:00
Imperadeiro98
9b06d53856
Fixed previous merge
2015-10-20 18:25:07 +01:00
snarkota
343f6c378c
Update lt.coffee
...
More translation strings
2015-10-20 19:35:45 +03:00
Matt Lott
3ed755076b
Enable while True auto yielding for all level types
2015-10-20 06:42:46 -07:00
Nick Winter
b03091c35d
Merge pull request #3123 from UltCombo/iframe-style
...
Remove iframe borders using CSS instead of DOM
2015-10-20 06:15:54 -07:00
UltCombo
2c97238a7f
Remove iframe borders using CSS instead of DOM
...
This patch makes iframe borders render identically in all supported browsers (i.e. no border).
Although Chrome does not displays borders around iframes by default, Firefox and Edge (IE) had visible iframe borders prior to this patch. This is because, as [previously mentioned](https://github.com/codecombat/codecombat/pull/3122#discussion_r42338590 ), the DOM property was mistyped as `frameborder` when it should be `frameBorder`.
As this is presentational issue, it feels more appropriate to fix it using CSS. Therefore, I've removed the buggy JS code and added a generic CSS solution to reset iframes' border styling.
2015-10-19 22:58:51 -02:00
Matt Lott
cc642e7254
Auto yield while True loops for course levels
2015-10-19 16:46:53 -07:00
Nick Winter
2539814687
Merge pull request #3122 from UltCombo/help-video-fullscreen
...
Allow embedded help videos to go fullscreen
2015-10-19 12:40:28 -07:00
UltCombo
c02b311efa
Allow embedded help videos to go fullscreen
2015-10-19 03:44:19 -02:00
AkaKaras
e1e8dc33d2
zh-hans typos
2015-10-18 21:17:13 -04:00
AkaKaras
11baf3fd61
megre
2015-10-18 21:08:51 -04:00
AkaKaras
1d6d6011d8
zh-HANS and zh-HANT translation
...
both i18n are done, also had fix some typos
2015-10-18 21:05:40 -04:00
Imperadeiro98
1a664b519a
Uncommented strings from last merge
2015-10-18 15:39:03 +01:00
Imperadeiro98
a900cc003f
Merge pull request #3120 from artinhuang/master
...
Update to zh-HANS.coffee
2015-10-18 15:35:16 +01:00
artinhuang
3c7bb3443c
Modify some description,and add the new translations.
2015-10-18 18:39:49 +08:00
Imperadeiro98
13f30ca16a
Uncommented strings from last merge
2015-10-18 11:23:42 +01:00
snarkota
23670b9f25
Update lt.coffee
...
First lines of lithuanian translation
2015-10-17 21:09:50 +03:00
Nick Winter
5f8ab8a212
Added support for test campaigns that don't save their levels/achievements
2015-10-16 16:06:53 -07:00
Sam Soffes
d2052980c4
Send sign out message directly
2015-10-16 15:02:33 -07:00
Nick Winter
d5288a254b
Remove Ace of Coders tournament blurb from home page
2015-10-16 14:55:58 -07:00
Sam Soffes
59f987e105
Check for new iPad User-Agent
2015-10-16 14:42:25 -07:00
Imperadeiro98
3d1e5f1e34
i18n account dropdown 'Prepaid Codes'
2015-10-15 21:41:47 +01:00
RUSLAN LÓPEZ CARRO
bf8da65060
Update es-419.coffee
2015-10-15 12:48:53 -05:00
Imperadeiro98
63d7df538c
Fixed previous merge
2015-10-15 15:21:10 +01:00
Imperadeiro98
f72f786803
Merge pull request #3116 from Fokusnica/master
...
changed and added some ru and uk locales
2015-10-15 15:18:58 +01:00
Derevianko Liubov
58ba08ddb7
changed and added some ru and uk locales
2015-10-15 17:10:12 +03:00
Nick Winter
e15b30893f
Note tournament end, undo tournament simulation bias
2015-10-15 06:32:52 -07:00
Jlit1001
a788533d13
1. simplify regex for email testing
...
2. keep valid emails in text area
2015-10-14 22:29:15 -07:00
Scott Erickson
844bc942b3
Fix #2785
2015-10-14 16:01:09 -07:00
Scott Erickson
cbf6032c68
Merge branch 'origin/spritesheets'
2015-10-14 15:03:34 -07:00
Scott Erickson
1f00f5b4b9
Remove vestigial function argument
2015-10-14 15:00:57 -07:00
Scott Erickson
b77626b8ee
Minor fixes
...
Making sure LayerAdapter doesn't wait for ThangType to load the image more than once.
LayerAdapter skips rendering if there's a prerendered sprite sheet whose image is not loaded.
2015-10-14 14:48:43 -07:00
Scott Erickson
305cffb5ea
Finish hooking up prerendered spritesheets with LayerAdapter
2015-10-14 14:33:26 -07:00
Imperadeiro98
a4d8aec2a7
Added i18n to contributor signup
2015-10-14 21:06:23 +01:00
Scott Erickson
1085731fdd
Fix colorConfig prerendered sprite sheet data, comparison
2015-10-14 10:41:10 -07:00
Scott Erickson
39bddb889e
Have LayerAdapter use prerendered spritesheets (unfinished)
2015-10-13 16:43:56 -07:00
RUSLAN LÓPEZ CARRO
8e9b46b73c
Update es-419.coffee
2015-10-13 18:08:44 -05:00
Nick Winter
74763f0614
Fix experience/gems not showing in HeroVictoryModal
2015-10-13 13:44:25 -07:00
Imperadeiro98
9184566d67
Update pt-PT and standardize new tip
2015-10-13 21:07:21 +01:00
Nick Winter
8209c4a0c7
Propagate i18n
2015-10-13 12:32:51 -07:00
Nick Winter
2336668b09
Actually commit my ru.coffee merge
2015-10-13 12:32:14 -07:00
Scott Erickson
3fc7b71f7a
Remove log
2015-10-13 12:31:28 -07:00
Scott Erickson
74a7b53498
Remove vestigial test code
2015-10-13 12:30:18 -07:00
Nick Winter
537ede7740
Merge pull request #3108 from Imperadeiro98/i18n-and-cleanups
...
Added i18n to some strings
2015-10-13 12:27:58 -07:00
Nick Winter
28530f44e6
Merge ru.coffee and uk.coffee
2015-10-13 12:26:28 -07:00
Nick Winter
ac750456b7
Merge ru.coffee and uk.coffee
2015-10-13 12:25:23 -07:00
Nick Winter
0c7169f5c0
Merge pull request #3088 from javatlacati/patch-1
...
Update level_loading.jade
2015-10-13 12:21:19 -07:00
Nick Winter
7584872c9f
Fix #3106 introduced by b38a6c50
2015-10-13 08:22:13 -07:00
Imperadeiro98
20371fa146
Indentation re-fix
2015-10-13 16:14:43 +01:00
Nick Winter
d776809e1c
Update Hour of Code student flow and tracking, remove signup requirement
2015-10-13 08:12:07 -07:00
Imperadeiro98
2b8856aead
Fixed indentation
2015-10-13 16:08:20 +01:00
Imperadeiro98
fbfb80d4bf
Added i18n to some strings
2015-10-13 16:05:47 +01:00
Imperadeiro98
c969768800
Merge pull request #3104 from tufik000/patch-2
...
Link to Ace of Coders
2015-10-13 14:58:22 +01:00
Matt Lott
eda10a55ec
Update /courses?_ppc= logged out instructions
2015-10-12 21:13:03 -07:00
Scott Erickson
66650452b2
Merge remote-tracking branch 'origin/master'
2015-10-12 16:47:59 -07:00
Scott Erickson
919e0605e9
Add spriteSheets to ThangType, export modal to Thang Editor
...
Units can be exported as rastered sprite sheets. This is the first part of the project,
the second part will be having the game use them.
2015-10-12 16:47:48 -07:00
Scott Erickson
b38a6c5060
Pass all arguments from constructor to initialize in CoreViews, add lodash to default view context
2015-10-12 16:46:30 -07:00
Matt Lott
e1e2be574c
Add teacher HoC instructions to /courses
2015-10-12 16:43:46 -07:00
Matt Lott
2aad347166
Add HoC blurb to top of /teachers pages
...
Replacing courses beta testing blurb.
2015-10-12 16:38:28 -07:00
Matt Lott
708f78153b
Route /hoc to courses
...
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
2015-10-12 16:25:23 -07:00
Imperadeiro98
56c4c5a1b3
Merge pull request #3105 from AkaKaras/translation
...
Translation
2015-10-12 22:37:35 +01:00
AkaKaras
1a3ab303be
zh-hant latest translation
...
finally finished the translation, proud of myself (●—●) b
2015-10-12 16:54:14 -04:00
tufik000
00170d6821
Link to Ace of Coders
...
Changed "torneir" to "torneio" and "Era dos Programadores" to "Ás dos Programadores"
2015-10-11 23:02:20 -03:00
Derevianko Liubov
9312d8ad84
added some ru and uk locales
2015-10-11 23:13:07 +03:00
Derevianko Liubov
82c23183c8
added some ru and uk locales
2015-10-11 23:11:20 +03:00
Imperadeiro98
cac0739084
Merge pull request #3101 from HelloSeaNation/patch-2
...
Fix another typo
2015-10-11 20:01:57 +01:00
AkaKaras
3325b91b5a
Merge remote-tracking branch 'codecombat/master' into translation
...
Conflicts:
app/locale/zh-HANT.coffee
2015-10-11 09:15:45 -04:00
AkaKaras
f6217a5626
zh-hant
...
translation
2015-10-11 09:15:28 -04:00
HelloSeaNation
e75413fbe2
Fix another typo
2015-10-11 00:56:37 +13:00
HelloSeaNation
727dce6f2c
Fix typo
2015-10-11 00:54:59 +13:00
Tery Lim
0b9e78e2b8
Some zh-HANS translations
...
- Translate `prepaid`
- Change `codecombat` => `CodeCombat`
2015-10-10 22:38:21 +13:00
Tery Lim
124b61a70c
Update harry's tips
...
`Yer a Wizard,`
2015-10-10 21:42:02 +13:00
Matt Lott
9ae463ed24
Remove perf killing 'add' event handler from /account/prepaid
2015-10-09 16:03:22 -07:00
Matt Lott
8fce82ce72
Update trial requests approval page query to grab latest
...
Used to be limited to first 2000 requests, which was hit on 10/7/15.
2015-10-09 14:26:04 -07:00
Scott Erickson
2a739ea765
Remove placeholder text in invite email box in course details page
...
Already duplicated it outside of the textbox, so it'd be visible even after an email had been entered. This is just removing the old placement.
2015-10-09 13:45:33 -07:00
Matt Lott
0cb30d9500
Prompt for login in /courses redeem code dialog
2015-10-09 09:32:46 -07:00
Matt Lott
1bd5078ecf
🐛 Sort course details nameless members
2015-10-09 09:27:30 -07:00
Imperadeiro98
a74a09a532
Added change to a string
2015-10-09 16:37:19 +01:00
Imperadeiro98
50961e2c68
Update pt-PT.coffee
2015-10-09 16:31:19 +01:00
Nick Winter
5dde55c1f3
Add premium server recognition for Brazil
2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
dcab1eecc0
Update en.coffee
2015-10-09 09:39:15 -05:00
RUSLAN LÓPEZ CARRO
5ff287a511
Update level_loading.jade
2015-10-09 09:35:30 -05:00
Nick Winter
0d6f84cab6
Merginate uk.coffee
2015-10-09 06:08:36 -07:00
Imperadeiro98
442f9d2265
Merge pull request #3092 from kumabotz/patch-2
...
Translate careers
2015-10-09 12:32:54 +01:00
Imperadeiro98
20cd6643c8
Merge pull request #3091 from kumabotz/patch-1
...
Update to zh-HANS period ( 。)
2015-10-09 12:32:18 +01:00
Derevianko Liubov
cf7952149d
add some uk locales
2015-10-09 11:06:09 +03:00
Jlit1001
e0be8e94ea
1. email validation when subscribing other users
2015-10-08 21:59:12 -07:00
Jlit1001
b9f0aa1622
1. set periodEnd to the next month if subscription cancelled at periodEnd
2015-10-08 19:43:13 -07:00
Nick Winter
a34e4b3afd
Merge pull request #3084 from Imperadeiro98/clean-up
...
Cleaned up a couple of files
2015-10-08 16:25:50 -07:00
Tery Lim
fb29cd1950
Translate careers
2015-10-09 12:03:46 +13:00
Tery Lim
4a26afd9b2
Update to zh-HANS period ( 。)
2015-10-09 11:11:51 +13:00
RUSLAN LÓPEZ CARRO
721b2c024e
Update es-419.coffee
2015-10-08 16:35:21 -05:00
Matt Lott
99c20b88fa
Don't show seat count when enrolling in free courses
2015-10-08 12:27:53 -07:00
Matt Lott
171678caad
Add try out courses blurb to top of /teachers page
2015-10-08 11:51:00 -07:00
RUSLAN LÓPEZ CARRO
853d08b71e
Update es-419.coffee
2015-10-08 11:44:13 -05:00
Matt Lott
9e8294fae8
Comment out courses teacher survey UI
...
The teacher survey infrastructure does not support courses yet.
2015-10-08 09:40:40 -07:00
RUSLAN LÓPEZ CARRO
1f1d74fb3b
Update level_loading.jade
...
How about adding these two quotes? :D
2015-10-08 11:36:19 -05:00
Nick Winter
7e8b6589d5
Update HipChat links
2015-10-08 06:14:36 -07:00
Matt Lott
a6f4085b13
Update course details progress colors
...
Only show not started key when expanded progress.
2015-10-08 06:10:12 -07:00
Matt Lott
3642ebd58c
🐛 Fix course details playtime stats
2015-10-08 06:10:12 -07:00
Matt Lott
1c1a5d4295
/courses student mode when _ppc present
2015-10-08 06:10:12 -07:00
TJ Ledwith
a87ec2bd81
Added a few names.
...
Added a few names.
2015-10-08 07:43:48 -04:00
Matt Lott
a6e3110549
Update course details completed level/concept to light blue
2015-10-07 17:30:16 -07:00
Matt Lott
c3af5324d5
🐛 Fix course details average playtime calc
2015-10-07 17:14:56 -07:00
Matt Lott
2767bbb639
Skip seat count selection for free courses
...
Default to 9999 instead.
2015-10-07 17:08:22 -07:00
Scott Erickson
50f7391e76
Remove programming language and progress class settings
2015-10-07 16:31:19 -07:00
Scott Erickson
76422b3585
Put free teacher evaluation blurb in /courses/enroll on /courses too
2015-10-07 16:23:35 -07:00
Matt Lott
3292f13bc3
Ensure students play course levels in order
2015-10-07 15:33:52 -07:00
Matt Lott
bfacbf8add
Course details page defaults to levels tab for students
2015-10-07 15:18:09 -07:00
Matt Lott
440bf9c6e0
/courses?_ppc=blah logged out message
...
Also trim /courses prepaid code input.
2015-10-07 14:56:10 -07:00
Matt Lott
7390f2d1e4
Separate URLs for /courses/students and /courses/teachers
2015-10-07 14:37:41 -07:00
Nick Winter
d651380040
Fix merge conflicts in es-419
2015-10-07 13:24:19 -07:00
Jhoon Saravia
beb8a425f0
Translated new sections and updated other translations
2015-10-07 10:54:49 -05:00
Scott Erickson
2d2f4814f4
Add course membership required error to LevelLoadingView
2015-10-06 12:48:58 -07:00
Matt Lott
75b9cb50d9
Add /courses prepaid code query var
...
Update invite students link to go to /courses
2015-10-06 12:30:22 -07:00
Matt Lott
9c7345fed0
Redeem course prepaid code on /courses page
...
Completes #54270566052118
2015-10-06 11:20:57 -07:00
Scott Erickson
ee138660da
Tweak level schema to get WebStorm to stop thinking it's bad syntax
2015-10-06 11:06:41 -07:00
Nick Winter
e0918ec631
Added mountain -> glacier completion link
2015-10-05 16:19:43 -07:00
Scott Erickson
3a90356f59
Add class invite system
2015-10-05 16:01:32 -07:00
Scott Erickson
212ee8a65a
Add invite link and capacity info to CourseDetailsView
2015-10-05 16:01:32 -07:00
Nick Winter
d200ac4a32
Fix #2926 : handle missing sub-code/spoken-languages in docs
2015-10-05 15:32:02 -07:00
Imperadeiro98
7949e4fbab
Cleaned up a couple of files
...
Removed some unused strings, an unnecessary style and an event
2015-10-05 22:30:02 +01:00
tieskedh
6a34e5b813
Update nl-NL.coffee
2015-10-04 15:45:31 +02:00
Imperadeiro98
403cfe2f53
Fixed previous merge
2015-10-03 19:58:12 +01:00
Imperadeiro98
43476ed87f
Merge pull request #3082 from etem/master
...
Updated Bulgarian translation
2015-10-03 19:55:59 +01:00
Etem Hyusnev
42056fafdf
Translated action_cooldown
2015-10-03 17:05:05 +03:00
Etem Hyusnev
07a0fbf109
Updated Bulgarian translation
2015-10-03 17:01:22 +03:00
Imperadeiro98
a61655f6b8
Uncommented an header
2015-10-02 20:43:30 +01:00
tieskedh
122c9c2d4f
added some dutch translations
2015-10-02 18:57:53 +02:00
Matt Lott
5095eac4ac
Purchase prepaid on course instance creation
...
Updating purchase prepaid API to support courses.
Refactoring the prepaid server code.
Completes #54270567235517
2015-10-01 15:23:20 -07:00
Nick Winter
079e3a59f5
Update iPad app detection for iOS 9
2015-10-01 09:23:18 -07:00
Imperadeiro98
f3e791bcbd
Update pt-PT.coffee
2015-09-30 20:24:28 +01:00
Imperadeiro98
0a658aa1c0
Merge pull request #3079 from javatlacati/patch-2
...
Update es-419.coffee
2015-09-30 19:41:11 +01:00
Imperadeiro98
3960c0911f
Uncommented an header
2015-09-30 19:40:57 +01:00
RUSLAN LÓPEZ CARRO
2b9dbeafbf
Update es-419.coffee
2015-09-30 12:02:30 -05:00
RUSLAN LÓPEZ CARRO
c466c80bf5
Update es-ES.coffee
...
A translation for Thang has been proposed.
2015-09-30 11:39:20 -05:00
Imperadeiro98
4f5f2c72c7
Uncommented some headers from nl-NL.coffee
2015-09-30 14:59:31 +01:00
Imperadeiro98
5c68bd6a10
Merge pull request #3076 from tieskedh/patch-1
...
Update nl-NL.coffee
2015-09-30 14:54:32 +01:00
RUSLAN LÓPEZ CARRO
0bb6b0d0dc
Update es-419.coffee
...
Finished translation?!!! :D
2015-09-29 18:06:45 -05:00
tieskedh
dfdc601af8
Update nl-NL.coffee
...
added new translations
2015-09-30 00:58:59 +02:00
Imperadeiro98
42f6e5d151
Merge pull request #3075 from javatlacati/patch-3
...
Update fr.coffee
2015-09-29 20:13:36 +01:00
Imperadeiro98
b6753293a5
Uncommented an header from it.coffee
2015-09-29 20:12:22 +01:00
Imperadeiro98
71632554db
Merge pull request #3074 from javatlacati/patch-2
...
Update it.coffee
2015-09-29 20:11:26 +01:00
RUSLAN LÓPEZ CARRO
93106d2f0c
Update fr.coffee
...
Je ne parle pas fraçaise mais...
2015-09-29 13:44:22 -05:00
RUSLAN LÓPEZ CARRO
1ee7989b67
Update it.coffee
2015-09-29 12:40:12 -05:00
RUSLAN LÓPEZ CARRO
f74758ae31
Update es-419.coffee
...
NOTE: review in spanish classes are grupos and lessons are clases. ( false cognate )
Nota: revisar; en inglés las classes significan grupos y las clases significan lessons ( es un cognado falso )
BTW... streamlined means that the groups have a chat and screen streamming with the professor?
2015-09-29 11:01:06 -05:00
RUSLAN LÓPEZ CARRO
5c1c40a83b
Update es-419.coffee
...
ooops forgot to send yesterday :$
2015-09-29 09:35:34 -05:00
Matt Lott
1557b7b442
🐛 Fix jade i18n errors in courses pages
...
Uncaught TypeError: Cannot read property 'i18n' of undefined
2015-09-28 16:13:27 -07:00
Dmitry Suprun
75bc889f5a
update courses section
2015-09-28 22:57:40 +03:00
Imperadeiro98
04a385c555
Uncommented two headers
2015-09-28 19:57:11 +01:00
RUSLAN LÓPEZ CARRO
2c2dd88505
es-419 Updated some courses translation
...
title: "Título" #person title?
2015-09-28 13:24:33 -05:00
Nick Winter
bf8ba8cbe1
Merge pull request #3064 from Driphter/master
...
Fixed level/thang editor table for issue #3052
2015-09-28 06:06:48 -07:00
Imperadeiro98
bae9e85ac2
Update pt-PT.coffee
2015-09-28 13:28:37 +01:00
Nick Winter
5ba607cac7
Fix invalid audio panning values
2015-09-27 20:34:00 -07:00
Nick Winter
88d11afb1d
Propagate i18n
2015-09-27 19:57:57 -07:00
Nick Winter
26d9d20c26
Fix merge conflicts in es-ES.coffee
2015-09-27 19:56:41 -07:00
Nick Winter
4582a4499f
Merge pull request #3059 from Imperadeiro98/master
...
Added i18n to courses
2015-09-27 19:52:52 -07:00
Imperadeiro98
350deee4f8
Uncommented an header from tr.coffee
2015-09-27 19:21:37 +01:00
Imperadeiro98
8ea5de0a88
Merge pull request #3061 from ecemm/patch-1
...
Update tr.coffee
2015-09-27 19:20:12 +01:00
Imperadeiro98
63e13a0222
Merge pull request #3067 from ilo/patch-2
...
Changes for the Clan section
2015-09-27 19:18:03 +01:00
duhow
d94eed98d4
Update es-ES.coffee
...
Added some new translates and changes.
2015-09-27 19:22:01 +02:00
Iñaki López
871a12e4ba
Changes for the Clan section
...
Translated clan section page strings, and fixed a typo.
2015-09-27 23:09:25 +10:00
Iñaki López
040d075cac
Update es-ES.coffee
...
Some visible strings on the UI to a free account.
2015-09-27 20:56:55 +10:00
Driphter
3b0bafd325
Fixed level/thang editor table for issue #3052
2015-09-26 20:07:36 -04:00
Imperadeiro98
ea96ff1383
Merge pull request #3060 from javatlacati/patch-1
...
Update es-419.coffee
2015-09-26 12:59:07 +01:00
Matt Lott
95319ecc3e
Redirect /careers to Lever page
2015-09-25 15:49:00 -07:00
Matt Lott
686d7ac0a8
Fix course schema typo
2015-09-25 15:28:43 -07:00
Matt Lott
5eadd926b3
Move redeem prepaid code UI out of modal
2015-09-25 15:21:51 -07:00
Nick Winter
f9b9ac8f86
Fix error in playing victory sound
2015-09-25 15:19:44 -07:00
ecemm
3a07c6a257
Update tr.coffee
2015-09-26 00:32:57 +03:00
RUSLAN LÓPEZ CARRO
4060a1b029
Update es-419.coffee
2015-09-25 16:32:15 -05:00
Imperadeiro98
4cb885faf3
Small change
2015-09-25 20:54:21 +01:00
Imperadeiro98
446b193f8c
Added i18n to courses
2015-09-25 20:51:51 +01:00
Imperadeiro98
17a24bbcba
Merge pull request #3057 from christotsvetanov/master
...
Bulgarian translation
2015-09-25 19:51:39 +01:00
Matt Lott
928f72e2cf
Merge branch 'prepaid-v2' into master
2015-09-25 10:28:27 -07:00
jpss256
ab97c1d5d4
Bulgarian translation
2015-09-25 19:19:34 +03:00
Matt Lott
18d64e64fb
Merge pull request #3009 from Imperadeiro98/master
...
Use playSound across the code
2015-09-25 06:21:08 -07:00
Imperadeiro98
4f054fa31a
Fixed issue with string interpolation
2015-09-25 14:00:03 +01:00
Imperadeiro98
4cd8d95c72
Removed an unnecessary console log
2015-09-25 13:12:06 +01:00
Matt Lott
71538b0ac9
Remove 'do not localize' comment from courses UI
...
It’s ok to localize / i18n these now.
2015-09-24 17:56:12 -07:00
Matt Lott
feef9c0ac6
🐛 Fix instance selection on /courses page
2015-09-24 17:52:00 -07:00
Matt Lott
d7d6694ee9
Update course level routing
2015-09-24 17:12:18 -07:00
Matt Lott
b4d59ced3e
Update course details progress level cell popups
2015-09-24 14:48:54 -07:00
Matt Lott
238ea49090
Add stats to course details page
2015-09-24 07:28:43 -07:00
Matt Lott
cbaac98556
Course details page no instances selected UI
2015-09-23 16:27:49 -07:00
Imperadeiro98
4cd872091e
Uncommented an header
2015-09-23 20:00:38 +01:00
rohmunhoz
0e149e84e1
Translate and correct
...
Translate some strings and correted the translation of some other ones
2015-09-23 15:49:56 -03:00
Cat Sync
dcfc5726e9
Added Librarian name
2015-09-23 13:56:25 -04:00
Nick Winter
3253ae456e
Fix #3050 : undefined simulation debugging tooltips
2015-09-23 08:24:35 -07:00
Imperadeiro98
0492d455b0
Merge pull request #3041 from tuomastanner/patch-1
...
A few tip translations
2015-09-23 14:08:27 +01:00
Imperadeiro98
1a08730ae7
Uncommented an header
2015-09-23 14:05:09 +01:00
Imperadeiro98
4efd1eeb1a
Merge pull request #3048 from mads232/patch-1
...
Update da.coffee
2015-09-23 14:04:04 +01:00
Nick Winter
3dd36ebe6e
Fixed merge conflicts.
2015-09-22 13:13:12 -07:00
mads232
ca629e383f
Update da.coffee
2015-09-22 17:16:45 +02:00
Nick Winter
144d6cfb32
Further disable social services in ladder
2015-09-21 14:16:23 -07:00
Nick Winter
49279367d1
Fix facebook.coffee linting issue
2015-09-21 14:16:08 -07:00
Imperadeiro98
8cee4d8baf
Update pt-PT.coffee
2015-09-21 21:30:59 +01:00
Imperadeiro98
7b183e3ae5
Removed some old 'changed' from en.coffee
2015-09-21 21:03:55 +01:00
Nick Winter
3ac8a32be8
Propagate i18n
2015-09-21 12:41:16 -07:00
Nick Winter
c2c3ae4c4c
Add /careers and Ace of Coders links to home page
2015-09-21 12:40:33 -07:00
Imperadeiro98
83f6f8f5d4
Uncommented headers from last merge
2015-09-21 16:36:06 +01:00
Imperadeiro98
d0ba986ba4
Merge pull request #3037 from Mephisto07/patch-1
...
Labels translated to portuguese
2015-09-21 16:33:52 +01:00
Imperadeiro98
30c54639a0
Merge pull request #3043 from giaba90/patch-1
...
Update it.coffee
2015-09-19 22:23:36 +01:00
Imperadeiro98
6863e77c42
Merge pull request #3040 from AkaKaras/translation
...
update the tournament translation
2015-09-19 22:20:16 +01:00
giaba90
03da5d06f4
Update it.coffee
...
i have translated some string
2015-09-19 12:01:11 +02:00
Nick Winter
1819911551
A/B/C test the first subscription prompt level
2015-09-18 08:28:04 -07:00
Nick Winter
dc10dc3b61
Add skip button to Bloc offer
2015-09-18 08:27:37 -07:00
Tuomas Tanner
c5ac99f4c9
A few tip translations
2015-09-18 17:16:47 +03:00
Nick Winter
cae95f5952
Tweak /careers copy
2015-09-18 05:31:03 -07:00
AkaKaras
c667ecef7b
eh just find some typos
2015-09-17 21:25:41 -04:00
AkaKaras
cd4230002b
add the new translations
...
add the tournament translation
2015-09-17 21:22:47 -04:00
AkaKaras
f2e1da53ac
Update zh-HANT.coffee
2015-09-17 21:20:07 -04:00
AkaKaras
b271fd60ee
new zh-hans translation
...
add the the tournament translation
2015-09-17 21:18:41 -04:00
Nick Winter
7a56ecfe4d
Disabled auto-submit for Ace of Coders ranking.
2015-09-17 14:42:13 -07:00
Nicolas Segeti
03af6bee8e
Labels translated to portuguese
...
I added some translated texts to the project.
2015-09-17 15:32:58 -03:00
Imperadeiro98
6506b95bad
Merge pull request #3033 from kerradus/ru-translation
...
RU translation
2015-09-16 19:50:22 +01:00
Imperadeiro98
8d4af16e2d
Fixed indentation
2015-09-16 19:43:15 +01:00
Imperadeiro98
979d9d35fc
Merge pull request #3036 from javatlacati/patch-2
...
Update es-419.coffee
2015-09-16 19:41:47 +01:00
RUSLAN LÓPEZ CARRO
e8b137398f
Update es-419.coffee
...
Some word mispell and auto-translated fixing.
2015-09-16 13:31:50 -05:00
RUSLAN LÓPEZ CARRO
810cbb954e
Update es-ES.coffee
2015-09-16 13:11:40 -05:00
Dmitry Suprun
222878454a
add ru translation
2015-09-16 19:27:48 +03:00
Nicholas Winter
5151ab9091
Describe Ace of Coders tournament
2015-09-15 16:36:50 -07:00
Ikuyadeu
d791736420
Update ja.coffee
2015-09-15 15:46:29 +09:00
Matt Lott
3ad13c9a0d
Add /careers page
2015-09-14 17:38:18 -07:00
Imperadeiro98
3268440b9d
Fixed last merge
2015-09-14 12:23:46 +01:00
Liubov Derevianko
f5642f3f08
add ru and uk locales
2015-09-14 11:01:02 +03:00
Imperadeiro98
ee612daaa6
Merge pull request #3025 from javatlacati/patch-1
...
Update es-419.coffee
2015-09-13 21:14:16 +01:00
RUSLAN LÓPEZ CARRO
3ce32837ce
Update es-419.coffee
...
Finished! :D
2015-09-13 12:46:39 -05:00
Ikuyadeu
14f9ac4d71
Update ja.coffee
2015-09-13 17:11:39 +09:00
Matt Lott
b68e5e209b
Update course details page
2015-09-12 22:02:03 -07:00
Imperadeiro98
bdc1dea168
Merge pull request #3019 from javatlacati/patch-1
...
Update es-419.coffee
2015-09-12 21:07:59 +01:00
Imperadeiro98
a52ff3a94c
Merge pull request #3014 from AkaKaras/translation
...
new translation
2015-09-12 20:58:22 +01:00
RUSLAN LÓPEZ CARRO
ecd7c24014
Update es-419.coffee
...
Changed to formal language for teachers survey.
$120 dollars? D: OMG perhaps a little expensive for third worlders like me.
Is it finally done? :D
2015-09-12 13:56:13 -05:00
Nicholas Winter
a4c1a599da
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-09-12 06:54:32 -07:00
Nicholas Winter
3eeb9a6a26
Reset some stuff for Ace of Coders and Robot Ragnarok. Put multiplayer link back now that we have two good mirror match levels and aren't listing the old arenas.
2015-09-12 06:54:14 -07:00
AkaKaras
c04e347543
add new translation
...
same reason as zh-HANS
2015-09-11 18:25:09 -04:00
AkaKaras
672bfa1417
added new translation
...
added new translation that i found from en
2015-09-11 18:23:16 -04:00
Imperadeiro98
31587b9aa7
Uncommented some translations
2015-09-11 19:51:02 +01:00
albenarammou
7be5dd0d14
Update bg.coffee
2015-09-11 19:31:47 +03:00
RUSLAN LÓPEZ CARRO
45cd6f5411
Update es-419.coffee
...
Addeded spanish slang for Thang.
Amigos hispanohablantes, favor de opinar. ( A los mexicanos seguros nos encantará )
2015-09-10 19:15:13 -05:00
Imperadeiro98
bad15ddcdc
Uncommented an header
2015-09-10 22:18:24 +01:00
RUSLAN LÓPEZ CARRO
b819a3f166
Update es-419.coffee
...
Thangs is the slang for Things?
2015-09-10 15:57:45 -05:00
Matt Lott
a2577cc521
Update courses landing page
2015-09-10 10:39:21 -07:00
Imperadeiro98
bd4063ed3a
Use playSound across the code
2015-09-09 22:36:05 +01:00
David Liu
3266bd4621
Fix karma tests
...
* "Shim" StripeCheckout
* Fix loadDependenciesForSession test
* Update karma coverage for better perf
2015-09-09 14:02:03 -07:00
Imperadeiro98
25c693eed4
Update pt-PT.coffee
2015-09-09 21:59:25 +01:00
Matt Lott
9041646ecc
Update teacher copy
2015-09-09 13:20:23 -07:00
Imperadeiro98
d7d7e8db9c
Merge pull request #3008 from cwmaia/master
...
Changes to pt-BR 300-400
2015-09-09 20:04:29 +01:00
Carlos Maia
b1d520ade7
Changes to pt-BR 300-400
...
Minor fixes to lines 300-400
2015-09-09 15:02:25 -03:00
Nick Winter
cc255086f1
Cleaned up a couple things in LayerAdapter.
2015-09-09 08:59:33 -07:00
Imperadeiro98
769a02eeeb
Merge pull request #3004 from kchz/master
...
Update pt-BR.coffee
2015-09-09 09:46:46 +01:00
Gabriel Maus
ad96233d72
Update pt-BR.coffee
...
title changes
2015-09-09 04:27:19 -03:00
Nick Winter
35ef48b108
Mirror ladder levels now copy source code to other side, too, not just transpiled code. Mirror sessions don't submit if there's a user code error.
2015-09-08 16:34:20 -07:00
Nick Winter
0153f8078d
Disabled Io language choice until/unless someone finishes its parser.
2015-09-08 14:50:07 -07:00
Imperadeiro98
99241fc1f5
Merge pull request #3003 from cwmaia/master
...
Changes to pt-BT 100-300
2015-09-08 21:54:21 +01:00
Carlos Maia
b33504b2e7
Changes to pt-BT 100-300
...
Minor changes and fixes.
2015-09-08 17:38:53 -03:00
Nick Winter
b1fd171a27
Opening up the ladder tab view by hiding the FB/G+ ladder column for now. Adding submitted dates to the leaderboards.
2015-09-08 06:44:26 -07:00
Nick Winter
6d5ddb65ea
Not automatically showing melee ranges on action docs.
2015-09-08 06:31:19 -07:00
Imperadeiro98
3473893e8f
Merge pull request #3000 from NicolasHuang/master
...
Just fixed some wrong punctuation
2015-09-08 11:41:43 +01:00
NicolasHuang
ea976751cf
Update zh-HANT.coffee
2015-09-08 13:37:23 +08:00
NicolasHuang
1fae431773
Update zh-HANT.coffee
2015-09-08 10:50:11 +08:00
Nick Winter
0d2d1ddad0
A couple mirror match ladder tweaks. Made programmableMethods other code languages use proper code formatting.
2015-09-07 18:00:48 -07:00
NicolasHuang
bbcab626cc
Update zh-HANT.coffee
2015-09-08 00:26:37 +08:00
Imperadeiro98
0549994693
Uncommented some translations
2015-09-07 14:47:33 +01:00
Imperadeiro98
912647872f
Merge pull request #2997 from albenarammou/patch-1
...
Update bg.coffee
2015-09-07 14:41:59 +01:00
Imperadeiro98
a1b0e78ebd
Merge pull request #2996 from kchz/master
...
Little changes for the pt-BR translation
2015-09-07 11:05:03 +01:00
Gabriel Maus
01f3b6dc84
Update pt-BR.coffee
...
Little changes for the pt-BR translation
2015-09-07 00:29:26 -03:00
albenarammou
010fc1834d
Update bg.coffee
2015-09-06 14:37:39 +03:00
Eero Penttilä
06bbe338bd
fi.coffee few consistency fixes
2015-09-05 15:30:55 +03:00
Eero Penttilä
abbeffbae0
fi.coffee translated: loading error
2015-09-05 15:15:06 +03:00
Eero Penttilä
88ea77e22c
fi.coffee translated: account_invoices
2015-09-05 15:10:25 +03:00
Eero Penttilä
8fcdbebd04
fi.coffee translated: account
2015-09-05 15:05:59 +03:00
Eero Penttilä
65bd6bbdf0
fi.coffee translated: achievements
2015-09-05 14:55:04 +03:00
Nick Winter
3768783ceb
Don't be making LadderSubmissionViews in the CastButtonView unless it's a mirror match.
2015-09-04 18:11:19 -07:00
Nick Winter
a13ccb7360
Fixed DuelStatsView power totals including future units.
2015-09-04 17:21:33 -07:00
Nick Winter
b3496cbf6b
A couple tweaks for the duel stats view.
2015-09-04 17:01:06 -07:00
Nick Winter
73f3e7cdd9
League now preserved throughout ladder navigation flow. Mirror match support for submitting to both sides at once.
2015-09-04 16:21:45 -07:00
AkaKaras
73f83d3096
new translation
...
zh-HANT was helped by @lazydoyP
2015-09-04 11:42:09 -04:00
Nick Winter
d92ca389d6
Switched ladder views to display red/blue team instead of humans/ogres.
2015-09-03 15:46:56 -07:00
Nick Winter
89c644e084
Spectate mode starts paused until loading is done, and starts at time 1, so there is less stuttering during playback.
2015-09-03 15:22:25 -07:00
Nick Winter
98b0bcfc75
Fixed playback victory message for spectate mode. Spectate mode now opens in new tabs.
2015-09-03 15:05:10 -07:00
Nick Winter
df60ecd09c
Added multiplayer win/loss notice at end of level.
2015-09-03 13:32:20 -07:00
Imperadeiro98
454f66e10b
Update pt-PT.coffee
2015-09-03 21:29:48 +01:00
Matt Lott
9131d8668f
Course enroll page
...
Will add a prepaid purchase once the prepaid-v2 branch is merged into
master.
2015-09-03 11:04:52 -07:00
Nick Winter
46ee12ff9d
Updated some timestamps.
2015-09-03 08:33:48 -07:00
Imperadeiro98
84363bc99f
Merge pull request #2992 from Pena86/FIN_translation
...
Merged Fin translations
2015-09-03 16:04:21 +01:00
Imperadeiro98
0b5301d13a
Merge pull request #2991 from cwmaia/master
...
First changes to pt-BR translation
2015-09-03 16:02:19 +01:00
Eero Penttilä
929f529509
Merge remote-tracking branch 'codecombat/master' into FIN_translation
2015-09-03 17:37:11 +03:00
Eero Penttilä
34b69daf1b
Added fix for #2988
2015-09-03 17:36:39 +03:00
Imperadeiro98
4d6c888370
Update pt-PT.coffee
2015-09-03 15:29:51 +01:00
Carlos Maia
a5ebfce022
First changes to pt-BR translation
...
Lines 1-100
2015-09-03 11:28:30 -03:00
Eero Penttilä
91035cf957
fi.coffee translated newly added lines
2015-09-03 17:13:06 +03:00
Eero Penttilä
71b71fa19d
Merge remote-tracking branch 'codecombat/master' into patch-1
...
Conflicts:
app/locale/fi.coffee
2015-09-03 16:42:13 +03:00
Nick Winter
02676dc59f
Fixed #2988 .
2015-09-03 05:10:06 -07:00
Eero Penttilä
d5c46226bb
fi.coffee, Few corrections along the way
2015-09-03 14:54:23 +03:00
Nick Winter
dcfa65213e
Propagated i18n.
2015-09-03 04:47:48 -07:00
Nick Winter
4ad12a139a
Cleaned up an i18n section header typo from #2971 .
2015-09-03 04:45:16 -07:00
Eero Penttilä
bc00d4fc78
fi.coffee translated: keyboard_shortcuts
2015-09-03 14:43:15 +03:00
Nick Winter
fbc70435fb
Merge pull request #2971 from AkaKaras/translation
...
Translation
2015-09-03 04:39:42 -07:00
Eero Penttilä
bbfa9a1c17
fi.coffee translated: account settings
...
Some new, some fixed
2015-09-03 14:31:57 +03:00
Nick Winter
1a6c3ad8c0
Updated level counts in en.coffee.
2015-09-03 04:27:36 -07:00
Eero Penttilä
b5573169b5
fi.coffee translated: contact
2015-09-03 14:10:24 +03:00
Eero Penttilä
4413c0d859
fi.coffee translated: teachers_survey
2015-09-03 13:52:12 +03:00
Eero Penttilä
0f1a854750
fi.coffee translated: teachers
2015-09-03 11:08:45 +03:00
Eero Penttilä
25863b729d
fi.coffee translated: options
...
Some new, some fixes
2015-09-03 09:54:50 +03:00
Nick Winter
e6f61b545e
ControlBarView handling playing non-latest versions of levels.
2015-09-02 14:54:44 -07:00
Imperadeiro98
bb119541da
Merge pull request #2987 from sake12/master
...
pl.coffee - another update
2015-09-02 21:11:43 +01:00
sake12
0b5c3ad3d0
pl.coffee - update
2015-09-02 21:29:24 +02:00
Dmitry Suprun
d85b656b24
add some translation
2015-09-02 19:39:55 +03:00
Eero Penttilä
592bb6b472
fi.coffee translated: choose_hero, skill_docs
...
Some new translations and some fluency modifications.
There is some word placement problems in these sections:
-in lines 495 - 500 the words added between the texts 1,2 and 3 won't fit in Finnish. Could this be replaced with one sentence where the added words would be described like '__nAttackDamage__' etc.?
-in line 510 there is word 'Action' added in front of this word, and I didn't find it in the translation document.
I'll try to make some kind of bug repot of these things also...
2015-09-02 18:58:21 +03:00
Nick Winter
6463b04c5c
Not trying to play a certain sound we don't have yet.
2015-09-02 05:32:45 -07:00
Eero Penttilä
8328a62409
fi.coffee translated: subscribe
2015-09-02 15:12:27 +03:00
Eero Penttilä
f1224c7107
fi.coffee translated: buy_gems
2015-09-02 14:00:10 +03:00
Matt Lott
aa16348ded
Remove target subs line from subs dashboard
2015-08-31 05:46:13 -07:00
Matt Lott
ad079f1ff9
🐛 Fix trial requests approval page width overflow
2015-08-31 05:40:07 -07:00
Eero Penttilä
98273a5520
Some new translations
...
Translated: Clans, user.
and some fixes for fluency
2015-08-31 15:24:30 +03:00
sake12
eb50a2f761
pl.coffee - another update
2015-08-31 12:05:21 +02:00
sake12
b5311c4589
pl.coffee - update
2015-08-30 23:29:22 +02:00
Nick Winter
b383c6ac00
Updated inventory for Ace of Coders.
2015-08-30 07:28:35 -07:00
Nick Winter
635dcf22ae
Fixed typo for Okar session check. Not showing some common sub-skills as skills on hero picker.
2015-08-29 10:01:53 -07:00
Nick Winter
88f6e528b1
Implementing goliath. Configuring goliath for Ace of Coders.
2015-08-29 08:02:20 -07:00
Matt Lott
8de00767b3
Initial courses object model
2015-08-29 07:15:39 -07:00
Imperadeiro98
10e33dab4a
Uncommented an header from ja.coffee
2015-08-29 09:49:23 +01:00
Imperadeiro98
8333e57ce2
Merge pull request #2977 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-08-29 09:48:33 +01:00
Imperadeiro98
11564571d3
Merge pull request #2972 from sodaorange/patch-1
...
Update ja.coffee
2015-08-29 09:47:39 +01:00
Ikuyadeu
5d49e1cb9a
Update ja.coffee
2015-08-29 16:22:41 +09:00
Imperadeiro98
0357a59cb9
Uncommented some headers from nl-BE.coffee
2015-08-28 22:21:54 +01:00
Imperadeiro98
d415ee25cd
Merge pull request #2973 from WardLanssens/patch-1
...
Update nl-BE.coffee
2015-08-28 22:18:18 +01:00
Matt Lott
545567a24b
Courses UI: Add teachers mode button to landing page
2015-08-28 11:33:37 -07:00
Matt Lott
a1927bf8cc
Courses UI: Update tabs on details page
2015-08-28 10:53:24 -07:00
Nick Winter
d412a7d5ee
Fixed blank duel stats bar in single player, oops. Handling getTwoGames from non-logged-in users.
2015-08-28 10:45:07 -07:00
WardLanssens
bfe061dc2b
Update nl-BE.coffee
2015-08-28 10:38:14 +02:00
sodaorange
1aa93fbd8a
Update ja.coffee
2015-08-27 22:20:02 -04:00
Matt Lott
066d6e7fc1
Courses UI: Add FAQ popup to landing page
2015-08-27 16:52:02 -07:00
Matt Lott
a27c17ef0a
Courses UI: Add image to sales blurb and quote
2015-08-27 16:19:37 -07:00
Matt Lott
24fb52a8d9
Update year sub sale copy
2015-08-27 10:54:52 -07:00
Matt Lott
e10c5d9646
Allow year sub purchases on top of monthly subs
...
Monthly sub is cancelled, terminal sub of 1 year + remaining month is
added.
2015-08-27 09:45:10 -07:00
Matt Lott
5faeb82d17
Extend terminal sub with year sub purchase
2015-08-27 09:45:10 -07:00
Imperadeiro98
2ad285093a
Merge pull request #2962 from nantoniazzi/patch-1
...
Update fr.coffee
2015-08-27 11:29:08 +01:00
Imperadeiro98
78b136d69c
Fixed {changed} in english file
2015-08-27 10:41:13 +01:00
Matt Lott
b6ddb41df6
Add sale end date to year sub page
2015-08-26 15:22:56 -07:00
Matt Lott
ea6bc6faf3
Add new heroes to year sub sale page
2015-08-26 14:49:35 -07:00
Matt Lott
66c864bca5
Add feature list to year sub sale landing page
2015-08-26 11:16:25 -07:00
AkaKaras
dafc5fc32f
final check and now zh-HANT is done too
...
finally finished the translation, but there only has one sentence is translated
2015-08-25 22:13:22 -04:00
AkaKaras
f6a1d06c13
done the zh-HANS translation
...
only one sentence is translated, and thanks again for @lazydogP helping the zh-HANS translation
2015-08-25 21:55:36 -04:00
AkaKaras
358db97345
a minor fix
2015-08-25 21:15:19 -04:00
AkaKaras
d530cb5841
a new file
...
replace the dmg
2015-08-25 20:47:54 -04:00
Matt Lott
4392da1c20
Redirect to world selector after year sub purchase
2015-08-25 10:59:06 -07:00
Matt Lott
c601652d0b
Add teacher banner image to year sub sale page
...
Also updating sale copy.
2015-08-25 10:38:12 -07:00
Matt Lott
58ff820d7d
Prompt for login on year subscription sale page
2015-08-25 10:12:11 -07:00
Matt Lott
7d419c1615
Courses UI: add screenshot to landing page course blocks
2015-08-24 06:11:11 -07:00
Matt Lott
f42f34c96f
🐛 Fix subs dashboard 30 day churn
2015-08-23 20:54:39 -07:00
AkaKaras
a28484dba8
something wrong
...
can't delete the zh-HANS, need to upload a new file or replace the whole thing
2015-08-23 19:33:29 -04:00
Matt Lott
b171a55876
Use real cancellations for 1st month on subs dashboard
...
We have the data now, so no need to approximate anymore.
2015-08-23 15:32:44 -07:00
Matt Lott
e8a4fd9336
Courses UI: update purchase/continue flow
...
Don’t show unlock code entry to teachers
Don’t show existing class selection or purchase course to students
Update copy to make it clearer what’s going on
2015-08-23 14:33:07 -07:00
Matt Lott
69f874a31d
Courses UI: Add student option to courses landing page
2015-08-23 13:48:52 -07:00
AkaKaras
74365c873c
another fixing
...
justing find something wording and wrong commit……
2015-08-23 10:47:58 -04:00
AkaKaras
00c0136542
Merge branch 'master' into for-fixing-translation-bug
2015-08-22 18:43:31 -04:00
AkaKaras
ae3fcce0f0
Finished zh-HANS and zh-HANT translation
...
finally i finished it!!!!!!!!
2015-08-22 18:08:27 -04:00
AkaKaras
542f70f7b9
TRANSLATION!!!!
...
that is for morning, gonna work on the rest at afternoon
2015-08-22 12:11:11 -04:00
jpss256
de2a071bcd
minor fix
2015-08-22 12:56:42 +03:00
jpss256
89c9841fbf
Fixes
2015-08-22 12:53:42 +03:00
jpss256
7a9d640f0e
Translation
2015-08-22 12:45:02 +03:00
AkaKaras
f23a39d71b
TRANSLATION!!!
...
gonna finish it in few days
2015-08-21 21:57:53 -04:00
Matt Lott
f966b8a2fc
Courses UI: Add course details condensed progress view
...
Defaulting to condensed view, with checkbox to expand details.
2015-08-21 17:00:44 -07:00
Imperadeiro98
cf720ce270
Fixed 'changed' in english file
2015-08-21 21:42:02 +01:00
Matt Lott
e85d5eac6f
Courses UI: Add student summary stats
2015-08-21 12:37:54 -07:00
Matt Lott
5961f14d2c
Courses UI: Update details page copy
2015-08-21 12:18:05 -07:00
Matt Lott
9e222d0873
Add subscription sale
...
Give a discount for purchasing a year
New sale button on subscribe modal
New subscription sale landing page
2015-08-21 11:19:39 -07:00
nantoniazzi
5e4b968658
Update fr.coffee
2015-08-21 19:35:48 +02:00
Imperadeiro98
a7074b11ca
Merge pull request #2960 from AkaKaras/revert-2950-patch-2
...
Revert "there has a typos at #963 "
2015-08-21 14:32:18 +01:00
Imperadeiro98
a9213f51c5
Merge pull request #2959 from AkaKaras/patch-5
...
fixed few things
2015-08-21 14:31:52 +01:00
AkaKaras
ec73c6852f
Revert "there has a typos at #963 "
2015-08-21 09:27:28 -04:00
AkaKaras
23a1a238b2
fixed few things
...
fixed some wordings and sentences
2015-08-21 09:23:04 -04:00
AkaKaras
85f95212cd
just translate few sentences
...
just translated few sentences
2015-08-21 09:22:04 -04:00
Nick Winter
256b19d331
More improvements and fixes for league ladder pages.
2015-08-21 03:28:25 -07:00
Nick Winter
20c6248dba
Added rough army power indicator to DuelStatsView.
2015-08-20 15:21:05 -07:00
jpss256
2220cbed8e
Fixes
2015-08-21 00:28:11 +03:00
jpss256
14e4f0758a
Another portion of the translation
2015-08-21 00:15:36 +03:00
Imperadeiro98
9cf4c06301
Added menu opening sound to PlayHeroesModal
2015-08-20 20:43:04 +01:00
Imperadeiro98
551b450a68
Merge pull request #2956 from javatlacati/patch-1
...
Update es-419.coffee
2015-08-20 20:28:01 +01:00
Nick Winter
78605ef459
Added DuelStatsView for ladder matches.
2015-08-20 11:57:47 -07:00
RUSLAN LÓPEZ CARRO
4bb7b544bd
Update es-419.coffee
2015-08-20 09:35:14 -05:00
Nick Winter
da0b7d3e64
Merge pull request #2955 from codecombat/leagues
...
Leagues!
2015-08-19 15:34:54 -07:00
Nick Winter
f4d796a717
More ladder page support for leagues. Linking to clan league pages from clans pages.
2015-08-19 15:30:37 -07:00
Nick Winter
11f9238a91
Added Robot Ragnarok limited time challenge.
2015-08-19 12:16:48 -07:00
Nick Winter
3cfabf8122
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-08-19 12:16:23 -07:00
Imperadeiro98
c701976e65
Merge pull request #2951 from teresacream/patch-1
...
Update zh-HANT.coffee
2015-08-19 11:39:38 +01:00
AkaKaras
896f11c621
add few translations
...
just translate few words
2015-08-18 22:03:24 -04:00
Nick Winter
36494acc5a
Merge pull request #2949 from trotod/fix-interface-audio
...
Fix some campaign interface audio
2015-08-18 16:19:38 -07:00
Imperadeiro98
557d4ceb42
Uncommented some headers
2015-08-18 22:38:30 +01:00
RUSLAN LÓPEZ CARRO
4aa0c61a74
Update it.coffee
2015-08-18 16:29:43 -05:00
Imperadeiro98
d5398f1376
Merge pull request #2950 from AkaKaras/patch-2
...
there has a typos at #963
2015-08-18 22:28:43 +01:00
Imperadeiro98
de98d865c2
Uncommented a couple headers
2015-08-18 21:00:58 +01:00
Imperadeiro98
3caec5c36a
Merge pull request #2952 from javatlacati/patch-6
...
Update es-ES.coffee
2015-08-18 20:59:29 +01:00
Nick Winter
e041c288cc
Merge pull request #2948 from Imperadeiro98/master
...
Use playSound in PlayItemsModal.coffee
2015-08-18 12:40:36 -07:00
RUSLAN LÓPEZ CARRO
bec730741c
Update es-ES.coffee
2015-08-18 12:16:04 -05:00
teresacream
1607cbdfeb
Update zh-HANT.coffee
2015-08-18 22:27:20 +08:00
AkaKaras
2fa01b660a
there has a typos at #963
...
the word 吧is misused, should use 把 instead
2015-08-18 10:23:40 -04:00
Imperadeiro98
56291fc417
Use playSound in PlayItemsModal.coffee
2015-08-17 20:34:34 +01:00
David Liu
a242c41557
Play sound on Buy Gems press
...
Partial solution to #2916 .
2015-08-16 18:59:21 -07:00
David Liu
18ac0e06a2
Cut out extra sound on Items/Achievements press
...
Removes event listener on supermodel 'loaded-all' event.
Fixes #2915
2015-08-16 18:59:21 -07:00
jpss256
4120a31890
Translate a part of the Bulgarian file
2015-08-16 11:49:02 +03:00
Nick Winter
32ca453dec
Added /play/ladder/levelID/clan/clanID clan-specific ladder pages.
2015-08-15 06:45:38 -07:00
Nick Winter
bda2483738
Added league-based ladder game simulation.
2015-08-15 05:38:47 -07:00
Ikuyadeu
d5cd08108a
Update ja.coffee
2015-08-15 18:57:20 +09:00
Jhoon Saravia
e036e5a663
Translate all sections but concepts.
2015-08-14 21:00:37 -05:00
Matt Lott
978f0df7d3
🐛 Fix InspectletJS script loading
...
Original embed code was not correct for delayed script loading.
2015-08-14 14:02:19 -07:00
Lai Tuan
5795399aaa
Fixed #2729
2015-08-15 04:04:00 +09:00
Jhoon Saravia
e69bd91afe
Add translations up teacher's section
2015-08-13 23:34:24 -05:00
Nick Winter
f757f220be
Refactored scoring.coffee into separate files per route plus a scoringUtils file, and cleaned up a few of the verbose methods.
2015-08-13 11:17:38 -07:00
Matt Lott
05a9013164
Remove deprecated prepaid schema properties
2015-08-13 11:13:15 -07:00
Nick Winter
621e143544
Fixed bug with game menu not highlighting guide tab.
2015-08-13 11:09:26 -07:00
Matt Lott
4804f3965f
🐛 Fix prepaid schema for redeemers property
2015-08-13 10:57:47 -07:00
Nick Winter
52aa877f46
Cleaned up an old file.
2015-08-13 08:30:18 -07:00
Nick Winter
a52e9a3189
Fixed #2939 .
2015-08-13 05:58:46 -07:00
Jhoon Saravia
182614400a
Add some translations in Spanish
2015-08-12 23:15:03 -05:00
Matt Lott
9c39bf7656
Update prepaids to support multiple redeemers for a single code
...
Will remove deprecated properties after updating production.
2015-08-12 15:51:18 -07:00
Nick Winter
49dc71a157
Added a Bloc coupon code after A Mayhem of Munchkins.
2015-08-12 10:25:56 -07:00
Ikuyadeu
d9cc779261
Update ja.coffee
2015-08-11 20:09:45 +09:00
Imperadeiro98
e205450d79
Fixed some mistakes in last merge
2015-08-11 10:59:05 +01:00
Matheus Marques
cad071f384
Update pt-BR.coffee
2015-08-11 02:05:16 -03:00
Imperadeiro98
bbe6dd7783
Update pt-PT.coffee
2015-08-10 23:11:51 +01:00
Imperadeiro98
e130acb184
Uncommented a translation
2015-08-10 23:08:16 +01:00
Imperadeiro98
0c4cec8a4b
Merge pull request #2928 from fabichoi/master
...
translate some words
2015-08-10 23:07:25 +01:00
Nick Winter
7ee155278d
Not showing the 'Course: ' in course level names to teachers/players in the obvious places.
2015-08-10 12:01:03 -07:00
Nick Winter
303c19a2dd
Pulled in kids coding on homepage image to be visible on screens as small as 1280px wide.
2015-08-10 11:02:19 -07:00
Cat Sync
37fbb07211
Added continue_statements, graphics, and parameters to concepts list
2015-08-10 10:56:21 -04:00
Nick Winter
1d81133f24
Possible solution for #2917 , needs testing. Added crossbow bolts to missile orientation display logic.
2015-08-09 14:10:32 -07:00
unknown
07a4cecaaa
translate some words
2015-08-08 17:57:14 -04:00
Nick Winter
72199c3548
Propagated i18n.
2015-08-08 11:29:48 -07:00
Nick Winter
79ea3258f1
Added GitHub link to community page.
2015-08-08 10:26:13 -07:00
David Liu
817d790fea
Fix poll keys when key is a number
...
jQuery converts data strings into a possible JavaScript value, so keys
like '0' and '1' get converted into numbers, which fails the validation
(it expects a string for a key).
2015-08-08 08:50:18 -07:00
Nick Winter
bb525b0b7f
Flags now animate in using the appear action. (Still need to fix it to make it not 'appear' when it's just a cursor change.)
2015-08-08 08:23:02 -07:00
Nick Winter
e9e2866863
Added custom backgrounds for equip buttons. Shrunk equip text to fit for languages where it was overflowing.
2015-08-08 06:31:53 -07:00
Nick Winter
4d697a43ab
Added kids coding on homepage.
2015-08-08 05:35:08 -07:00
Nick Winter
859627d232
Fixed cliff sprite scaling.
2015-08-07 19:26:47 -07:00
Imperadeiro98
26c634ab24
Merge pull request #2923 from Zacharias030/master
...
Update de-DE.coffee
2015-08-07 20:08:55 +01:00
Matt Lott
ab9e3d39ee
👕 Fix courses view linter warning
...
warn: Linting of app/views/courses/mock1/CoursesView.coffee: warn:
ensure_comprehensions at line 72.
May be a linter bug, have filed an issue here:
https://github.com/clutchski/coffeelint/issues/482
2015-08-07 12:03:09 -07:00
Imperadeiro98
7c92d7cd1c
Update pt-PT.coffee
2015-08-07 19:15:46 +01:00
Matt Lott
985cfa2c56
Courses UI - Update free course button copy
2015-08-07 10:12:11 -07:00
Nick Winter
69e7c68784
Hide Kithgard Mastery from slow/young players, and highlight it once for fast/old players. Fix clan button link.
2015-08-07 07:33:30 -07:00
Zacharias Fisches
e1d6641348
Update de-DE.coffee
...
small german translation fix
2015-08-06 16:15:30 +08:00
Nick Winter
66212b0559
Don't show victory text for hero levels. New Clans button. Floor stretching support for firn cliff.
2015-08-05 16:17:27 -07:00
Matt Lott
697b0e9e42
Courses UI - Clean up details page summary
2015-08-05 10:58:12 -07:00
Matt Lott
579f63c059
Courses UI - Clean up course details page titles
2015-08-05 09:53:54 -07:00
Matt Lott
d47f41548c
Courses UI - Show progress to students by default
2015-08-05 09:44:19 -07:00
Matt Lott
ea90b93bd2
Courses UI - Consolidate class settings into single modal
2015-08-05 09:35:18 -07:00
Matt Lott
c90fcada7d
Update course names
2015-08-04 20:03:30 -07:00
Matt Lott
1b21a677dc
Courses UI - Updating copy on landing page
2015-08-04 20:01:13 -07:00
Nick Winter
ae0dc0eb7c
Merge pull request #2922 from brian-yang/patch-2
...
Added more names for #53
2015-08-04 17:54:16 -07:00
Nick Winter
7ad16683ce
Fixed error for non-course hero victory modals.
2015-08-04 17:41:42 -07:00
Matt Lott
38efeb119c
Courses UI - take class size as buy input instead of bucketizing
2015-08-04 15:33:02 -07:00
Matt Lott
60e21600b8
Course details - use given instance
2015-08-04 15:33:02 -07:00
Matt Lott
55a58ef0b3
Courses UI - update button text based on enrolled or not
2015-08-04 15:33:02 -07:00
Matt Lott
36cc9b5f18
Update courses landing page sales copy
2015-08-04 15:33:02 -07:00
Matt Lott
9547bd1021
Add sales copy to beginning of courses landing page
2015-08-04 15:33:02 -07:00
Brian Yang
56ba5e1a32
Added more names for #53
2015-08-04 18:31:46 -04:00
Nick Winter
3f323d27d0
Removed achievement and rewards from course-type level victory screens. Added victory text, return-to-course-button, and level feedback and reviews to course-type levels.
2015-08-04 11:35:10 -07:00
Matt Lott
4ef6d471ee
Course UI - bold enrolled marker on course tiles
2015-08-04 11:30:06 -07:00
Matt Lott
b53e4707d8
Update course names
...
Trying different formats.
2015-08-04 11:26:18 -07:00
Matt Lott
bfd4b4f0ca
Courses UI - Update landing page flow
...
Simplify initial options, add course instance selection.
2015-08-04 11:21:02 -07:00
Matt Lott
da6cf60381
Target specific levels with InspectletJS
...
Currently targeting cupboards-of-kithgard.
2015-08-03 15:52:52 -07:00
Nick Winter
74b2c5abdb
Propagated i18n.
2015-08-02 14:16:26 -07:00
Nick Winter
8d09357a7a
Fixed #2914 : no disabling spaces for Clojure and other advanced/experimental languages.
2015-08-02 14:12:15 -07:00
Nick Winter
2eb3cfb93a
Added Myanmar language (Burmese) stub.
2015-08-02 07:42:27 -07:00
Matt Lott
0768b533e2
Subs dashboard perf
...
Caching older (at least 16 days) Stripe invoices in analytics
collection, which will be updated once a day via the analytics server
cron job.
2015-07-31 16:19:40 -07:00
gnerkus
835074e5e6
chore (coding tips): Add more quotes for #710
2015-07-31 21:58:10 +01:00
Matt Lott
8fe189f915
Course details page student level progress popups
2015-07-30 16:04:13 -07:00
Matt Lott
59c730ef20
Add aggregate student progress to course details page
2015-07-30 15:30:36 -07:00
Matt Lott
14b4b83148
Move course purchase details off buy button
2015-07-30 13:54:02 -07:00
Matt Lott
c3430ff3e1
Add free teacher trial to course purchase page
2015-07-30 13:54:02 -07:00
Matt Lott
260d062014
🐛 Fix courses jquery css typo
2015-07-30 13:54:02 -07:00
Imperadeiro98
574a264daf
Uncommented some headers from th.coffee
2015-07-30 21:30:59 +01:00
Auratus
1defff99c1
Update th.coffee
2015-07-31 03:17:21 +07:00
Imperadeiro98
36c018ccf9
Uncommented some headers from th.coffee
2015-07-30 19:46:57 +01:00
Auratus
87a838d128
I am native Thai and already translate some of it.
...
I would translate more if I have the time.
BTW, How can I translate "Gems Gained" when it would sound awkward in Thai if it is "5 Gems gained"
and most appropriate translation would be "ได้รับเพชร 5 ชิ้น" - "Gained gem 5 pieces"
2015-07-31 00:55:16 +07:00
Matt Lott
1eb9162463
Add more course info gameplay screenshots
2015-07-29 16:11:06 -07:00
Matt Lott
c5efdb97e1
Course details mock UI edit dialogs
2015-07-29 16:11:06 -07:00
Matt Lott
2baf18ef56
Course mock UI redeem code dialog
2015-07-29 16:11:06 -07:00
Imperadeiro98
78a1e621f1
Merge pull request #2908 from fabichoi/master
...
Translated some words and sentences
2015-07-29 23:08:11 +01:00
Matt Lott
822d25984f
Merge pull request #2910 from trotod/fix-clan-details-style
...
Fix clan details style
2015-07-29 10:22:36 -07:00
Matt Lott
30e8fc2397
Courses: Link to campaigns, add intro course instances
...
Courses will now use campaign levels instead of mock data if available.
At the moment only the first intro course has a campaign specified
(‘intro’).
2015-07-29 09:51:01 -07:00
Matt Lott
48512060d5
🐛 Fix subs dashboard fetch state typos
2015-07-28 15:51:09 -07:00
Michael Revell
4d27c8682c
Add names for issue #52
2015-07-26 19:44:07 -07:00
David Liu
3bf3321411
Fix weird styling on clans details page
...
- add `display: table-cell` on hero portrait cell
- middle align more things
- `Name` should be a table header
2015-07-26 12:39:43 -07:00
Nick Winter
653dc16207
Merge pull request #2909 from gnerkus/add-thang-names
...
chore (names.coffee): Add more Thang names for #53
2015-07-26 08:23:25 -07:00
gnerkus
037760e230
chore (names.coffee): Add more Thang names for #53
2015-07-26 15:07:02 +01:00
Nick Winter
1dd5d5c109
Merge pull request #2906 from spkane/loading_tips
...
Add a tip for the loading screen #710
2015-07-26 04:00:06 -07:00
fabichoi
788156564f
Translated some words and sentences
2015-07-25 23:10:34 -04:00
Sean P. Kane
d5f81b8f51
Move tip into correct language file
2015-07-25 19:29:13 -07:00
Sean P. Kane
6205ff26ae
Add a tip for the loading screen #710
2015-07-25 14:05:32 -07:00
Sean P. Kane
758e40c7f6
Added a few more names for issue #53
2015-07-25 13:46:41 -07:00
Imperadeiro98
3c7b79964f
Merge pull request #2903 from fabichoi/master
...
Translated some words.
2015-07-25 20:21:48 +01:00
Nick Winter
15ecc92abc
Adding 'course' type levels. Removing 'campaign' type levels.
2015-07-24 17:37:42 -07:00
Nick Winter
107f94a08b
Fixed another cause of the bug fixed in 0d99b07b
with modified levels still granting rewards.
2015-07-24 08:56:20 -07:00
unknown
c3d07e950a
modified
2015-07-23 22:43:43 -04:00
Imperadeiro98
aeff90cba9
Re-added a missing string from last merge
2015-07-23 22:20:55 +01:00
dolom
35dcdff3ff
Update it.coffee
2015-07-23 22:30:06 +02:00
Imperadeiro98
3d9c7927ea
Update pt-PT.coffee
2015-07-23 17:37:49 +01:00
Imperadeiro98
015ed33dbe
Updated i18n of delta.jade
2015-07-23 17:35:22 +01:00
Matheus Marques
24d599dcdd
Translated some descriptions
2015-07-23 01:50:13 -03:00
bileuze
c88d8f1666
Update pt-BR.coffee
2015-07-22 14:16:35 -03:00
Imperadeiro98
1b077b2456
Fixed previous merge
2015-07-22 17:59:29 +01:00
Shady Kamal
10afbebe70
Update he.coffee
...
+I'm back
+add tips translation
+add partial "clans" new feature localization (see notes in code)
2015-07-22 17:21:28 +03:00
Cat Sync
11aeb05e66
Limit to showing 6 concepts. For now, show the last 6 in the array.
2015-07-21 13:28:13 -04:00
Imperadeiro98
b6cbf84f48
Some fixes to last merge
2015-07-20 16:53:28 +01:00
Imperadeiro98
3d105f51ce
Merge pull request #2892 from Abdel-Malik13/patch-2
...
Traduction de l'anglais vers l'arabe
2015-07-20 16:51:29 +01:00
Imperadeiro98
08409f3a3b
Merge pull request #2896 from itcbx/master
...
i18n for zh-HANS
2015-07-20 11:37:19 +01:00
Imperadeiro98
8b31415c9b
Merge pull request #2894 from sake12/master
...
Updated polish translation
2015-07-19 19:53:49 +01:00
Imperadeiro98
1961d786cc
Fixed last merge
2015-07-19 19:50:24 +01:00
Imperadeiro98
41a00d0090
Merge pull request #2893 from Abdel-Malik13/patch-1
...
Traduction d'une ligne non traduite.
2015-07-19 19:48:43 +01:00
itcbx
478efd82d7
I18n for zh-HANS
...
I18n for zh-HANS
2015-07-19 23:44:36 +08:00
itcbx
eea2f511ba
i18n for zh-HANS
...
i18n for zh-HANS
2015-07-19 09:54:21 +08:00
Christelle
0e8c578562
Update fr.coffee
2015-07-18 05:11:03 -04:00
sake12
6c66c782e4
pl.coffee: Translation update
2015-07-18 00:27:22 +02:00
sake12
6e6fda889f
Updated polish translation
2015-07-16 01:40:12 +02:00
Abdel-Malik
f5ec107fb0
Traduction de l'anglais vers l'arabe 0.5
...
Traduction supplémentaire, il reste quelques erreurs de traduction, je les modifierai plus tard si personne ne le fait :)
2015-07-15 12:43:28 +02:00
Abdel-Malik
5e5d4d6445
Traduction de l'anglais vers l'arabe 0.4
2015-07-15 12:26:06 +02:00
Abdel-Malik
901c1e4c56
Traduction de l'anglais vers l'arabe 0.3
...
Ajout de traducton
2015-07-15 11:58:53 +02:00
Abdel-Malik
b177f63b4e
Traduction de l'anglais vers l'arabe 0.2
2015-07-15 11:43:34 +02:00
Abdel-Malik
69d21e279e
Traduction de l'anglais vers l'arabe
...
Si il y a des problèmes au niveau de la traduction, n'hésitez pas à modifier :)
2015-07-15 11:33:48 +02:00
Abdel-Malik
50e4eb5769
Update fr.coffee
2015-07-15 11:23:14 +02:00
Matt Lott
e70b8b8652
Add sorting to course details mock UI
2015-07-10 17:11:16 -07:00
Matt Lott
49a75d2d42
Update course info mock UI
2015-07-10 17:11:16 -07:00
Nick Winter
899aae5798
Consolidated extra resources.
2015-07-10 14:20:25 -07:00
Nick Winter
bcbffd1f65
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-07-10 12:54:25 -07:00
Nick Winter
929455b234
Fixed bug with heroes not loading the proper amount of gems.
2015-07-10 11:13:31 -07:00
Matt Lott
0b714e98d1
Update course info mock UI
2015-07-10 11:04:52 -07:00
Matt Lott
57f869379d
Add student view to course details mock UI
2015-07-10 10:37:41 -07:00
Nick Winter
7173fd367f
Re-enabled gutter highlights for executing code.
2015-07-10 09:39:08 -07:00
Matt Lott
0a2248393d
Update course details mock UI
...
Add student concepts progress.
Add level status and concepts covered.
Add mostly working level Play button.
2015-07-09 17:53:35 -07:00
Nick Winter
36d3b8e910
Highlighting entry points is working pretty well, at least in Python through the forest.
2015-07-09 15:05:35 -07:00
Nick Winter
4f443efd8b
First draft of logic to work out where the code entry points should be.
2015-07-09 12:47:07 -07:00
Nick Winter
dfa0de7521
Bad testing version of code entry point arrow numbering.
2015-07-09 11:45:11 -07:00
Matt Lott
6831355649
🐛 Fix subs dashboard monthly churn and perf
...
Use Stripe events API to calculate monthly churn.
Move Stripe API page handling to the client.
2015-07-08 17:34:34 -07:00
Imperadeiro98
a8e59c5302
Updated 'Generate Terrain' strings
2015-07-08 23:20:32 +01:00
Imperadeiro98
ad25f66db0
Update pt-PT.coffee
2015-07-08 22:22:56 +01:00
Nick Winter
be19edb7a1
Merge pull request #2881 from Vikasgupta09/master
...
fix #2867 added i18n to some words of lvl save form
2015-07-07 16:09:53 -07:00
Nick Winter
16407a8ca0
Merged fr.coffee.
2015-07-07 16:07:42 -07:00
Nick Winter
45c249ac27
Not asking for resubscription in buy gems modal if already subscribed.
2015-07-07 11:50:55 -07:00
Nick Winter
51c08eff3b
Propagated i18n.
2015-07-07 11:45:41 -07:00
Nick Winter
07f81755b0
Added deprecation message to old arenas, highlighting new hero arenas instead.
2015-07-07 11:43:38 -07:00
Julien Reichardt
9748c80cae
Translation of "concepts" section
2015-07-06 23:57:19 +00:00
Cat Sync
5ab7fd7840
Added 'arguments' to the concepts list, and renamed while loops to just 'Loops', for now
2015-07-06 15:46:18 -04:00
Matt Lott
0c427ff440
Update teachers and sales copy with latest level and hour counts
2015-07-03 13:07:25 -07:00
Matt Lott
8d258c6943
Update private clans preview image and copy
2015-07-02 18:44:13 -07:00
Matt Lott
6a53237e65
Add member sorting to premium clan dashboard
2015-07-02 15:17:34 -07:00
Imperadeiro98
8a4645ebc6
Updated i18n of 'Status' in clan-details.jade
2015-07-02 21:50:28 +01:00
Matt Lott
a316924576
Add member concept maps to private clans
2015-07-02 13:23:26 -07:00
Matt Lott
a62e0a8fe6
👕 Fix linter warning in mock course details view
...
warn: Linting of app/views/courses/mock1/CourseDetailsView.coffee:
warn: ensure_comprehensions at line 50.
2015-07-02 10:54:22 -07:00
Imperadeiro98
ede3b35368
Fixes to previous merge
2015-07-02 12:47:20 +01:00
Imperadeiro98
74cdc1c3ea
Merge pull request #2882 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-07-02 12:46:17 +01:00
Imperadeiro98
41f2eacff9
Some fixes to previous merge
2015-07-02 12:44:30 +01:00
Ikuyadeu
8a9ea09eca
Update ja.coffee
2015-07-02 19:20:25 +09:00
Vikas Gupta
4776ff8325
fix #2867 added i18n to some words of lvl save form
2015-07-02 11:40:37 +05:30
Federico Tomas
7e0c5490e0
Update es-419.coffee
...
up guys!.
2015-07-01 23:06:20 -03:00
Matt Lott
af612afcdd
Mock course UI show last expanded complete level
2015-07-01 15:36:33 -07:00
Matt Lott
bee5d53457
Fix clan details html indentation
...
And reorder progress key.
2015-07-01 15:16:21 -07:00
Matt Lott
254d6a9d6b
Add course mock UI for student level progress
2015-07-01 15:16:20 -07:00
tahmidshahriar
62b050f6d8
Merge remote-tracking branch 'upstream/master'
2015-07-01 10:54:37 -07:00
tahmidshahriar
f6dd3ce0c8
minimize changes
2015-07-01 10:22:25 -07:00
tahmidshahriar
60e27d386f
add close buttonn to payment methods
2015-07-01 10:20:14 -07:00
Nick Winter
1c5f176c3c
Added recursion to concepts list.
2015-06-30 20:52:10 -07:00
Matt Lott
71fd13276f
Update mock course details page
...
Add individual course session selection, call them classes.
Edit buttons for class name and description.
Rearrange layout.
Update course concept lists to use real values.
Also add class name field to course enrollment page.
2015-06-30 16:53:37 -07:00
Imperadeiro98
90e02cba48
Updated i18n
2015-06-30 20:33:05 +01:00
Imperadeiro98
0ef6dfcc30
Updated i18n in add-thangs-view.jade
2015-06-30 20:33:03 +01:00
Imperadeiro98
92052ceb5b
Update pt-PT.coffee
2015-06-30 19:59:50 +01:00
Nick Winter
4742b23854
Propagated i18n.
2015-06-30 11:29:18 -07:00
Nick Winter
b0c7b50761
Added programming concept tags to campaign and level editor.
2015-06-30 11:27:58 -07:00
Nick Winter
8df32b47d0
Some tweaks to #2876 .
2015-06-30 10:31:52 -07:00
Nick Winter
1d6f777b58
Merge pull request #2876 from tahmidshahriar/master
...
Fixed email requirement
2015-06-30 10:13:50 -07:00
tahmidshahriar
259c91b62d
fix unneeded changes
2015-06-30 09:37:39 -07:00
tahmidshahriar
56b81f175e
Fix email
2015-06-30 09:35:45 -07:00
Nick Winter
8155d6fba0
Merge pull request #2873 from UltCombo/gh-2740
...
updateLevelRequiredItems: special-case rings, fixes #2740
2015-06-29 19:46:55 -07:00
Nick Winter
be2f47c79a
Merge pull request #2857 from laituan245/for2806_teacher_survey
...
Fixes #2806 (radio buttons of teacher survey page)
2015-06-29 19:37:06 -07:00
UltCombo
7d7d2d5f0e
updateLevelRequiredItems: special-case rings, fixes #2740
...
Rings often have unique effects instead of progressively enhancing another ring's effect, hence let's make rings required even if there's already non-restricted rings equipped.
If, by any chance, there's ever a new ring which enhances the effect of a ring which is required for some level, then it should be easy enough to whitelist it in the given ring slot's allowed items array.
2015-06-29 21:25:43 -03:00
Imperadeiro98
e1e1328906
Updated i18n in account-settings-root-view.jade
2015-06-29 20:26:45 +01:00
Matt Lott
e36cf0ca3f
Initial courses mock UI
...
Do not localize these files.
This is under construction.
2015-06-29 12:15:10 -07:00
Imperadeiro98
e932d27242
Merge pull request #2871 from SuperPranx/patch-1
...
Added new translations and modified existing ones
2015-06-29 20:05:49 +01:00
Matt Lott
8c6fd49f43
Clans view class name typo
2015-06-29 11:51:38 -07:00
Nick Winter
11d69880f7
Merge pull request #2868 from UltCombo/required-rings
...
Improved `updateLevelRequiredItems` logic regarding rings, fixes #2740
2015-06-29 11:19:04 -07:00
Nick Winter
ba3a1dd3df
Merge pull request #2869 from UltCombo/2828
...
fix #2828
2015-06-29 11:14:09 -07:00
Nick Winter
39f8a8a8af
Fixed #2870 .
2015-06-29 11:13:15 -07:00
Nick Winter
d7f88c3d95
Merge pull request #2856 from laituan245/for2854
...
Fixes #2854
2015-06-29 11:03:47 -07:00
tahmidshahriar
4d8c539b2c
Merge remote-tracking branch 'upstream/master'
2015-06-29 09:51:26 -07:00
Ivan Milanov
c7dc30ea64
Added new translations and modified existing ones
2015-06-29 17:23:13 +02:00
Imperadeiro98
d4f1fcaaed
Added i18n
2015-06-28 11:43:56 +01:00
Imperadeiro98
f4e54d4f54
Updated i18n in add system
2015-06-28 11:43:53 +01:00
UltCombo
cc8b8fa8be
fix #2828
2015-06-28 00:32:08 -03:00
UltCombo
63299c4d80
Improved updateLevelRequiredItems
logic regarding rings, fixes #2740
...
This fixes the main issue of #2740 , allowing the player to play the level if the required ring is equipped on either ring slot.
There's still a small problem: if the player already had a ring equipped in the `right-ring` slot, the Ring of flowers will not display as required due to this [line](0df6da7efa/app/views/play/menu/InventoryModal.coffee (L436)
). This seems to be a different issue though, probably related to the `unequipLevelRestrictedItems` logic.
2015-06-27 22:22:37 -03:00
Imperadeiro98
5eed3361f3
Updated i18n
2015-06-27 12:40:48 +01:00
Imperadeiro98
737dd56754
Updated i18n in save-version-modal.jade
2015-06-27 12:40:41 +01:00
Imperadeiro98
d868894845
Updated i18n in play-account-modal.jade
2015-06-27 12:39:42 +01:00
Nikita Gryzlov
2d7e9e88f9
Update ru.coffee. Sync type_in_email
...
Sync type_in_email
2015-06-25 23:31:33 +03:00
Lai Tuan
1453c132fe
Fixes #2806
2015-06-25 23:58:12 +09:00
Lai Tuan
29d19ffc37
Fixes #2854
2015-06-25 23:30:13 +09:00
tahmidshahriar
4ac7408166
Fix small change in not-found to keep change to minimum
2015-06-24 14:53:52 -07:00
tahmidshahriar
e287e515f1
Fix small change in not-found to keep change to minimum
2015-06-24 14:51:07 -07:00
tahmidshahriar
f6a35f1fd4
Fixed not found page (got rid of NotFoundView in core)
2015-06-24 14:49:26 -07:00
tahmidshahriar
6ac3ea9f5f
Fixed not found page
2015-06-24 14:46:59 -07:00
Nick Winter
270340a79f
Removed Learnable.
2015-06-24 09:18:13 -07:00
Nikita Gryzlov
8c5b67d826
Update en.coffee. {change} added.
2015-06-23 10:59:14 +03:00
Imperadeiro98
a9eeb7723b
Update pt-PT.coffee
2015-06-22 20:46:53 +01:00
Nick Winter
aa1150768f
Propagated i18n.
2015-06-22 11:59:28 -07:00
Imperadeiro98
80bb030951
Removed unnecessary i18n
2015-06-22 19:18:47 +01:00
Imperadeiro98
cbf65ff352
Removed unnecessary i18n from about page
2015-06-22 19:18:18 +01:00
nixel2007
8f3efeb97c
Update ru.coffee. teachers_survey
2015-06-22 20:00:42 +03:00
nixel2007
a3781d887a
Update ru.coffee
...
Misc.
2015-06-22 17:56:12 +03:00
NoYzE1
7fcfce5b33
Update de-DE.coffee
...
Beim Dialog Abonnieren steht "$9.99/Monate". Es sollte aber "$9.99/Monat" heißen. Dev-tools sagen, dass der Text von subscribe.month stammt, wo "Monate" steht.
2015-06-20 20:59:43 +02:00
Lai Tuan
7c680e4efa
Removed 'this' and 'tempThis'
2015-06-21 02:09:44 +09:00
Lai Tuan
39fc882303
Require user password for deleting accounts #2842
2015-06-20 23:12:26 +09:00
Matt Lott
d632119a6c
Add 6 month graph to admin dashboard
2015-06-19 13:49:19 -07:00
David Liu
1716359fdf
Limit multiplayer leaderboard name width even more
...
adjusted max-width to 100px, fixes #2373
2015-06-19 07:35:35 -07:00
Nick Winter
8ef4a9ddde
Merge pull request #2830 from arthurnn/master
...
i18N press enter on spell view
2015-06-18 18:37:24 -07:00
Nick Winter
339aaa0aee
Uncommented all translations for #2840 .
2015-06-18 18:35:26 -07:00
Nick Winter
b220849190
Merge pull request #2840 from flowabuse/patch-2
...
Update ro.coffee
2015-06-18 18:28:12 -07:00
Matt Lott
b9622d54a3
Merge pull request #2835 from Mihbo/patch-3
...
Update names.coffee
2015-06-18 18:05:35 -07:00
Matt Lott
b12b7e8ca4
Add user deletion date
...
Fixes #2734
2015-06-18 15:17:56 -07:00
flowabuse
5facc41f82
Update ro.coffee
...
Forgot a " on line 10.
2015-06-18 18:38:31 +03:00
Nick Winter
6a4efa9a21
Switching to Boom and Bust as first level of the forest.
2015-06-17 18:17:14 -07:00
Matt Lott
5fb8b18a31
🐛 Fix managed subs next payment UI
2015-06-17 16:35:30 -07:00
flowabuse
1b1482f118
Update ro.coffee
...
It had to be done! Sorry it took so long... Life happend...
2015-06-17 03:27:34 +03:00
Nick Winter
593f7a9dd7
Some improvements for handling new art.
2015-06-16 13:50:33 -07:00
Imperadeiro98
a8c06652ec
Merge pull request #2839 from Mihbo/patch-4
...
Update uk.coffee
2015-06-16 10:01:50 +01:00
Mihbo
ce73d87f92
Update uk.coffee
...
some more strings translated
2015-06-16 10:27:32 +03:00
Ikuyadeu
e8a862b2ce
Update ja.coffee
2015-06-16 11:05:18 +09:00
Matt Lott
8df49b036b
Merge pull request #2831 from trotod/fix-achievement-dates
...
Show correct achievement earned dates on user page - fixes #2524
2015-06-15 13:21:23 -07:00
Matt Lott
535ca8d2ac
Merge pull request #2834 from laituan245/master
...
Add Contact section to About page #2822
2015-06-15 11:11:58 -07:00
Mihbo
50bcbd97be
Update names.coffee
...
added some more names
2015-06-15 16:57:31 +03:00
Imperadeiro98
c35c9eadf1
Merge pull request #2833 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-06-15 11:30:57 +01:00
Lai Tuan
aabae7082e
Add Contact section to About page #2822
2015-06-15 19:11:48 +09:00
Ikuyadeu
fa8d317745
Update ja.coffee
2015-06-15 18:48:04 +09:00
Mihbo
fd5a99b9d0
Update uk.coffee
...
translated some more strings
2015-06-15 10:02:24 +03:00
David Liu
1c633a8ee4
Show correct achievement earned dates on user page
...
fixes #2524
2015-06-14 15:40:14 -07:00
Arthur Neves
6cb673e228
i18N press enter on spell view
2015-06-14 23:20:49 +02:00
Nick Winter
7d637a0a27
Added a couple levels' next-campaign links.
2015-06-14 11:07:21 -07:00
Nick Winter
b1680f500b
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-06-14 11:06:48 -07:00
Nick Winter
ac2039c81a
Merged fr.coffee.
2015-06-14 11:06:15 -07:00
Ikuyadeu
3f3f44038e
Update ja.coffee
2015-06-14 17:11:26 +09:00
Kevin Avignon
e263866a3a
Made some update within the spanish file
2015-06-13 23:33:48 -04:00
Kevin Avignon
c806b8865e
Made some changes into the french file
2015-06-13 11:39:25 -04:00
Imperadeiro98
2f9e9b1b67
Merge pull request #2818 from Zleep-Dogg/da-translation
...
A bit of Danish translation pt. 2
2015-06-11 11:24:26 +01:00
Esben Madsen
db25007765
A bit of Danish translation pt. 2
2015-06-11 00:35:56 +02:00
Nick Winter
a85d52ebe2
Made a tabbed interface for Programmaticon V's Vector and standard library documentation.
2015-06-10 15:18:37 -07:00
Esben Madsen
8293c717a1
A bit of Danish translation
2015-06-10 01:05:12 +02:00
Imperadeiro98
1383d4c9b7
Merge pull request #2813 from Danylo-Dubinin/patch-3
...
translate few strings
2015-06-09 19:44:56 +01:00
Nick Winter
bb417e9a97
Tweaked glacier terrain generation to work similarly to dungeon (still needs flare) for #2812 .
2015-06-09 11:23:05 -07:00
Danylo Dubinin
c0f05e7c86
translate few strings
2015-06-09 18:42:20 +03:00
nemoyatpeace
e0e62271b4
Added Ice Level to terrain generator
2015-06-09 18:30:40 +08:00
Imperadeiro98
66c126a8df
Update pt-PT.coffee
2015-06-08 23:39:34 +01:00
Imperadeiro98
c1d8022f35
Merge pull request #2811 from Danylo-Dubinin/patch-2
...
Improve translation, add infinite loop
2015-06-08 22:35:17 +01:00
Nick Winter
4e08d453b7
Added some code for the glacier world.
2015-06-08 13:20:54 -07:00
Danylo Dubinin
fe8c680fb1
Improve translation, add infinite loop
...
Better translation of "comment out" phrase and correct translation of "rewind and fast-forward".
2015-06-08 21:45:51 +03:00
Imperadeiro98
fa273d7535
Update pt-PT.coffee
2015-06-08 18:19:27 +01:00
Matt Lott
021ff541e4
Add separate school field for teacher survey
2015-06-08 06:39:30 -07:00
Imperadeiro98
a9f8a7b1be
Fixed some typos
2015-06-08 14:32:55 +01:00
Matt Lott
78004a0a94
Trial requests localization typo
...
Adding missing period at end of approved sentence.
2015-06-08 06:27:40 -07:00
Matt Lott
9b37c9f18a
🐛 Fix trial request onclick
2015-06-08 06:27:40 -07:00
Imperadeiro98
198806bfc9
Removed hard-coded strings...
...
... from teachers-free-trial.jade
2015-06-08 14:16:24 +01:00
Imperadeiro98
6960358850
Update pt-PT.coffee
2015-06-07 22:58:54 +01:00
Imperadeiro98
b9b36d5fea
Update en.coffee
2015-06-07 22:54:39 +01:00
Nikita Gryzlov
730a0f5e36
Propageted i18n
2015-06-07 23:09:03 +03:00
Danylo Dubinin
dd5ac2eda6
'viking' translation, 'fight' mistake fix
...
Правильніше "У бій!" за правилами вживання прийменників у/в.
2015-06-07 19:21:15 +03:00
Nick Winter
0d99b07bc3
Made it so that high scores and level victories are not achieved when playing changed levels from inside the level editor. Some additions for Nalfar.
2015-06-05 17:02:37 -07:00
Imperadeiro98
3f23598c60
Update teacher trial copy
2015-06-05 23:44:31 +01:00
Matt Lott
12b28234a7
Update teacher trial copy
2015-06-05 15:18:47 -07:00
Nick Winter
ccd96122e1
Tweaked Nalfar's hero modal positioning.
2015-06-05 15:13:22 -07:00
Imperadeiro98
7b92bf8c84
Updated i18n in en.coffee
2015-06-05 20:49:08 +01:00
Imperadeiro98
df9a115eb0
Added i18n to teachers-free-trial.jade
2015-06-05 20:49:03 +01:00
Imperadeiro98
10937bfaf8
Minor changes to teachers.jade
2015-06-05 20:46:32 +01:00
Matt Lott
02095a8ddd
Update teacher survey email validation
...
Removing restrictive regex matching.
2015-06-05 11:47:12 -07:00
Imperadeiro98
b0c6b50062
Indentation fixes to last merge
2015-06-05 15:03:05 +01:00
Imperadeiro98
445a3f736e
Merge pull request #2805 from lucasangelon/master
...
Updated pt-BR.coffee
2015-06-05 15:00:21 +01:00
Matt Lott
d7cddcb136
Teacher trial subscription form
...
Add a teacher survey form for applying for a free trial subscription
for evaluation purposes.
Add an admin trial requests review page, where admins can approve/deny
requests.
2015-06-05 06:48:19 -07:00
Matt Lott
d0f9456024
Admin dashboard width 100%
2015-06-05 06:48:19 -07:00
LucasAngelon
920aed7910
Updated pt-BR.coffee
...
Uncommented the remaining translations =].
2015-06-05 12:19:27 +08:00
LucasAngelon
7940857dc6
Updated pt-BR.coffee
...
Translated a few things on the file~
I saw the clans and account_invoices section titles commented out and
was unsure about what to do with them. Translated the items related to
them but left them commented out.
2015-06-04 23:39:04 +08:00
Imperadeiro98
b1e1a1d13c
Some fixes to last merge
2015-06-03 19:56:26 +01:00
Imperadeiro98
b6bcc41a31
Merge pull request #2804 from Kavignon/Translator
...
Updated the french file
2015-06-03 19:52:52 +01:00
Kevin Avignon
2d20ae987a
Commited changes in the fr coffee script file
2015-06-03 14:48:01 -04:00
Imperadeiro98
0e7314cf4e
Merge pull request #2799 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-06-02 20:14:38 +01:00
Matt Lott
ad1cf1cd15
Update /teachers copy
2015-06-02 07:25:55 -07:00
Matt Lott
54623f5e30
🐛 Fix admin dashboard target line
2015-06-02 07:06:31 -07:00
Ikuyadeu
336cdc2c7a
Update ja.coffee
2015-06-02 17:50:39 +09:00
Imperadeiro98
273b3156e0
Merge pull request #2797 from nixel2007/master
...
Propaganation + ru.coffee
2015-06-01 22:42:41 +01:00
Cat Sync
a3588b2801
Yellow arrow shouldn't point to disabled levels
2015-06-01 17:39:55 -04:00
Nikita Gryzlov
f590333d77
Update ru.coffee
...
tip_scrub_shortcut
2015-05-31 13:45:24 +03:00
Nikita Gryzlov
43e514950e
Propagated i18n
2015-05-31 13:44:43 +03:00
Nikita Gryzlov
8d25d2cba2
Update en.coffee
...
Add {change} to last commit
2015-05-31 13:43:25 +03:00
Max Lyashuk
05c1ecd13d
Translate some new strings in uk.coffee
2015-05-30 22:04:28 +03:00
Imperadeiro98
aea4ac9d19
Merge pull request #2794 from aliceinwire/patch-2
...
Update ja.coffee
2015-05-29 14:52:52 +01:00
Imperadeiro98
bc29f7303b
Fixed sv.coffee
2015-05-29 14:48:19 +01:00
Alice Ferrazzi
179af18478
Update ja.coffee
2015-05-29 16:39:31 +09:00
Imperadeiro98
5a272f8bed
Fixed last merge
2015-05-28 21:54:27 +01:00
Imperadeiro98
b9de6dbc9d
Merge pull request #2792 from Lego3/swedish_updates_3
...
Fixes and additions to the Swedish localization
2015-05-28 21:49:24 +01:00
Edvin Linge
ef5bd0368a
Fixes and additions to the Swedish localization
2015-05-28 22:03:29 +02:00
Marco Fras
02c9080838
Translated "contribute" page
2015-05-28 21:55:15 +02:00
Alice Ferrazzi
c8f5871b90
Update ja.coffee
2015-05-28 13:01:43 +09:00
rohmunhoz
332cf728d1
Update pt-BR.coffee
...
Translated many strings
2015-05-27 16:21:46 -03:00
Imperadeiro98
f2fb8610b7
Uncommented headers
2015-05-27 17:23:29 +01:00
Imperadeiro98
35efc6c640
Merge pull request #2787 from KisgadoB/patch-3
...
Update hu.coffee
2015-05-27 17:22:07 +01:00
Imperadeiro98
d175085626
Merge pull request #2781 from KisgadoB/patch-2
...
Update hu.coffee
2015-05-27 17:20:43 +01:00
Nick Winter
9e2c29403b
Re-fixed #2753 .
2015-05-26 17:02:59 -07:00
Nick Winter
c915ff1d94
Merged zh-HANS.coffee. Fixed tab indentations.
2015-05-26 16:59:19 -07:00
KisgadoB
600216aa9e
Update hu.coffee
2015-05-26 09:14:30 +02:00
Nick Winter
9dedf04f56
Added Uzbek (uz) language stub.
2015-05-25 16:01:12 -07:00
Nick Winter
86d7b6c625
Added Uzbek (uz) language stub.
2015-05-25 16:00:32 -07:00
Imperadeiro98
1af308424f
Merge pull request #2774 from Atomk/patch-2
...
Added my username in Italian translators
2015-05-24 12:18:02 +01:00
Imperadeiro98
e320bbbed5
Merge pull request #2783 from Atomk/patch-9
...
Update it.coffee
2015-05-23 20:19:46 +01:00
Marco Fras
cfc8147b31
Update it.coffee
...
Added a few translations regarding patches.
2015-05-23 10:57:06 +02:00
Marco Fras
536c422185
Small fix in a translated string
2015-05-23 10:42:27 +02:00
Marco Fras
5995f7d6a2
Update it.coffee
2015-05-23 10:38:49 +02:00
KisgadoB
7eeaf3385c
Update hu.coffee
2015-05-22 21:01:45 +02:00
Marco Fras
355efdd78d
Update it.coffee
2015-05-21 23:07:10 +02:00
Imperadeiro98
7f09e8f1f1
Merge pull request #2778 from Atomk/patch-5
...
Fixed a missing "to" in a string
2015-05-21 21:13:29 +01:00
Marco Fras
0f0143925d
Update en.coffee
...
I added "use" because it seems more suitable than "click".
2015-05-21 21:38:15 +02:00
Imperadeiro98
8d1fc92f4a
Uncommented translations
2015-05-21 16:56:22 +01:00
Imperadeiro98
506801cdda
Merge pull request #2777 from lynxlynxlynx/patch-1
...
sl.coffee: minor translations
2015-05-21 16:54:59 +01:00
Cat Sync
b38c7b4978
Next Level arrow shouldn't point to Kithgard Mastery
2015-05-21 11:30:37 -04:00
Imperadeiro98
3c203f13ff
Fixed indentation
2015-05-21 14:50:57 +01:00
Marco Fras
0cfb4f5c6b
Update it.coffee
2015-05-21 11:39:27 +02:00
Marco Fras
a3e3bdc125
Fixed a missing "to" in a string
2015-05-21 10:36:25 +02:00
Jaka Kranjc
f8293670b3
sl.coffee: minor translations
2015-05-21 09:19:49 +02:00
Imperadeiro98
8cc13e0829
Fixed indentation
2015-05-20 19:24:26 +01:00
Marco Fras
1f2df9f971
Update it.coffee
2015-05-20 19:51:28 +02:00
Imperadeiro98
bafef886cb
Merge pull request #2773 from Atomk/patch-1
...
Update it.coffee
2015-05-20 15:41:09 +01:00
Imperadeiro98
4721143346
Update pt-PT.coffee
2015-05-20 15:34:06 +01:00
Marco Fras
6db448b6c6
Added my username in Italian translators
...
Just red on the diplomat forum to do this..
2015-05-20 15:15:34 +02:00
Marco Fras
e9c3b68eb8
Update it.coffee
...
Just fixed tons of typos and bad translations, more fixes to come (this file is huge)
2015-05-20 01:25:11 +02:00
Imperadeiro98
21ce4eb8e1
Uncommented an header
2015-05-18 22:59:02 +01:00
Imperadeiro98
e64435e409
Merge pull request #2771 from dedalcom/patch-1
...
Update bg.coffee
2015-05-18 22:58:08 +01:00
Nick Winter
4c2c896496
Hacky fix for Kithgard Mastery walls not updating properly after dynamically being spawned.
2015-05-18 14:30:17 -07:00
dedalcom
724d76ac84
Update bg.coffee
2015-05-18 13:39:28 +03:00
bignova
59b15fcf82
Update zh-HANS.coffee
2015-05-17 23:22:12 -04:00
Nikita Gryzlov
6e62e3deb9
Propagated i18n
2015-05-18 00:05:23 +03:00
Imperadeiro98
ef7281a9bd
Merge pull request #2768 from nixel2007/master
...
Update ru.coffee
2015-05-17 20:29:09 +01:00
Nikita Gryzlov
6a66a03998
Update ru.coffee. Clans, misc.
2015-05-17 21:36:17 +03:00
Nikita Gryzlov
b29391b188
ru.coffee. Tips
2015-05-17 21:07:38 +03:00
FedericoTomas
976df82f5e
Update es-419.coffee
...
Updated my friends!.
2015-05-17 06:54:53 -03:00
Imperadeiro98
461a7c9c49
Merge pull request #2762 from Imperadeiro98/master
...
Updated i18n for clans
2015-05-16 19:36:56 +01:00
Imperadeiro98
a56807bcac
Updated i18n (part 3)
2015-05-16 19:32:00 +01:00
Imperadeiro98
32b4a7d76f
Updated i18n (part 3)
2015-05-16 19:31:40 +01:00
Imperadeiro98
323d5c5c2d
Updated i18n (part 2)
2015-05-16 19:25:07 +01:00
Imperadeiro98
bfd18471a5
Updated i18n (part 2)
2015-05-16 19:24:49 +01:00
wgsu
81dd640a5c
Update zh-HANS.coffee
2015-05-16 11:52:04 -04:00
wgsu
0155bd02ba
few more translation
...
Since I don't how the payment for the server in China work, I don't want to mess up your teacher section.
2015-05-16 11:35:48 -04:00
Imperadeiro98
e88aff1339
Updated i18n (part 1)
2015-05-16 14:46:00 +01:00
Imperadeiro98
a2b846e3fd
Updated i18n
2015-05-16 14:45:51 +01:00
Imperadeiro98
74380cc94a
Updated i18n (part 1)
2015-05-16 14:31:24 +01:00
Imperadeiro98
482d795146
Updated i18n
2015-05-16 14:16:13 +01:00
Imperadeiro98
ec9906c9ae
Updated i18n
2015-05-16 13:58:23 +01:00
Imperadeiro98
8a1bbec80e
Updated i18n
2015-05-16 13:57:46 +01:00
Imperadeiro98
6dbb9dd72b
Updated i18n
2015-05-16 13:55:41 +01:00
Nikita Gryzlov
ff8be31cb5
Propagated i18n.
2015-05-16 00:11:37 +03:00
Matt Lott
a881443bf2
🐛 Fix admin dashboard typo
2015-05-15 09:56:06 -07:00
Imperadeiro98
7a87b59988
Removed blank line
2015-05-14 20:07:07 +01:00
Nick Winter
c7c27d3208
Added missing half of recent loading quotes addition.
2015-05-14 11:30:14 -07:00
Lokendra Sharma
4abfc088bf
added more quotes for #710
2015-05-14 15:56:59 +05:30
nixel2007
fd8e798034
Update ru.coffee
2015-05-13 17:46:45 +03:00
Matt Lott
ee2540dcf2
🐛 Fix choose hero icon widths
...
Fixes #2753
2015-05-12 20:49:08 -07:00
Nick Winter
213a66b2ab
Implemented Arryn.
2015-05-12 16:59:30 -07:00
Matt Lott
81ec591b50
Swap teachers and blog menu links
2015-05-12 15:24:03 -07:00
Matt Lott
959fe434ea
Update /teachers site license copy
...
We don’t support site licenses yet, but can do one-time bulk purchases.
2015-05-12 15:18:42 -07:00
Matt Lott
896205bdf9
Use live version of Stripe checkout
...
Fixes #2639
2015-05-11 21:26:06 -07:00
Nick Winter
b7d1ab2b01
Not sending HipChat messages for level load errors. Not sending level load errors for level editor loads. Not sending more than one level load error report per session.
2015-05-11 18:53:42 -07:00
Matt Lott
3072e5f198
Merge pull request #2745 from stephenfloydwallace/patch-2
...
"Added more names for #53 "
2015-05-11 11:13:59 -07:00
Matt Lott
6dc51e27e4
🐛 Admin dashboard deleted users
...
Also disabling invoice caching to see if that is what causes invalid
sub end counts.
2015-05-11 10:37:44 -07:00
Edvin Linge
de59c56ec8
Added a bunch of Swedish translations
2015-05-09 22:29:04 +02:00
stephenfloydwallace
06e678b930
"Added more names for #53 "
...
This time in alphabetical order and without comma's
2015-05-09 17:52:51 +02:00
Matt Lott
dd35a1eb76
Include sponsored cancels in dashboard
...
Also includes free teacher sub cancels, which should be an
insignificant number.
2015-05-08 11:34:59 -07:00
Matt Lott
0353be4fc4
Add recent cancellations table to dashboard
2015-05-06 15:23:46 -07:00
Imperadeiro98
27b2b53943
Added a spr to replace a spl
2015-05-06 18:07:17 +01:00
VicYu
60fb8426c1
improved Chinese localization
...
1.Modify some wording error
2.Translated some items
2015-05-06 17:29:46 +08:00
Matt Lott
713f72f5e1
Merge pull request #2723 from Catsync/fixYellowArrow
...
Yellow arrow shouldn't point to replayable levels
2015-05-05 20:52:15 -07:00
Matt Lott
37804f07aa
Merge pull request #2718 from motoko-11/patch-1
...
Added more names for #53
2015-05-05 20:47:58 -07:00
Matt Lott
e2f18de220
Update /teachers page copy
...
Add blurb about one-time purchase site license option.
2015-05-05 20:33:37 -07:00
Matt Lott
103abdbfb0
Add teachers forum link to /teachers page
2015-05-05 15:35:22 -07:00
Matt Lott
901c0ed085
Update managed subscriptions copy
...
Add blurb about recipients needing to be existing CodeCombat users
2015-05-05 15:18:35 -07:00
Matt Lott
bf20d5f7be
Add level to Inventory Play analytics event
2015-05-05 15:05:18 -07:00
Imperadeiro98
4f43139f9f
Uncommented some headers
2015-05-03 21:21:21 +01:00
Edvin Linge
707c098472
Added some Swedish translation
2015-05-03 18:55:34 +02:00
Cat Sync
42aaba6278
Yellow arrow shouldn't point to replayable levels
2015-05-02 00:15:42 -04:00
Matt Lott
dce8005169
Fix admin dashboard monthly churn
...
Monthly churn = cancelled during last month / total at beginning of
month
2015-05-01 17:26:22 -07:00
Matt Lott
5305d80887
Add conversion info to admin dashboard
2015-05-01 09:37:47 -07:00
Lokendra Sharma
eb13de9f34
Added more names for #53
...
First contrib. Don't know where else to start.
2015-05-01 16:43:49 +05:30
Imperadeiro98
8b9c12e685
Merge pull request #2716 from ameer157/patch-1
...
translated "weapons" into arabic
2015-04-30 22:02:17 +01:00
Nick Winter
def6709c52
Added /identify page.
2015-04-30 13:36:32 -07:00
Amir Off
d8955d3389
add epic paladin female name
2015-04-30 20:41:33 +03:00
Amir Off
dcb9df32bd
translated "weapons" into arabic
2015-04-30 20:30:54 +03:00
Matt Lott
e576557bba
Update private clans dashboard preview
2015-04-29 11:52:23 -07:00
Nick Winter
1a1da2924f
Noticed Chrome 30 wasn't working for Gems in the Deep, so recommending 31+ instead of 25+.
2015-04-28 14:49:10 -07:00
Imperadeiro98
e11e8a8966
Fixed last merge
2015-04-28 19:44:34 +01:00
Imperadeiro98
cf8240c400
Merge pull request #2713 from YukiUeda/patch-1
...
Translate ja.cofee on Achizan
2015-04-28 19:42:51 +01:00
Matt Lott
03bf357a84
Update /teachers copy
2015-04-28 11:35:24 -07:00
Matt Lott
f7503f5dba
Expanded progress private clans toggle
...
Expand option for level bubbles in the private clan dashboard.
2015-04-28 10:31:35 -07:00
Matt Lott
a995fb938b
Update clans UI
...
Update private clans dashboard to show level progression in order, and
visually indicate which levels are not completed/started/completed.
Update private clans blurb and screenshot.
Subscribe prompt on make private clan checkbox.
2015-04-28 09:22:58 -07:00
YukiUeda
7b05fbf84e
Translate ja.cofee on Achizan
2015-04-28 20:29:40 +09:00
Nicolas Kaiser
2f5cb0c8cd
Fix typos in de-DE.coffee
...
line 4: According to [1], "Leid tun" was actually an accepted spelling between 1996 and 2006.
line 839: Imperative form [2]
[1] http://www.korrekturen.de/wortliste/leidtun.shtml
[2] http://www.duden.de/rechtschreibung/beitreten
2015-04-27 14:11:38 +02:00
Nicolas Kaiser
4416332938
Fix typos in en.coffee
2015-04-26 20:16:25 +02:00
Nick Winter
520a08a39c
Merge pull request #2699 from lewishenson/patch-1
...
Added more male knight names for #53
2015-04-26 09:55:40 -07:00
Imperadeiro98
5a3f368960
Uncommented some strings from last merge
2015-04-26 16:52:07 +01:00
YrlaCharlotta
ef71b22cab
Update sv.Coffee
2015-04-26 17:19:40 +02:00
Imperadeiro98
0498d125e6
Some fixes to last merge
2015-04-26 14:50:09 +01:00
Imperadeiro98
b6cb601973
Merge pull request #2705 from LikeMyGeek/master
...
Traduction en cours
2015-04-26 14:47:26 +01:00
Imperadeiro98
85047ba2e8
Reordered a string
2015-04-26 14:27:12 +01:00
Imperadeiro98
4719123d00
Update pt-PT.coffee
2015-04-26 14:25:01 +01:00
Nick Winter
80af32180c
Fixed #1638 : detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error.
2015-04-25 17:29:02 -07:00
Nick Winter
aeadb83975
Merge pull request #2656 from robertbeuligmann/vectortoStringupdate
...
Vector.toString precision parameter
2015-04-25 16:31:54 -07:00
Nick Winter
e07e46127c
Merge pull request #2691 from sirui-sun/master
...
Added more names for #53
2015-04-25 16:28:11 -07:00
LikeMyGeek
bd342c1fef
Traduction en cours
2015-04-25 20:33:41 +02:00
Matt Lott
f41b0bd4dd
Sort clan members list alphabetically
2015-04-24 14:22:00 -07:00
Nick Winter
1c85759df8
Propagated i18n.
2015-04-24 13:50:30 -07:00
Nick Winter
cd837156d4
Now that we're at 146 levels, and each level is much longer, we're just going to do 'some' new levels every week instead of five.
2015-04-24 13:48:19 -07:00
Matt Lott
0a6e2be7dd
Update admin dashboard css
...
Squish table columns.
2015-04-23 21:00:33 -07:00
Nick Winter
36245eb25c
Levels should default to saveThangs: ['Hero Placeholder'] instead of ['humans'].
2015-04-23 18:59:15 -07:00
Matt Lott
30d47621bf
Confirm Clan remove hero
2015-04-23 14:33:13 -07:00
Matt Lott
1e688f1d61
Clan details view solution
...
Click on a level progression cell to observe the level session in a new
tab.
2015-04-23 14:31:21 -07:00
Matt Lott
59de47069a
Add sponsored subs to admin dashboard
2015-04-23 13:34:43 -07:00
Matt Lott
92332c37f3
Update /teachers copy
2015-04-23 13:34:43 -07:00
Imperadeiro98
f4ecdfeb98
Changed some spr and spl...
...
... in add-thang-components-modal.jade
2015-04-23 20:58:57 +01:00
Imperadeiro98
fb63b0b240
Removed unnecessary spl's...
...
... from community page
2015-04-23 20:47:09 +01:00
Imperadeiro98
c350f457a2
Merge pull request #2682 from sauki8/patch-1
...
Update id.coffe
2015-04-23 19:21:33 +01:00
Imperadeiro98
894a49fce7
Fixed an issue from last merge
2015-04-23 19:20:20 +01:00
Imperadeiro98
fc10c34040
Merge pull request #2698 from YukiUeda/patch-1
...
Translated for artisan
2015-04-23 19:18:52 +01:00
Imperadeiro98
ac15e3d9da
Fixed some errors from last merge
2015-04-23 19:16:08 +01:00
Imperadeiro98
9b92fc1ebe
Merge pull request #2692 from kimaz/patch-1
...
Update de-CH.coffee
2015-04-23 19:10:05 +01:00
Nick Winter
155246173a
Only showing general i18n coverage for languages with more than one family.
2015-04-22 13:13:24 -07:00
Lewis Henson
af3ba72b85
Added more male knight names for #53
2015-04-22 11:24:36 +01:00
kimaz
01b6a1a657
Update de-CH.coffee
...
Update 2 @04.22.2015 12:17AM
2015-04-22 12:17:53 +02:00
YukiUeda
3b303fc6f3
Translated for artisan
2015-04-22 18:34:45 +09:00
Matt Lott
502a47e912
Admin dashboard perf
...
Find subscription cancellations via events API instead of walking each
customer and their subscriptions.
2015-04-21 15:58:45 -07:00
Matt Lott
cfe3e280e5
Clan delete confirm dialog
...
Fixes #2696
2015-04-21 13:41:31 -07:00
Matt Lott
5eb65e49fe
Add private clans to /teachers copy
2015-04-21 11:41:48 -07:00
Matt Lott
b918408061
Add private clans to subscribe modal
2015-04-21 11:14:49 -07:00
kimaz
3ab1b6d187
Update de-CH.coffee
2015-04-21 13:25:04 +02:00
Sirui Sun
70237f8b49
Added more names for #53
2015-04-20 23:54:00 -07:00
Matt Lott
c9a7f6773d
Speed up clan details page
...
Only fetch level sessions and achievements for 200 members.
Display members with more data first.
Show average clan achievements instead of total achievements.
General css cleanup.
2015-04-20 16:20:52 -07:00
Nick Winter
9466923013
Fixed #2519 : boss star gold no longer counts in gold-collected leaderboards.
2015-04-20 16:02:06 -07:00
Nick Winter
e40ad5e1c7
Updating a couple logos. Opening item store to warrior tab when low level.
2015-04-20 16:02:06 -07:00
Matt Lott
c900310c8e
Merge branch 'clans'
2015-04-20 14:42:48 -07:00
Matt Lott
9fffb80b3f
Update clans private info blurb
2015-04-20 14:30:31 -07:00
Matt Lott
38cdb3d057
Update clan analytics
2015-04-20 14:16:44 -07:00
Matt Lott
f80a73ae9b
Decouple clan type from dashboard details
...
Adding dashboardType field, private clans automatically set this to
‘premium’.
2015-04-20 14:04:22 -07:00
brokenelevator
46381cf1df
Update pl.coffee
2015-04-20 19:56:40 +02:00
Imperadeiro98
a859a71e6f
Merge pull request #2684 from nixel2007/ru
...
Update ru.coffee
2015-04-19 21:17:53 +01:00
Nick Winter
cf07960e81
Merge pull request #2662 from dheerajdake/dheerajdake-patch-1
...
New female and male names added!
2015-04-19 08:46:01 -07:00
Nick Winter
17ce3fca6b
Merged zh-HANS.coffee.
2015-04-19 08:43:35 -07:00
Nikita Gryzlov
32190a4f0e
Update ru.coffee
...
Missed translation
2015-04-19 13:09:24 +03:00
Nikita Gryzlov
c9d84a72c2
Update ru.coffee
2015-04-19 12:57:59 +03:00
Nick Winter
63596aa6b5
Fixed #2450 : added i18n for new items in the victory modal.
2015-04-18 21:10:35 -07:00
Nick Winter
a0057910ac
Fixed #2597 : press escape to abort simulation now, if your code is going to be slow.
2015-04-18 19:54:34 -07:00
Nick Winter
ea54c4a8e3
Keeping GPLUS_TOKEN_KEY in localStorage forever.
2015-04-18 19:41:34 -07:00
Nick Winter
a62288045f
Noticed Diplomat modal in sk.coffee wasn't translated.
2015-04-18 19:41:12 -07:00
Nick Winter
0d81f658ae
Fixed #2452 : handling four and even five-digit gem/xp totals in victory screen.
2015-04-18 19:40:53 -07:00
Nick Winter
a1199a0121
Fixed #343 . Fixed #2565 . localStorage cache now only lasting a week for most items, using lscache (bower install, y'all).
2015-04-18 17:25:40 -07:00
Nick Winter
b358296120
Fixed #2420 . Fixed #2605 . Can now change programming language from LadderPlayModal.
2015-04-18 16:57:02 -07:00
Nick Winter
485718b6e3
Fixed #2581 : triggering window resize event when loading view unveils, in case window was resized before then and messed up our initial spell view height.
2015-04-18 16:33:40 -07:00
Nick Winter
d4068cc879
Fixed #2218 : adjusted some real-time playback speed factors.
2015-04-18 16:19:16 -07:00
Nick Winter
114b0f4937
Fixed typo in last commit.
2015-04-18 16:08:31 -07:00
Nick Winter
86ae0979c5
Working on #2505 ; do we have TLS for the analytics server yet?
2015-04-18 16:02:18 -07:00
Nick Winter
7471b14c4d
Fixed #2013 : removed autorun code. Fixed preloading to actually happen, but only on short solutions without a ton of statement execution.
2015-04-18 15:52:24 -07:00
Nick Winter
ea80e22dc6
Don't point out Lost Viking, since most players shouldn't attempt it. Adjust autocomplete default parameter from string to variable for Known Enemy.
2015-04-18 14:13:05 -07:00
wgsu
42c435a19e
Update zh-HANS.coffee
2015-04-18 11:35:32 -04:00
sauki8
fd68208bce
Update id.coffe
2015-04-18 12:38:31 +07:00
Nick Winter
1952a8ea23
Fixed #2305 : removed CSS initial keyword usage.
2015-04-17 11:42:38 -07:00
Imperadeiro98
dd04dd88cf
Update pt-PT.coffee
2015-04-17 15:22:08 +01:00
Imperadeiro98
5cc32cb18a
Uncommented some translations
2015-04-17 15:08:13 +01:00
Imperadeiro98
e4391ca034
Merge pull request #2679 from noashess12/patch-5
...
Update ar.coffee
2015-04-17 15:06:09 +01:00
noashess12
83f2723628
Update ar.coffee
2015-04-17 14:30:32 +03:00
nixel2007
e96b1d3f78
Update ru.coffee
2015-04-17 12:37:29 +03:00
Nick Winter
2eb95c32df
Propagated i18n.
2015-04-16 18:35:40 -07:00
Matt Lott
45c070209b
Update private clans dashboard
2015-04-16 15:26:14 -07:00
Nick Winter
48ba17a34c
Merged hu.coffee.
2015-04-16 14:17:22 -07:00
Imperadeiro98
05e987283c
Fixed couple issues from last merge
2015-04-16 22:12:26 +01:00
brokenelevator
16d970940f
Update pl.coffee
2015-04-16 21:41:15 +02:00
Nick Winter
4de9071f1a
Added a projection to Clans getMemberSessions to help with the gargantuan fetch running us out of memory.
2015-04-16 08:03:19 -07:00
Imperadeiro98
7aff510f3e
Merge pull request #2674 from nixel2007/ru
...
Update ru.coffee
2015-04-16 14:23:24 +01:00
nixel2007
2e8f1422da
Update ru.coffee
2015-04-16 11:50:30 +03:00
brokenelevator
8c4181c3e4
Update pl.coffee
2015-04-16 06:35:12 +02:00
brokenelevator
8a1f7a0d20
Update pl.coffee
2015-04-16 06:32:15 +02:00
brokenelevator
0820dd9041
Update pl.coffee
2015-04-16 05:05:33 +02:00
Imperadeiro98
3b9ee13378
Merge pull request #2671 from steog88/patch-1
...
Update it.coffee
2015-04-15 19:25:21 +01:00
Matt Lott
2f8831ea72
Show clan type in My Clans list
2015-04-15 11:12:35 -07:00
Matt Lott
2b29e755fe
Make clan name and description editable
2015-04-15 11:09:43 -07:00
steog88
007cddb9f1
Update it.coffee
2015-04-15 15:26:27 +02:00
LuiKang
4f61ebf30d
range translation too wide
...
'range' translation was too wide also
2015-04-15 10:27:54 +02:00
LuiKang
f1065053b2
Update hu.coffee
...
'blocks' translation was too wide so the shield block value was not readable.
2015-04-15 10:11:06 +02:00
Imperadeiro98
198536f592
Uncommented some strings and headers
2015-04-14 18:04:07 +01:00
Imperadeiro98
aa8a4cb010
Merge pull request #2667 from YukiUeda/patch-1
...
translated some sentences
2015-04-14 18:02:07 +01:00
Nick Winter
75b3361efe
Fixed #2390 . Fixed #2391 . Added hero-ladder and replayable particles to campaign level banners, plus replayable difficulty indicators.
2015-04-13 17:07:13 -07:00
Nick Winter
a7bb97e5f2
Fixed #2649 : made leaderboard buttons more obvious.
2015-04-13 16:26:58 -07:00
Nick Winter
8649383a8c
Fixed #2416 : LadderTabView now shows hero portraits.
2015-04-13 16:17:22 -07:00
Nick Winter
588b7c9834
Fixed #2564 : level info underlapping too-large game control buttons on tiny screens.
2015-04-13 15:53:02 -07:00
Nick Winter
d781500321
Fixed #2577 : added feedback to diplomat email subscribe, takes you to Diplomat page afterward.
2015-04-13 15:14:36 -07:00
Nick Winter
e7df703d36
Fixed #2651 : indicate better that sample code is locked when it won't let them type in there.
2015-04-13 15:04:42 -07:00
Nick Winter
a6d1905580
Merged ar.coffee.
2015-04-13 12:46:33 -07:00
Imperadeiro98
e66522ec92
Uncommented some headers
2015-04-13 20:12:58 +01:00
Imperadeiro98
d0b8df797c
Merge pull request #2666 from LuiKang/patch-1
...
Update hu.coffee (magyar fordítás frissítés)
2015-04-13 20:08:01 +01:00
Imperadeiro98
8d035617aa
Uncommented some translations
2015-04-13 20:07:15 +01:00
Imperadeiro98
eb93586f0e
Merge pull request #2645 from noashess12/patch-2
...
Update ar.coffee
2015-04-13 20:00:26 +01:00
YukiUeda
3c55e53b36
translated some sentences
2015-04-13 14:08:01 +09:00
LuiKang
c54373a042
Update hu.coffee
...
Pár helyen a meglévő szavakon is pontosítottam, amelyek akár szerepjátékos szemmel, akár programozói szemmel nem tűntek számomra pontosnak.
2015-04-12 23:36:15 +02:00
Popey Gilbert
03697ed34f
Added Gygram back
2015-04-12 21:09:46 +01:00
Popey Gilbert
1ce628ccc6
Sort alphabetically
2015-04-12 20:40:24 +01:00
Nick Winter
4c008e4686
Fixed #2406 .
2015-04-12 12:20:33 -07:00
Gygram
e227e48e86
Update DiplomatView.coffee
2015-04-12 21:00:02 +02:00
Nick Winter
eb075b99a0
Fixed #2448 with better random session query distribution.
2015-04-12 11:34:19 -07:00
Dheeraj Dake
30ba84ca56
New female and male names added!
...
Female = Anabel, Paulark
Male = Eugen, Toremon
2015-04-11 15:16:32 -07:00
Matt Lott
4669d4cb0a
Update admin subs dashboard
...
Break up lengthy server calls to reduce timeouts in production.
2015-04-11 10:36:03 -07:00
Robert Beuligmann
bcc7342198
Vector.toString precision parameter
...
Vector.toString changed to accept precision parameter, defaulted to 2. Allows more natural display of small or normalized vectors. removed non-functional useZ parameter.
2015-04-11 00:44:28 -06:00
Nick Winter
e85c53ea42
Programming is good for your childrens's careerses, O dear parents.
2015-04-10 14:35:13 -07:00
Matt Lott
6d892359c7
Private clans UI
...
Add private checkbox for clan creation.
Add info popover for private clans.
Subscribe prompt for create/join if necessary.
Don’t list private clans in public list.
2015-04-10 14:33:16 -07:00
Nick Winter
7e2caddd02
Fixed #2579 by moving parent button popover content to jade.
2015-04-10 13:47:06 -07:00
noashess12
d925012571
Update ar.coffee
2015-04-10 23:08:59 +03:00
Matt Lott
5c40221ab2
Update admin subs dashboard
...
Using invoices to aggregate totals which should provide a more accurate
growth rate.
2015-04-10 11:27:59 -07:00
Nick Winter
05ac763eb8
Making '' requiredThangType entries more recoverable.
2015-04-10 11:27:13 -07:00
Nick Winter
6eeb29e8d4
Multiplayer levels go to ladder when you click Scores instead of to a blank single-player leaderboard.
2015-04-10 09:23:00 -07:00
Nick Winter
ebd0e7db84
Giving more simulation time before infinite loop timeout to headless simulation.
2015-04-10 08:24:19 -07:00
cundamic
64c7dec7a5
Update sk.coffee
...
minor changes
2015-04-10 06:51:13 +02:00
noashess12
f03d279f8a
Update ar.coffee
2015-04-10 00:12:01 +03:00
Imperadeiro98
a4c1154fd8
Update pt-PT.coffee
2015-04-09 21:51:43 +01:00
Nick Winter
3b224db839
Propagated i18n.
2015-04-09 11:51:01 -07:00
Matt Lott
adea59054b
Remove bitcoins from sub payments blurb
2015-04-09 09:42:44 -07:00
Matt Lott
65e009330a
Remove invalid bitcoin comment
2015-04-09 09:42:44 -07:00
Imperadeiro98
c6b511749a
Some fixes to last merge
2015-04-09 14:36:12 +01:00
Imperadeiro98
702c3b611f
Merge pull request #2643 from JCesar91/patch-2
...
Update es-419.coffee
2015-04-09 14:34:40 +01:00
Imperadeiro98
3f1fc636c2
Merge pull request #2644 from ArthurLu/master
...
Update zh-HANT.coffee
2015-04-09 14:33:12 +01:00
Nick Winter
9ee0400c18
Updated to just send out tell-a-parent emails, no tell-a-friend emails.
2015-04-08 21:48:21 -07:00
Barney
a48800bb84
Update zh-HANT.coffee
2015-04-09 11:09:14 +08:00
Barney
03e2ab6ee7
Merge remote-tracking branch 'upstream/master'
2015-04-09 10:15:17 +08:00
Nick Winter
2eec3e7831
Simplified share progress email to just share with parents, not friends.
2015-04-08 18:31:13 -07:00
JMan
b46283e18a
Update es-419.coffee
...
Translated a few more lines, mostly about player subscription benefits.
2015-04-08 19:54:17 -04:00
Nick Winter
6d9c13b7e1
Promoting Favorable Odds as the cool thing to do that all the cool kids are doing 'cause it's so cool.
2015-04-08 16:23:51 -07:00
Nick Winter
d082aa3754
Fixed leaderboard level projection issue.
2015-04-08 15:11:35 -07:00
Nick Winter
98b749eb1b
Making simulator stuff more efficient by using less bandwidth.
2015-04-08 12:00:23 -07:00
Matt Lott
b500e5334a
Update admin subs dashboard
2015-04-08 11:53:26 -07:00
Imperadeiro98
ce56312120
Changed some spr and spl in contact form
2015-04-08 19:31:52 +01:00
Imperadeiro98
e923f7a4fc
Moved a string to its correct place
2015-04-08 19:25:59 +01:00
Nick Winter
d743bd3a4e
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-04-08 10:56:02 -07:00
Nick Winter
8bf42fff50
Added achievement, campaign, and poll patch properties to User schema.
2015-04-08 10:55:44 -07:00
Imperadeiro98
e1aaa9faee
Update pt-PT.coffee
2015-04-08 18:46:02 +01:00
Nick Winter
7fa782e7bd
Workaround for #2630 : Programmable is weird.
2015-04-08 10:31:38 -07:00
Nick Winter
0f124bdddc
Fixed i18n editor not allowing translation of level guides.
2015-04-08 09:51:54 -07:00
Nick Winter
e6c200b64d
eye-open instead of eye-close for non-English leaderboard view buttons.
2015-04-08 09:46:55 -07:00
Nick Winter
817e382324
Updated VCS link/blurb for Lost Viking.
2015-04-08 09:44:15 -07:00
Matt Lott
51e25d8a9c
Update /teachers level counts
2015-04-08 09:42:39 -07:00
cundamic
e1f5a31734
Update sk.coffee
...
translation: classes, contribute
2015-04-08 15:43:01 +02:00
Nick Winter
2103c6b4e0
Shared ranks in case of ties for Zero Sum.
2015-04-07 21:10:41 -07:00
Nick Winter
497978b27d
Preparing Zero Sum tournament results.
2015-04-07 20:56:24 -07:00
Nick Winter
f02a8b54f3
Fixed #2596 . Stopped bless-brunch from using its cacheBuster feature. Set no-cache header for /db/model.type/slug so that we can use Cloudflare on /db/model.type/object-id. Fixed a coffeelint warning.
2015-04-07 19:03:35 -07:00
Matt Lott
f3c973b945
Add payment methods to subscribe dialog
...
And update level counts in subscription breakdown.
2015-04-07 15:54:59 -07:00
Nick Winter
8e715560c2
Using a watch button instead of an eye icon for leaderboards in English.
2015-04-07 15:32:41 -07:00
Matt Lott
3c755d39e6
Add recent subscribers to admin dashboard
2015-04-07 15:00:53 -07:00
Nick Winter
bf86b2f9cd
Not including levels that are unlocked in later campaigns in level counts for earlier campaigns until they are started.
2015-04-07 14:32:51 -07:00
Nick Winter
eef33f2ed5
Community popovers now pop to the top instead of to the bottom.
2015-04-07 13:58:04 -07:00
Imperadeiro98
ef19612ab2
Changed some spr and spl in community page...
...
... so that links don't get over-underlined
2015-04-07 21:51:57 +01:00