Commit graph

3312 commits

Author SHA1 Message Date
Matt Lott
6a48fbb3aa Add courses to progress-reset warning 2016-02-25 10:08:16 -08:00
Imperadeiro98
62c5b34a96 Update About page i18n
Also fixed some images
2016-02-25 15:48:29 +00:00
Scott Erickson
fc800935aa Fix screenshot carousel when focused on the carousel control and pressing arrow keys 2016-02-24 16:55:18 -08:00
phoenixeliot
f1b046b50e Refactor Request Quote page to flat-style 2016-02-24 16:23:21 -08:00
phoenixeliot
4b02f120e2 Add new About page and refactor out flat-style 2016-02-24 16:22:06 -08:00
Imperadeiro98
42f84de394 Merge master branch 2016-02-24 19:40:21 +00:00
Matt Lott
e74a77342c Update admin trial requests page
Add role and phone number
Move notes to separate line
Display last 1000 reviewed instead of 100
2016-02-24 10:22:55 -08:00
Matt Lott
609884eb51 Update furthest course dashboard tables
Adding a second table, setting range to be 60 and 365 days.
Updating teacher columns to prioritize student paid status over
furthest student course.
2016-02-24 06:25:01 -08:00
Matt Lott
dd603a0436 Add school sales table to dashboard 2016-02-24 06:25:01 -08:00
Matt Lott
e471d652e5 Add more year long dashboard graphs 2016-02-24 06:25:01 -08:00
Scott Erickson
e2feeb8330 Prevent didReappear from setting up shortcuts twice for RootViews 2016-02-23 12:00:07 -08:00
Scott Erickson
becad06750 Refactor ArticleEditView and PatchesView to use model endpoint functions 2016-02-22 16:03:21 -08:00
Matt Lott
cac9a7463f Dashboard monthly revenue counts, and tabs 2016-02-20 17:27:45 -08:00
Scott Erickson
3390663486 Fix GuideView to use session.codeLanguage by default 2016-02-19 10:55:42 -08:00
Matt Lott
19d0e67002 Dashboard classroom vs campaign year chart 2016-02-19 09:32:17 -08:00
Imperadeiro98
92dc72cce1 Remove name from loadModel 2016-02-18 16:44:40 +00:00
Matt Lott
1f01b3ffbd Update revenue analytics with payment.prepaidID 2016-02-17 13:01:09 -08:00
Scott Erickson
cf030146e8 Restrict request quote emails
* If logged in => repopulate and lock email (and name if available)
* If logged out => disallow using an email for an existing account and display a validation message + login link
2016-02-17 11:51:26 -08:00
Nick Winter
b5bb662ed2 Add picoCTF problem descriptions to levels; streamline picoCTF flows more 2016-02-17 11:33:56 -08:00
Scott Erickson
0905a378a0 Fix recent scrolling changes for Firefox 2016-02-17 11:21:43 -08:00
Scott Erickson
c8551a6382 Make new home page responsive 2016-02-17 11:05:20 -08:00
Matt Lott
cb29d7068b Add prepaids to payments
Closes #3402
2016-02-17 10:08:44 -08:00
Nick Winter
37fbd8ca21 Start to play picoCTF levels as course levels without hero selection 2016-02-17 09:53:45 -08:00
Nick Winter
fe351be32e Start to rework CampaignView when we're in picoCTF mode 2016-02-16 20:39:59 -08:00
Scott Erickson
c2f02ebbfb Fix scrollToLink, including removing unneeded offset 2016-02-16 10:47:49 -08:00
Matt Lott
73657d5428 Update analytics dashboard
Splitting out classroom and campaign active users
Adding more detailed active users graphs
Patching up missing analytics log events for 2/2/16-2/9/16
2016-02-16 09:23:42 -08:00
Nick Winter
6800ea2ff7 Add picoCTFProblem field to levels 2016-02-10 14:16:54 -08:00
Matt Lott
06436a4bb7 Add levelID property to show subscription modal events
Allows us to consolidate analytics collection indexes and code someday.
2016-02-09 16:50:55 -08:00
Josh Callebaut
7db678e63f Merge pull request #3380 from Zerrien/editorChanges
Style fixes and fixes level submission emails
2016-02-09 09:42:05 -08:00
Nick Winter
0ef29ddb95 Restrict who counts as a teacher in analytics 2016-02-08 14:44:38 -08:00
Scott Erickson
bb38c58903 Properly fix duplicate course instances
* Add script to merge existing course instances
* Have client only send one course instance creation
* Have server return existing course instance if one for the given classroom/course exists
* Remove bandaid code from ClassroomView
2016-02-08 12:48:29 -08:00
Matt Lott
bd9ca8ee5f Add enrollments graph to analytics dashboard 2016-02-06 14:02:44 -08:00
Scott Erickson
abb4e2fa47 Filter out duplicate course instances client-side 2016-02-05 14:03:43 -08:00
Scott Erickson
944b6b743f Add homepage unsupported browser messages to new home page 2016-02-05 11:39:06 -08:00
Matt Lott
b495c581a7 Enable analytics tracking on request quote view 2016-02-05 10:49:46 -08:00
Matt Lott
5d2ad62fb9 Add top school counts to analytics dashboard 2016-02-04 17:31:25 -08:00
Scott Erickson
95e627f346 Merge pull request #3374 from taptapdan/issue-3138-CastButtonView
Refactor CastButtonView to use view in template
2016-02-04 14:53:13 -08:00
Daniel Fiore
d0d19f94e9 Refactor ProblemAlertView to use view in template 2016-02-04 14:44:29 -08:00
Scott Erickson
b91299a59f New home page tweaks 2016-02-03 10:59:54 -08:00
Josh Callebaut
0eb32aac24 Creates clickable links for default tasks 2016-02-03 10:26:36 -08:00
Scott Erickson
9e38587719 Do not hide teacher note for small screens, add close link 2016-02-03 10:10:43 -08:00
Daniel Fiore
6ad5d6bc73 Refactor CastButtonView to use view in template 2016-02-02 15:57:55 -08:00
Nick Winter
260fd21f4e Add Segment for teachers, misc analytics cleanup tweaks 2016-02-02 15:13:55 -08:00
Nick Winter
24fc14260e Add /privacy policy page 2016-02-02 15:13:54 -08:00
Scott Erickson
fa54b639c7 Hide modal wrapper when no modal 2016-02-02 15:13:54 -08:00
Scott Erickson
0e7e9aad39 Add new home page with test 2016-02-02 15:12:37 -08:00
Scott Erickson
ab62982bac Tweak RequestQuoteView form to better fit best practices
* Scroll to errors
* Set email input type to 'email'
2016-02-01 15:51:29 -08:00
Scott Erickson
5fffb2eefb Remove TeachersFreeTrialView 2016-02-01 10:40:22 -08:00
Josh Callebaut
14ef28b658 Merge pull request #3369 from Zerrien/master
Editor Changes (Task tab, pre-initialize tasks, Artisan nurturing, level submission)
2016-01-29 09:42:04 -08:00
Scott Erickson
e62e497543 Replace TeachersFreeTrialView with RequestQuoteView 2016-01-28 17:21:36 -08:00
Josh Callebaut
7b5b4ca898 Uses @$ instead of @.find, method to convert dom into jQuery objects, and superior CoCoModel's getOwner() instead of trawling through the permissions list 2016-01-28 14:05:04 -08:00
Josh Callebaut
4a2d5c2e59 Fixes level ownership check 2016-01-28 14:05:04 -08:00
Josh Callebaut
bd825d3108 Includes the level name in the email and makes it clickable 2016-01-28 14:05:04 -08:00
Josh Callebaut
42efe6264b Sticks the level submission data into the contact form's message attribute 2016-01-28 14:05:04 -08:00
Josh Callebaut
8347c8247f Merge branch 'master' of https://github.com/codecombat/codecombat 2016-01-28 13:57:56 -08:00
Scott Erickson
4ef5f40fa1 Network error handling fixes
* Make work there are multiple network requests and only one fails
* Test for i18n attributes instead of English translations so Travis works
* Various PR changes
2016-01-27 10:42:12 -08:00
Scott Erickson
3dda5710de Move demo border to TestView to be used generally 2016-01-27 10:42:02 -08:00
Scott Erickson
d00f8344be Add demo controls to TestView 2016-01-27 10:42:02 -08:00
Scott Erickson
29350bf1de Make network error handling more generic 2016-01-27 10:41:56 -08:00
Matt Lott
78c86eb979 Add furthest course table to analytics page 2016-01-26 14:37:25 -08:00
Nick Winter
4ae8eacd90 Treat Elemental Wars like Ace of Coders for mirror match and hero equipment 2016-01-26 13:20:23 -08:00
Matt Lott
b3e5d8f650 Add explicit track event for viewing teacher trial
We want to explicitly track views before submit.
2016-01-26 10:32:39 -08:00
Scott Erickson
277c526dc3 Add CourseVictoryModal 2016-01-25 13:03:29 -08:00
Josh Callebaut
6dfc02980a Fixes non-existant task array, bad focus, adds a button to add default tasks. 2016-01-22 13:54:20 -08:00
Rob Blanckaert
28d085f6d3 Merge pull request #3349 from ryang217/master
Add additional formatting tags to Tome popup
2016-01-22 13:22:56 -08:00
Robin Yang
dc248f8d29 Add additional formatting tags to Tome popup
Helps fix this #2945
2016-01-22 13:21:17 -08:00
Cat Sync
96003dd240 filter deleted users out of ClassroomView 2016-01-22 14:32:39 -05:00
Cat Sync
e4296eaf97 filter out empty solutions when clicking Fill Defaults 2016-01-22 13:41:12 -05:00
Matt Lott
1825d0e2dd Enable Mixpanel
Closes #3347
2016-01-21 16:19:06 -08:00
Josh Callebaut
ab93dc8564 Bug fixes and style fixes. 2016-01-21 12:14:37 -08:00
Josh Callebaut
c28720c640 Implements fixes based on code review. 2016-01-20 15:32:21 -08:00
Josh Callebaut
80c2a9e539 New models with default tasks are preintialized with these tasks. 2016-01-20 10:48:53 -08:00
Scott Erickson
491a679abb Merge pull request #3327 from Imperadeiro98/master
Cleaned couple files
2016-01-18 15:35:59 -08:00
Scott Erickson
a28b53eb5c Merge pull request #3321 from taptapdan/fix-issue-2732
Looks good. Thanks!
2016-01-18 15:08:52 -08:00
Daniel Fiore
39b42fe363 Fix level list highlighted levels
The Level Editor level list now highlights the row in which you are the
person who last saved the level. The level list now also displays
glyphicons to indicate watched/unwatched levels.
2016-01-16 15:05:54 -08:00
Imperadeiro98
f47640e59a Cleaned couple files
Removed some unused styles, a template, a view and changed the class
name of some views
2016-01-16 12:07:15 +00:00
Imperadeiro98
b4b444023e Add sounds to SubscribeModal 2016-01-16 11:38:31 +00:00
Josh Callebaut
ad28be1c64 Adds casing check for unloaded/non-tasked levels. 2016-01-15 13:54:08 -08:00
Josh Callebaut
89fc6cc078 Removes stay logging, implements functionality improvements for artisan modals. 2016-01-13 17:45:27 -08:00
Josh Callebaut
14c2942134 Moves Tasks to their own tab and adds a guide-book icon next to the save icon which displays help and doubles as a level review submission modal. 2016-01-13 15:54:57 -08:00
Nick Winter
7aff24b3a6 Cleaned up a couple SubscribeModal things 2016-01-12 12:34:10 -08:00
Nick Winter
e872ead632 Implement Brazil coupon 2016-01-11 09:52:46 -08:00
Scott Erickson
a10aec256f Set upper limit to max seats you can purchase at once 2016-01-07 09:54:02 -08:00
Scott Erickson
13b9d81e4c Fix some demo views 2016-01-07 09:40:35 -08:00
Scott Erickson
5941c4b27f Add autocomplete and slider to design elements view, limit showing javascript widgets automagically 2016-01-06 16:33:50 -08:00
Scott Erickson
93b9aa3c2c Add DesignElementsView (mostly complete) 2016-01-06 16:11:28 -08:00
Scott Erickson
fde11d8f0d Add fill defaults button to solutions treema node in level editor 2016-01-06 13:50:06 -08:00
Rob
86d9b081c1 Merge branch 'cashew' 2016-01-06 12:03:49 -08:00
Nick Winter
7864d3708b Change traditional Chinese label to be in traditional Chinese 2016-01-05 15:20:22 -08:00
Daniel Fiore
a215c2e01c Fix Earned Achievements Check 2016-01-04 19:23:14 -08:00
Rob
3b4433e312 Use hero instead of this. Also use published aether package. 2016-01-04 17:23:58 -08:00
Rob
3baea9683c Additional java support. 2016-01-04 16:41:24 -08:00
CodeCombat
41a532cb50 WIP - cashew integration 2016-01-04 16:27:27 -08:00
Nick Winter
187a6f87a9 Include course info in contact message session links 2015-12-28 08:15:48 -08:00
Imperadeiro98
f369c73b2a Remove unnecessary sound 2015-12-28 16:11:09 +00:00
Imperadeiro98
bf6601c3cc Fix for GenerateTerrainModal 2015-12-26 21:56:05 +00:00
Imperadeiro98
b7ba677b00 Use view in template 2015-12-26 14:21:06 +00:00
Nick Winter
208073ffdb Fix saving levels from #3276 refactoring 2015-12-24 11:21:12 -08:00
Nick Winter
c0d58c3786 Tweak style and add i18n for #3280 2015-12-24 06:34:54 -08:00
Pulkit Agarwal
357e8c0bcd Add level to user profile page 2015-12-24 15:52:30 +05:30