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
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
