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