Rob
86d9b081c1
Merge branch 'cashew'
2016-01-06 12:03:49 -08:00
Scott Erickson
d1e7055b1a
Add code highlighting to solution treema nodes in level editor
2016-01-06 09:58:04 -08:00
Rob
3baea9683c
Additional java support.
2016-01-04 16:41:24 -08:00
CodeCombat
41a532cb50
WIP - cashew integration
2016-01-04 16:27:27 -08:00
Nick Winter
3be6abf2e1
Merge Router.coffee
2015-12-23 08:23:23 -08:00
Josh Callebaut
79ff058117
Adds the Thang Task View.
2015-12-21 12:44:22 -08:00
Scott Erickson
079109145f
Cull recruiting views and translations
2015-12-18 10:34:21 -08:00
Scott Erickson
53f8bca26b
Add logoutRedirectURL property to RootView, default to /, add exceptions
2015-12-18 10:02:03 -08:00
Scott Erickson
ef3f847932
Remove SubscriptionSaleView
2015-12-16 16:39:44 -08:00
Matt Lott
646aa56716
/schools page
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
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
7e24cda7f8
Redirect logouts to /hoc always for now
...
Generic solution to replace commit 77a8347
2015-12-10 12:26:03 -08:00
Nick Winter
608d45ba70
Don't do undefined slug collection scans
2015-12-10 09:05:34 -08:00
Matt Lott
f3279863d4
Track pageviews analytics internally
2015-12-04 16:07:58 -08:00
Matt Lott
05497f023f
Add /Courses to router
2015-12-03 11:39:13 -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
Nick Winter
0d65d73024
Finish merging master into courses-vhoc
2015-12-02 10:10:50 -08:00
Nick Winter
88ee363576
Add schoolName field to AuthModal
2015-12-01 17:44:03 -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
Scott Erickson
0c45e3f96c
Add ClassroomView, incomplete
2015-11-30 14:14:27 -05: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
Matt Lott
e7acf9c798
🐛 Fix local env analytics log event URL
...
Found another one @basicer
2015-11-25 16:33:27 -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
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
Matt Lott
5ca68ff682
🐛 Fix analytics dashboard date oboe
2015-11-11 20:21:35 -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
2259076800
LoadingScreen -> level intro behavior
2015-11-10 15:22:09 -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
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
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
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
66432990f4
Add framework for new courses pages
2015-11-03 16:41:06 -08: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
Scott Erickson
31367f39c1
Add class "ie10" to body when using IE10
2015-10-28 11:33:36 -07:00
Matt Lott
38242eb55e
Add /Careers routing entry
2015-10-26 20:39:40 -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
Sam Soffes
d2052980c4
Send sign out message directly
2015-10-16 15:02:33 -07:00
Sam Soffes
59f987e105
Check for new iPad User-Agent
2015-10-16 14:42:25 -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
Matt Lott
7390f2d1e4
Separate URLs for /courses/students and /courses/teachers
2015-10-07 14:37:41 -07: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
Matt Lott
95319ecc3e
Redirect /careers to Lever page
2015-09-25 15:49:00 -07:00
Matt Lott
928f72e2cf
Merge branch 'prepaid-v2' into master
2015-09-25 10:28:27 -07:00
Matt Lott
feef9c0ac6
🐛 Fix instance selection on /courses page
2015-09-24 17:52:00 -07:00
Nick Winter
49279367d1
Fix facebook.coffee linting issue
2015-09-21 14:16:08 -07:00
Matt Lott
3ad13c9a0d
Add /careers page
2015-09-14 17:38:18 -07:00
Matt Lott
a2577cc521
Update courses landing page
2015-09-10 10:39:21 -07: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
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
Matt Lott
8de00767b3
Initial courses object model
2015-08-29 07:15:39 -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
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
Nick Winter
da0b7d3e64
Merge pull request #2955 from codecombat/leagues
...
Leagues!
2015-08-19 15:34:54 -07:00
Nick Winter
11f9238a91
Added Robot Ragnarok limited time challenge.
2015-08-19 12:16:48 -07:00
Nick Winter
32ca453dec
Added /play/ladder/levelID/clan/clanID clan-specific ladder pages.
2015-08-15 06:45:38 -07: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
Matt Lott
38efeb119c
Courses UI - take class size as buy input instead of bucketizing
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
Matt Lott
da6cf60381
Target specific levels with InspectletJS
...
Currently targeting cupboards-of-kithgard.
2015-08-03 15:52:52 -07:00
Nick Winter
15ecc92abc
Adding 'course' type levels. Removing 'campaign' type levels.
2015-07-24 17:37:42 -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
Matt Lott
e36cf0ca3f
Initial courses mock UI
...
Do not localize these files.
This is under construction.
2015-06-29 12:15:10 -07:00
tahmidshahriar
6ac3ea9f5f
Fixed not found page
2015-06-24 14:46:59 -07:00
Nick Winter
4e08d453b7
Added some code for the glacier world.
2015-06-08 13:20:54 -07: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
Nick Winter
def6709c52
Added /identify page.
2015-04-30 13:36:32 -07: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
ea54c4a8e3
Keeping GPLUS_TOKEN_KEY in localStorage forever.
2015-04-18 19:41:34 -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
114b0f4937
Fixed typo in last commit.
2015-04-18 16:08:31 -07: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
Matt Lott
32b48a3c4c
Clans v1 UI with mock data
...
Main clans view shows public list, user’s clans, and create clan form.
Clan details view shows clan details and members list.
2015-03-31 13:28:57 -07:00
Nick Winter
0b1bb6a4aa
Added admin/pending-patches view. Fixed accepting several kinds of patches. Added keyboard shortcuts for accepting (a) and rejecting (r) patches. Fixed #2490 . Fixed #2515 . Fixed #2304 .
2015-03-28 13:54:44 -07:00
Matt Lott
53de6c6134
Add current subscription counts view under the admin page
2015-03-27 15:27:34 -07:00
Nick Winter
b4ea78e5cb
Implementing alternative pricing with Alipay in China to support dedicated China server.
2015-03-23 15:26:44 -07:00
Nick Winter
c6cd7b032d
Fixed Alipay auto locale detection.
2015-03-18 17:17:30 -07:00
Nick Winter
3236abc5da
Added emphasis for Apocalypse.
2015-03-17 21:20:26 -07:00
Matt Lott
af89452b93
Merge branch 'sponsored-subs'
2015-03-13 15:19:20 -07:00
Nick Winter
3458f2069b
Temporary workaround for #2512 . Identifying ageRange. Made poll header slightly smaller.
2015-03-11 20:21:54 -07:00
Matt Lott
6db4d72dc4
Track pageviews for manual calls to navigate
2015-03-09 12:57:10 -07:00
Nick Winter
e21360127d
Polls!
2015-03-08 16:36:17 -07:00
Matt Lott
cd59b90e37
Add custom payments
...
Example:
https://codecombat.com/account/invoices?a=21600&d=9%20monthly%20subscrip
tions
2015-03-04 15:40:53 -08:00
Nick Winter
e6cf298ed3
Propagated i18n. A couple other misc tweaks.
2015-03-04 09:00:32 -08:00
Nick Winter
2d18bcf9f0
Recording referrer information. Updating parent email prompt to also show after Signs and Portents if that's the fourth level.
2015-03-03 09:04:53 -08:00
Nick Winter
bb80db9cd5
Server now thinks it's production whenever it's not localhost:3000, rather than whenever it is codecombat.com.
2015-03-01 22:19:01 -08:00
Matt Lott
86d167394e
Remove Segment analytics dependency
...
Call Google Analytics, Errorception, and Inspectlet directly.
2015-02-27 16:07:41 -08:00
Michael Schmatz
d0d622445f
Fixed tracking for non production environments
2015-02-27 14:44:06 -05:00
Michael Schmatz
4efb73d8d7
Switch to new analytics server
2015-02-27 13:45:10 -05:00
Nick Winter
df4b98a9bf
Added a new 'artisan' permission, which can edit most of the things admins can, but with less uncomfortable ultimate power.
2015-02-25 18:41:39 -08:00
Nick Winter
15ca65f226
Further disabled employer portal for now.
2015-02-25 12:38:51 -08:00
Nick Winter
4cbbcdad6d
Merge pull request #2359 from laituan245/master
...
Added ability to delete account
2015-02-24 09:30:22 -08:00
laituan245
a588a3b2c8
Some updates to the PR #2359
2015-02-25 02:12:39 +09:00
